summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNanang Izzuddin <nanang@teluu.com>2010-01-14 12:39:11 +0000
committerNanang Izzuddin <nanang@teluu.com>2010-01-14 12:39:11 +0000
commit0c93ac9d11ec67e86b2b5c8a9c2181cee8b5e391 (patch)
treeda5c3d04941a99cfd239475ad7bf2efca6bce741
parent7d708af436ceda16e23daf2042033a9d5443a474 (diff)
Ticket #1027: Fixed stream to skip (frame.buf!=NULL) checking when frame type is PJMEDIA_FRAME_TYPE_EXT before passing the frame to encoder.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3061 74dad513-b988-da41-8d7b-12977e46ad98
-rw-r--r--pjmedia/src/pjmedia/stream.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/pjmedia/src/pjmedia/stream.c b/pjmedia/src/pjmedia/stream.c
index 36490839..fcaa725b 100644
--- a/pjmedia/src/pjmedia/stream.c
+++ b/pjmedia/src/pjmedia/stream.c
@@ -1001,8 +1001,9 @@ static pj_status_t put_frame_imp( pjmedia_port *port,
/* Encode audio frame */
- } else if (frame->type != PJMEDIA_FRAME_TYPE_NONE &&
- frame->buf != NULL)
+ } else if ((frame->type == PJMEDIA_FRAME_TYPE_AUDIO &&
+ frame->buf != NULL) ||
+ (frame->type == PJMEDIA_FRAME_TYPE_EXTENDED))
{
/* Encode! */
status = stream->codec->op->encode( stream->codec, frame,