ffmpeg | branch: master | Derek Buitenhuis <derek.buitenh...@gmail.com> | Tue May 3 13:42:38 2016 +0100| [7966ddfc0bb7ee87dc2606b7b146701db6f6c717] | committer: Derek Buitenhuis
Merge commit 'a7829a2a3f8e6ec0b9f2673c11f56916800aeb33' * commit 'a7829a2a3f8e6ec0b9f2673c11f56916800aeb33': h264: reimplement 3aa661ec5 in a more explicit way Merged-by: Derek Buitenhuis <derek.buitenh...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7966ddfc0bb7ee87dc2606b7b146701db6f6c717 --- libavcodec/h264.c | 74 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 55 insertions(+), 19 deletions(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 6dbe5c7..113c96f 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -34,6 +34,7 @@ #include "libavutil/stereo3d.h" #include "libavutil/timer.h" #include "internal.h" +#include "bytestream.h" #include "cabac.h" #include "cabac_functions.h" #include "error_resilience.h" @@ -433,6 +434,55 @@ fail: static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size, int parse_extradata); +/* There are (invalid) samples in the wild with mp4-style extradata, where the + * parameter sets are stored unescaped (i.e. as RBSP). + * This function catches the parameter set decoding failure and tries again + * after escaping it */ +static int decode_extradata_ps_mp4(H264Context *h, const uint8_t *buf, int buf_size) +{ + int ret; + + ret = decode_nal_units(h, buf, buf_size, 1); + if (ret < 0 && !(h->avctx->err_recognition & AV_EF_EXPLODE)) { + GetByteContext gbc; + PutByteContext pbc; + uint8_t *escaped_buf; + int escaped_buf_size; + + av_log(h->avctx, AV_LOG_WARNING, + "SPS decoding failure, trying again after escaping the NAL\n"); + + if (buf_size / 2 >= (INT16_MAX - AV_INPUT_BUFFER_PADDING_SIZE) / 3) + return AVERROR(ERANGE); + escaped_buf_size = buf_size * 3 / 2 + AV_INPUT_BUFFER_PADDING_SIZE; + escaped_buf = av_mallocz(escaped_buf_size); + if (!escaped_buf) + return AVERROR(ENOMEM); + + bytestream2_init(&gbc, buf, buf_size); + bytestream2_init_writer(&pbc, escaped_buf, escaped_buf_size); + + while (bytestream2_get_bytes_left(&gbc)) { + if (bytestream2_get_bytes_left(&gbc) >= 3 && + bytestream2_peek_be24(&gbc) <= 3) { + bytestream2_put_be24(&pbc, 3); + bytestream2_skip(&gbc, 2); + } else + bytestream2_put_byte(&pbc, bytestream2_get_byte(&gbc)); + } + + escaped_buf_size = bytestream2_tell_p(&pbc); + AV_WB16(escaped_buf, escaped_buf_size - 2); + + ret = decode_nal_units(h, escaped_buf, escaped_buf_size, 1); + av_freep(&escaped_buf); + if (ret < 0) + return ret; + } + + return 0; +} + int ff_h264_decode_extradata(H264Context *h, const uint8_t *buf, int size) { AVCodecContext *avctx = h->avctx; @@ -462,7 +512,7 @@ int ff_h264_decode_extradata(H264Context *h, const uint8_t *buf, int size) nalsize = AV_RB16(p) + 2; if(nalsize > size - (p-buf)) return AVERROR_INVALIDDATA; - ret = decode_nal_units(h, p, nalsize, 1); + ret = decode_extradata_ps_mp4(h, p, nalsize); if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "Decoding sps %d from avcC failed\n", i); @@ -476,7 +526,7 @@ int ff_h264_decode_extradata(H264Context *h, const uint8_t *buf, int size) nalsize = AV_RB16(p) + 2; if(nalsize > size - (p-buf)) return AVERROR_INVALIDDATA; - ret = decode_nal_units(h, p, nalsize, 1); + ret = decode_extradata_ps_mp4(h, p, nalsize); if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "Decoding pps %d from avcC failed\n", i); @@ -1440,23 +1490,9 @@ again: break; case NAL_SPS: init_get_bits(&h->gb, ptr, bit_length); - if (ff_h264_decode_seq_parameter_set(h, 0) >= 0) - break; - if (h->is_avc ? nalsize : 1) { - av_log(h->avctx, AV_LOG_DEBUG, - "SPS decoding failure, trying again with the complete NAL\n"); - if (h->is_avc) - av_assert0(next_avc - buf_index + consumed == nalsize); - if ((next_avc - buf_index + consumed - 1) >= INT_MAX/8) - break; - init_get_bits(&h->gb, &buf[buf_index + 1 - consumed], - 8*(next_avc - buf_index + consumed - 1)); - if (ff_h264_decode_seq_parameter_set(h, 0) >= 0) - break; - } - init_get_bits(&h->gb, ptr, bit_length); - ff_h264_decode_seq_parameter_set(h, 1); - + ret = ff_h264_decode_seq_parameter_set(h, 0); + if (ret < 0 && (h->avctx->err_recognition & AV_EF_EXPLODE)) + goto end; break; case NAL_PPS: init_get_bits(&h->gb, ptr, bit_length); ====================================================================== diff --cc libavcodec/h264.c index 6dbe5c7,6b95294..113c96f --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@@ -433,7 -408,56 +434,56 @@@ fail static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size, int parse_extradata); + /* There are (invalid) samples in the wild with mp4-style extradata, where the + * parameter sets are stored unescaped (i.e. as RBSP). + * This function catches the parameter set decoding failure and tries again + * after escaping it */ + static int decode_extradata_ps_mp4(H264Context *h, const uint8_t *buf, int buf_size) + { + int ret; + + ret = decode_nal_units(h, buf, buf_size, 1); + if (ret < 0 && !(h->avctx->err_recognition & AV_EF_EXPLODE)) { + GetByteContext gbc; + PutByteContext pbc; + uint8_t *escaped_buf; + int escaped_buf_size; + + av_log(h->avctx, AV_LOG_WARNING, + "SPS decoding failure, trying again after escaping the NAL\n"); + + if (buf_size / 2 >= (INT16_MAX - AV_INPUT_BUFFER_PADDING_SIZE) / 3) + return AVERROR(ERANGE); + escaped_buf_size = buf_size * 3 / 2 + AV_INPUT_BUFFER_PADDING_SIZE; + escaped_buf = av_mallocz(escaped_buf_size); + if (!escaped_buf) + return AVERROR(ENOMEM); + + bytestream2_init(&gbc, buf, buf_size); + bytestream2_init_writer(&pbc, escaped_buf, escaped_buf_size); + + while (bytestream2_get_bytes_left(&gbc)) { + if (bytestream2_get_bytes_left(&gbc) >= 3 && + bytestream2_peek_be24(&gbc) <= 3) { + bytestream2_put_be24(&pbc, 3); + bytestream2_skip(&gbc, 2); + } else + bytestream2_put_byte(&pbc, bytestream2_get_byte(&gbc)); + } + + escaped_buf_size = bytestream2_tell_p(&pbc); + AV_WB16(escaped_buf, escaped_buf_size - 2); + + ret = decode_nal_units(h, escaped_buf, escaped_buf_size, 1); + av_freep(&escaped_buf); + if (ret < 0) + return ret; + } + + return 0; + } + -int ff_h264_decode_extradata(H264Context *h) +int ff_h264_decode_extradata(H264Context *h, const uint8_t *buf, int size) { AVCodecContext *avctx = h->avctx; int ret; @@@ -460,9 -481,9 +510,9 @@@ p += 6; for (i = 0; i < cnt; i++) { nalsize = AV_RB16(p) + 2; - if (p - avctx->extradata + nalsize > avctx->extradata_size) + if(nalsize > size - (p-buf)) return AVERROR_INVALIDDATA; - ret = decode_nal_units(h, p, nalsize, 1); + ret = decode_extradata_ps_mp4(h, p, nalsize); if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "Decoding sps %d from avcC failed\n", i); @@@ -474,9 -495,9 +524,9 @@@ cnt = *(p++); // Number of pps for (i = 0; i < cnt; i++) { nalsize = AV_RB16(p) + 2; - if (p - avctx->extradata + nalsize > avctx->extradata_size) + if(nalsize > size - (p-buf)) return AVERROR_INVALIDDATA; - ret = decode_nal_units(h, p, nalsize, 1); + ret = decode_extradata_ps_mp4(h, p, nalsize); if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "Decoding pps %d from avcC failed\n", i); @@@ -1440,23 -1428,9 +1490,9 @@@ again break; case NAL_SPS: init_get_bits(&h->gb, ptr, bit_length); - if (ff_h264_decode_seq_parameter_set(h, 0) >= 0) - break; - if (h->is_avc ? nalsize : 1) { - av_log(h->avctx, AV_LOG_DEBUG, - "SPS decoding failure, trying again with the complete NAL\n"); - if (h->is_avc) - av_assert0(next_avc - buf_index + consumed == nalsize); - if ((next_avc - buf_index + consumed - 1) >= INT_MAX/8) - break; - init_get_bits(&h->gb, &buf[buf_index + 1 - consumed], - 8*(next_avc - buf_index + consumed - 1)); - if (ff_h264_decode_seq_parameter_set(h, 0) >= 0) - break; - } - init_get_bits(&h->gb, ptr, bit_length); - ff_h264_decode_seq_parameter_set(h, 1); - - ret = ff_h264_decode_seq_parameter_set(h); ++ ret = ff_h264_decode_seq_parameter_set(h, 0); + if (ret < 0 && (h->avctx->err_recognition & AV_EF_EXPLODE)) + goto end; break; case NAL_PPS: init_get_bits(&h->gb, ptr, bit_length); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
