diff options
author | Martin Storsjö <martin@martin.st> | 2012-05-28 12:11:26 +0300 |
---|---|---|
committer | Martin Storsjö <martin@martin.st> | 2012-06-18 12:27:56 +0300 |
commit | d77f4afa9814b0433be6fdbfd7d8a113592ba680 (patch) | |
tree | 8a0df73a17bf709996f686453f0784dcb20eaa30 /libavformat/sdp.c | |
parent | becc3c629b6d2be3171a26587f7ca999ef7a9d86 (diff) | |
download | ffmpeg-d77f4afa9814b0433be6fdbfd7d8a113592ba680.tar.gz |
rtpenc: Allow requesting H264 RTP packetization mode 0
This requires all NAL units to fit within single RTP packets. It
doesn't change the actual packetization for packets that fit, but
errors out and gives a helpful hint if the NAL units would have to
be split, and signals the right packetization mode in the SDP.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/sdp.c')
-rw-r--r-- | libavformat/sdp.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/libavformat/sdp.c b/libavformat/sdp.c index 9692aabbc0..7df8b13b67 100644 --- a/libavformat/sdp.c +++ b/libavformat/sdp.c @@ -388,15 +388,20 @@ static char *sdp_write_media_attributes(char *buff, int size, AVCodecContext *c, char *config = NULL; switch (c->codec_id) { - case CODEC_ID_H264: + case CODEC_ID_H264: { + int mode = 1; + if (fmt && fmt->oformat->priv_class && + av_opt_flag_is_set(fmt->priv_data, "rtpflags", "h264_mode0")) + mode = 0; if (c->extradata_size) { config = extradata2psets(c); } av_strlcatf(buff, size, "a=rtpmap:%d H264/90000\r\n" - "a=fmtp:%d packetization-mode=1%s\r\n", + "a=fmtp:%d packetization-mode=%d%s\r\n", payload_type, - payload_type, config ? config : ""); + payload_type, mode, config ? config : ""); break; + } case CODEC_ID_H263: case CODEC_ID_H263P: /* a=framesize is required by 3GPP TS 26.234 (PSS). It |