diff options
author | Nanang Izzuddin <nanang@teluu.com> | 2015-04-09 08:15:48 +0000 |
---|---|---|
committer | Nanang Izzuddin <nanang@teluu.com> | 2015-04-09 08:15:48 +0000 |
commit | 564387c6b1d1ff9651241238dcdeedc0d658ecd5 (patch) | |
tree | 1de7f09a9e9f5951f796817384c12883175151db /pjmedia/src/pjmedia-codec/g7221.c | |
parent | ca570849230de7a8785c8437ab0d4f9e2359f7b4 (diff) |
Re #1794:
- Updated G7221, the bitrate can also be set via param.info.avg_bps, this is applicable only when param.setting.dec_fmtp doesn't contain bitrate info.
- Fixed failing codec vector test in pjmedia-test due to wrong G7221 bitrate setting.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5058 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/src/pjmedia-codec/g7221.c')
-rw-r--r-- | pjmedia/src/pjmedia-codec/g7221.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pjmedia/src/pjmedia-codec/g7221.c b/pjmedia/src/pjmedia-codec/g7221.c index 8fa9efbd..2b9f1db7 100644 --- a/pjmedia/src/pjmedia-codec/g7221.c +++ b/pjmedia/src/pjmedia-codec/g7221.c @@ -678,7 +678,10 @@ static pj_status_t codec_open( pjmedia_codec *codec, fmtp_bitrate = (pj_uint16_t)pj_strtoul(&fmtp->param[tmp].val); } - /* Validation mode first! */ + if (fmtp_bitrate == 0) + fmtp_bitrate = attr->info.avg_bps; + + /* Validate bitrate */ if (!fmtp_bitrate || !validate_mode(attr->info.clock_rate, fmtp_bitrate)) return PJMEDIA_CODEC_EINMODE; |