diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2010-05-11 06:33:55 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2010-05-11 06:33:55 +0000 |
| commit | daa17786030e9fc8967d01228f453004ae7177f0 (patch) | |
| tree | 5899784a169ae79dea440a6e0ab8013f2333f507 /pjmedia | |
| parent | 1ee42e834df29308d6b7e55888279ad6c951a601 (diff) | |
Re #1068:
- Fixed max frames-per-packet constants in AMR codec (IPP and passthrough) to be based on PJMEDIA_MAX_FRAME_DURATION_MS setting.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3165 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
| -rw-r--r-- | pjmedia/src/pjmedia-codec/ipp_codecs.c | 2 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia-codec/passthrough.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pjmedia/src/pjmedia-codec/ipp_codecs.c b/pjmedia/src/pjmedia-codec/ipp_codecs.c index a8b73180..66e9abe4 100644 --- a/pjmedia/src/pjmedia-codec/ipp_codecs.c +++ b/pjmedia/src/pjmedia-codec/ipp_codecs.c @@ -495,7 +495,7 @@ static void predecode_amr( ipp_private_t *codec_data, static pj_status_t pack_amr(ipp_private_t *codec_data, void *pkt, pj_size_t *pkt_size, pj_size_t max_pkt_size) { - enum {MAX_FRAMES_PER_PACKET = 16}; + enum {MAX_FRAMES_PER_PACKET = PJMEDIA_MAX_FRAME_DURATION_MS / 20}; pjmedia_frame frames[MAX_FRAMES_PER_PACKET]; unsigned nframes = 0; diff --git a/pjmedia/src/pjmedia-codec/passthrough.c b/pjmedia/src/pjmedia-codec/passthrough.c index 9dffcdf7..cbaffa9f 100644 --- a/pjmedia/src/pjmedia-codec/passthrough.c +++ b/pjmedia/src/pjmedia-codec/passthrough.c @@ -234,7 +234,7 @@ static pj_status_t pack_amr ( codec_private_t *codec_data, unsigned output_buf_len, struct pjmedia_frame *output) { - enum {MAX_FRAMES_PER_PACKET = 8}; + enum {MAX_FRAMES_PER_PACKET = PJMEDIA_MAX_FRAME_DURATION_MS / 20}; pjmedia_frame frames[MAX_FRAMES_PER_PACKET]; amr_settings_t* setting = (amr_settings_t*)codec_data->codec_setting; |