diff options
author | Martin Storsjö <martin@martin.st> | 2012-03-22 13:25:58 +0200 |
---|---|---|
committer | Martin Storsjö <martin@martin.st> | 2012-03-24 22:53:18 +0200 |
commit | d5ed5e7d0c1fa46de348db0de4c82b0f621db3d4 (patch) | |
tree | c76a1a445e3f43dd6948515e31cd361f559e0ad6 /libavformat/movenc.c | |
parent | 2ee01fbded0a6b35b55d125dfd5807219837cf30 (diff) | |
download | ffmpeg-d5ed5e7d0c1fa46de348db0de4c82b0f621db3d4.tar.gz |
avc: Add a function for converting mp4 style extradata to annex b
Make movenc use this function instead of the current custom
conversion function.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/movenc.c')
-rw-r--r-- | libavformat/movenc.c | 34 |
1 files changed, 10 insertions, 24 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 1209b7b114..a832c1d102 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2096,26 +2096,6 @@ static void param_write_hex(AVIOContext *pb, const char *name, const uint8_t *va avio_printf(pb, "<param name=\"%s\" value=\"%s\" valuetype=\"data\"/>\n", name, buf); } -static void write_h264_extradata(AVIOContext *pb, AVCodecContext *enc) -{ - uint16_t sps_size, pps_size, len; - char buf[150]; - sps_size = AV_RB16(&enc->extradata[6]); - if (11 + sps_size > enc->extradata_size) - return; - pps_size = AV_RB16(&enc->extradata[9 + sps_size]); - if (11 + sps_size + pps_size > enc->extradata_size) - return; - len = FFMIN(sizeof(buf)/2 - 1, sps_size); - ff_data_to_hex(buf, &enc->extradata[8], len, 0); - buf[2*len] = '\0'; - avio_printf(pb, "<param name=\"CodecPrivateData\" value=\"00000001%s", buf); - len = FFMIN(sizeof(buf)/2 - 1, pps_size); - ff_data_to_hex(buf, &enc->extradata[11 + sps_size], len, 0); - buf[2*len] = '\0'; - avio_printf(pb, "00000001%s\" valuetype=\"data\"/>\n", buf); -} - static int mov_write_isml_manifest(AVIOContext *pb, MOVMuxContext *mov) { int64_t pos = avio_tell(pb); @@ -2157,10 +2137,16 @@ static int mov_write_isml_manifest(AVIOContext *pb, MOVMuxContext *mov) param_write_int(pb, "systemBitrate", track->enc->bit_rate); param_write_int(pb, "trackID", track_id); if (track->enc->codec_type == AVMEDIA_TYPE_VIDEO) { - if (track->enc->codec_id == CODEC_ID_H264 && - track->enc->extradata_size >= 11 && - track->enc->extradata[0] == 1) { - write_h264_extradata(pb, track->enc); + if (track->enc->codec_id == CODEC_ID_H264) { + uint8_t *ptr; + int size = track->enc->extradata_size; + if (!ff_avc_write_annexb_extradata(track->enc->extradata, &ptr, + &size)) { + param_write_hex(pb, "CodecPrivateData", + ptr ? ptr : track->enc->extradata, + size); + av_free(ptr); + } } else { param_write_hex(pb, "CodecPrivateData", track->enc->extradata, track->enc->extradata_size); |