diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2009-06-24 15:40:25 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2009-06-24 15:40:25 +0000 |
| commit | 030a30f622c1ce06b5764dd4cc344e98756546ca (patch) | |
| tree | 54a6b2fad5ab34dcaf7353745ed78608ea13f4f9 | |
| parent | 60c716ac7681473a304749655fbe701dabef63a1 (diff) | |
Ticket #875: backported changes from ticket #874
git-svn-id: http://svn.pjsip.org/repos/pjproject/branches/1.0@2791 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjmedia/src/pjmedia-codec/g722.c | 2 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia-codec/gsm.c | 2 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia-codec/l16.c | 2 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia/g711.c | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/pjmedia/src/pjmedia-codec/g722.c b/pjmedia/src/pjmedia-codec/g722.c index 9449fa61..a666014d 100644 --- a/pjmedia/src/pjmedia-codec/g722.c +++ b/pjmedia/src/pjmedia-codec/g722.c @@ -578,6 +578,7 @@ static pj_status_t g722_codec_encode(pjmedia_codec *codec, } output->type = PJMEDIA_FRAME_TYPE_AUDIO; + output->timestamp = input->timestamp; TRACE_((THIS_FILE, "G722 encode(): size=%d", output->size)); return PJ_SUCCESS; @@ -624,6 +625,7 @@ static pj_status_t g722_codec_decode(pjmedia_codec *codec, pj_assert(output->size == SAMPLES_PER_FRAME); output->size = SAMPLES_PER_FRAME * 2; output->type = PJMEDIA_FRAME_TYPE_AUDIO; + output->timestamp = input->timestamp; #if !PLC_DISABLED if (g722_data->plc_enabled) diff --git a/pjmedia/src/pjmedia-codec/gsm.c b/pjmedia/src/pjmedia-codec/gsm.c index 3739ca72..2ecd03a9 100644 --- a/pjmedia/src/pjmedia-codec/gsm.c +++ b/pjmedia/src/pjmedia-codec/gsm.c @@ -566,6 +566,7 @@ static pj_status_t gsm_codec_encode( pjmedia_codec *codec, } output->type = PJMEDIA_FRAME_TYPE_AUDIO; + output->timestamp = input->timestamp; return PJ_SUCCESS; } @@ -595,6 +596,7 @@ static pj_status_t gsm_codec_decode( pjmedia_codec *codec, output->size = 320; output->type = PJMEDIA_FRAME_TYPE_AUDIO; + output->timestamp = input->timestamp; #if !PLC_DISABLED if (gsm_data->plc_enabled) diff --git a/pjmedia/src/pjmedia-codec/l16.c b/pjmedia/src/pjmedia-codec/l16.c index 2b1ad7b3..be63e4ec 100644 --- a/pjmedia/src/pjmedia-codec/l16.c +++ b/pjmedia/src/pjmedia-codec/l16.c @@ -650,6 +650,7 @@ static pj_status_t l16_encode(pjmedia_codec *codec, /* Done */ output->type = PJMEDIA_FRAME_TYPE_AUDIO; output->size = input->size; + output->timestamp = input->timestamp; return PJ_SUCCESS; } @@ -684,6 +685,7 @@ static pj_status_t l16_decode(pjmedia_codec *codec, output->type = PJMEDIA_FRAME_TYPE_AUDIO; output->size = input->size; + output->timestamp = input->timestamp; #if !PLC_DISABLED if (l16_data->plc_enabled) diff --git a/pjmedia/src/pjmedia/g711.c b/pjmedia/src/pjmedia/g711.c index 49188a32..2d822da3 100644 --- a/pjmedia/src/pjmedia/g711.c +++ b/pjmedia/src/pjmedia/g711.c @@ -539,6 +539,7 @@ static pj_status_t g711_encode(pjmedia_codec *codec, output->type = PJMEDIA_FRAME_TYPE_AUDIO; output->size = (input->size >> 1); + output->timestamp = input->timestamp; return PJ_SUCCESS; } @@ -582,6 +583,7 @@ static pj_status_t g711_decode(pjmedia_codec *codec, output->type = PJMEDIA_FRAME_TYPE_AUDIO; output->size = (input->size << 1); + output->timestamp = input->timestamp; #if !PLC_DISABLED if (priv->plc_enabled) |