# HG changeset patch # User lucabe # Date 1276693187 0 # Node ID 6c0e0ad773156841be0c077fda1b22d35bd26ee1 # Parent 9df581584d505db46737c7ca5226300beda215ba If the video stream is H.264 with MP4 syntax, store the NAL lenght size in the RTP muxer context (it will be used later for splitting frames in NALs) diff -r 9df581584d50 -r 6c0e0ad77315 rtpenc.c --- a/rtpenc.c Tue Jun 15 19:53:15 2010 +0000 +++ b/rtpenc.c Wed Jun 16 12:59:47 2010 +0000 @@ -131,6 +131,13 @@ s->max_payload_size = n * TS_PACKET_SIZE; s->buf_ptr = s->buf; break; + case CODEC_ID_H264: + /* check for H.264 MP4 syntax */ + if (st->codec->extradata_size > 0 && st->codec->extradata && + st->codec->extradata[0] == 1) { + s->nal_length_size = (st->codec->extradata[4] & 0x03) + 1; + } + break; case CODEC_ID_AMR_NB: case CODEC_ID_AMR_WB: if (!s->max_frames_per_packet) diff -r 9df581584d50 -r 6c0e0ad77315 rtpenc.h --- a/rtpenc.h Tue Jun 15 19:53:15 2010 +0000 +++ b/rtpenc.h Wed Jun 16 12:59:47 2010 +0000 @@ -50,6 +50,12 @@ uint8_t *buf_ptr; int max_frames_per_packet; + + /** + * Number of bytes used for H.264 NAL length, if the MP4 syntax is used + * (1, 2 or 4) + */ + int nal_length_size; }; typedef struct RTPMuxContext RTPMuxContext;