diff options
Diffstat (limited to 'libavcodec/h264_parser.c')
-rw-r--r-- | libavcodec/h264_parser.c | 234 |
1 files changed, 163 insertions, 71 deletions
diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index b86bf2b9b7..ce46c58dda 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -2,20 +2,20 @@ * H.26L/H.264/AVC/JVT/14496-10/... parser * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at> * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -25,6 +25,8 @@ * @author Michael Niedermayer <michaelni@gmx.at> */ +#define UNCHECKED_BITSTREAM_READER 1 + #include <assert.h> #include <stdint.h> @@ -53,24 +55,45 @@ typedef struct H264ParseContext { int nal_length_size; int got_first; int picture_structure; + uint8_t parse_history[6]; + int parse_history_count; + int parse_last_mb; } H264ParseContext; static int h264_find_frame_end(H264ParseContext *p, const uint8_t *buf, - int buf_size) + int buf_size, void *logctx) { - int i; + int i, j; uint32_t state; ParseContext *pc = &p->pc; + + int next_avc = p->is_avc ? 0 : buf_size; // mb_addr= pc->mb_addr - 1; state = pc->state; if (state > 13) state = 7; + if (p->is_avc && !p->nal_length_size) + av_log(logctx, AV_LOG_ERROR, "AVC-parser: nal length size invalid\n"); + for (i = 0; i < buf_size; i++) { + if (i >= next_avc) { + int nalsize = 0; + i = next_avc; + for (j = 0; j < p->nal_length_size; j++) + nalsize = (nalsize << 8) | buf[i++]; + if (nalsize <= 0 || nalsize > buf_size - i) { + av_log(logctx, AV_LOG_ERROR, "AVC-parser: nal size %d remaining %d\n", nalsize, buf_size - i); + return buf_size; + } + next_avc = i + nalsize; + state = 5; + } + if (state == 7) { - i += p->h264dsp.startcode_find_candidate(buf + i, buf_size - i); - if (i < buf_size) + i += p->h264dsp.startcode_find_candidate(buf + i, next_avc - i); + if (i < next_avc) state = 2; } else if (state <= 2) { if (buf[i] == 1) @@ -89,31 +112,44 @@ static int h264_find_frame_end(H264ParseContext *p, const uint8_t *buf, } } else if (nalu_type == NAL_SLICE || nalu_type == NAL_DPA || nalu_type == NAL_IDR_SLICE) { + state += 8; + continue; + } + state = 7; + } else { + p->parse_history[p->parse_history_count++] = buf[i]; + if (p->parse_history_count > 5) { + unsigned int mb, last_mb = p->parse_last_mb; + GetBitContext gb; + + init_get_bits(&gb, p->parse_history, 8*p->parse_history_count); + p->parse_history_count = 0; + mb= get_ue_golomb_long(&gb); + p->parse_last_mb = mb; if (pc->frame_start_found) { - state += 8; - continue; + if (mb <= last_mb) + goto found; } else pc->frame_start_found = 1; + state = 7; } - state = 7; - } else { - // first_mb_in_slice is 0, probably the first nal of a new slice - if (buf[i] & 0x80) - goto found; - state = 7; } } pc->state = state; + if (p->is_avc) + return next_avc; return END_NOT_FOUND; found: pc->state = 7; pc->frame_start_found = 0; - return i - (state & 5); + if (p->is_avc) + return next_avc; + return i - (state & 5) - 5 * (state > 7); } static int scan_mmco_reset(AVCodecParserContext *s, GetBitContext *gb, - AVCodecContext *avctx) + void *logctx) { H264PredWeightTable pwt; int slice_type_nos = s->pict_type & 3; @@ -128,7 +164,7 @@ static int scan_mmco_reset(AVCodecParserContext *s, GetBitContext *gb, get_bits1(gb); // direct_spatial_mv_pred if (ff_h264_parse_ref_count(&list_count, ref_count, gb, p->ps.pps, - slice_type_nos, p->picture_structure) < 0) + slice_type_nos, p->picture_structure, logctx) < 0) return AVERROR_INVALIDDATA; if (slice_type_nos != AV_PICTURE_TYPE_I) { @@ -140,9 +176,9 @@ static int scan_mmco_reset(AVCodecParserContext *s, GetBitContext *gb, unsigned int reordering_of_pic_nums_idc = get_ue_golomb_31(gb); if (reordering_of_pic_nums_idc < 3) - get_ue_golomb(gb); + get_ue_golomb_long(gb); else if (reordering_of_pic_nums_idc > 3) { - av_log(avctx, AV_LOG_ERROR, + av_log(logctx, AV_LOG_ERROR, "illegal reordering_of_pic_nums_idc %d\n", reordering_of_pic_nums_idc); return AVERROR_INVALIDDATA; @@ -150,7 +186,7 @@ static int scan_mmco_reset(AVCodecParserContext *s, GetBitContext *gb, break; if (index >= ref_count[list]) { - av_log(avctx, AV_LOG_ERROR, + av_log(logctx, AV_LOG_ERROR, "reference count %d overflow\n", index); return AVERROR_INVALIDDATA; } @@ -162,14 +198,14 @@ static int scan_mmco_reset(AVCodecParserContext *s, GetBitContext *gb, if ((p->ps.pps->weighted_pred && slice_type_nos == AV_PICTURE_TYPE_P) || (p->ps.pps->weighted_bipred_idc == 1 && slice_type_nos == AV_PICTURE_TYPE_B)) ff_h264_pred_weight_table(gb, p->ps.sps, ref_count, slice_type_nos, - &pwt); + &pwt, logctx); if (get_bits1(gb)) { // adaptive_ref_pic_marking_mode_flag int i; for (i = 0; i < MAX_MMCO_COUNT; i++) { MMCOOpcode opcode = get_ue_golomb_31(gb); if (opcode > (unsigned) MMCO_LONG) { - av_log(avctx, AV_LOG_ERROR, + av_log(logctx, AV_LOG_ERROR, "illegal memory management control operation %d\n", opcode); return AVERROR_INVALIDDATA; @@ -180,7 +216,7 @@ static int scan_mmco_reset(AVCodecParserContext *s, GetBitContext *gb, return 1; if (opcode == MMCO_SHORT2UNUSED || opcode == MMCO_SHORT2LONG) - get_ue_golomb(gb); + get_ue_golomb_long(gb); // difference_of_pic_nums_minus1 if (opcode == MMCO_SHORT2LONG || opcode == MMCO_LONG2UNUSED || opcode == MMCO_LONG || opcode == MMCO_SET_MAX_LONG) get_ue_golomb_31(gb); @@ -190,6 +226,26 @@ static int scan_mmco_reset(AVCodecParserContext *s, GetBitContext *gb, return 0; } +static inline int get_avc_nalsize(H264ParseContext *p, const uint8_t *buf, + int buf_size, int *buf_index, void *logctx) +{ + int i, nalsize = 0; + + if (*buf_index >= buf_size - p->nal_length_size) { + // the end of the buffer is reached, refill it + return AVERROR(EAGAIN); + } + + for (i = 0; i < p->nal_length_size; i++) + nalsize = ((unsigned)nalsize << 8) | buf[(*buf_index)++]; + if (nalsize <= 0 || nalsize > buf_size - *buf_index) { + av_log(logctx, AV_LOG_ERROR, + "AVC: nal size %d\n", nalsize); + return AVERROR_INVALIDDATA; + } + return nalsize; +} + /** * Parse NAL units of found picture and decode some basic information. * @@ -200,16 +256,15 @@ static int scan_mmco_reset(AVCodecParserContext *s, GetBitContext *gb, */ static inline int parse_nal_units(AVCodecParserContext *s, AVCodecContext *avctx, - const uint8_t *buf, int buf_size) + const uint8_t * const buf, int buf_size) { H264ParseContext *p = s->priv_data; - const uint8_t *buf_end = buf + buf_size; - H2645NAL nal = { NULL }; - + int buf_index, next_avc; unsigned int pps_id; unsigned int slice_type; int state = -1, got_reset = 0; + int q264 = buf_size >=4 && !memcmp("Q264", buf, 4); int field_poc[2]; int ret; @@ -219,18 +274,32 @@ static inline int parse_nal_units(AVCodecParserContext *s, s->picture_structure = AV_PICTURE_STRUCTURE_UNKNOWN; ff_h264_sei_uninit(&p->sei); + p->sei.frame_packing.frame_packing_arrangement_cancel_flag = -1; if (!buf_size) return 0; + buf_index = 0; + next_avc = p->is_avc ? 0 : buf_size; for (;;) { const SPS *sps; - int src_length, consumed; - buf = avpriv_find_start_code(buf, buf_end, &state); - if (buf >= buf_end) - break; - --buf; - src_length = buf_end - buf; + int src_length, consumed, nalsize = 0; + + if (buf_index >= next_avc) { + nalsize = get_avc_nalsize(p, buf, buf_size, &buf_index, avctx); + if (nalsize < 0) + break; + next_avc = buf_index + nalsize; + } else { + buf_index = find_start_code(buf, buf_size, buf_index, next_avc); + if (buf_index >= buf_size) + break; + if (buf_index >= next_avc) + continue; + } + src_length = next_avc - buf_index; + + state = buf[buf_index]; switch (state & 0x1f) { case NAL_SLICE: case NAL_IDR_SLICE: @@ -247,12 +316,13 @@ static inline int parse_nal_units(AVCodecParserContext *s, } break; } - - consumed = ff_h2645_extract_rbsp(buf, src_length, &nal); + consumed = ff_h2645_extract_rbsp(buf + buf_index, src_length, &nal); if (consumed < 0) break; - ret = init_get_bits(&nal.gb, nal.data, nal.size * 8); + buf_index += consumed; + + ret = init_get_bits8(&nal.gb, nal.data, nal.size); if (ret < 0) goto fail; get_bits1(&nal.gb); @@ -261,7 +331,7 @@ static inline int parse_nal_units(AVCodecParserContext *s, switch (nal.type) { case NAL_SPS: - ff_h264_decode_seq_parameter_set(&nal.gb, avctx, &p->ps); + ff_h264_decode_seq_parameter_set(&nal.gb, avctx, &p->ps, 0); break; case NAL_PPS: ff_h264_decode_picture_parameter_set(&nal.gb, avctx, &p->ps, @@ -279,7 +349,7 @@ static inline int parse_nal_units(AVCodecParserContext *s, p->poc.prev_poc_lsb = 0; /* fall through */ case NAL_SLICE: - get_ue_golomb(&nal.gb); // skip first_mb_in_slice + get_ue_golomb_long(&nal.gb); // skip first_mb_in_slice slice_type = get_ue_golomb_31(&nal.gb); s->pict_type = ff_h264_golomb_to_pict_type[slice_type % 5]; if (p->sei.recovery_point.recovery_frame_cnt >= 0) { @@ -297,16 +367,33 @@ static inline int parse_nal_units(AVCodecParserContext *s, "non-existing PPS %u referenced\n", pps_id); goto fail; } - p->ps.pps = (const PPS*)p->ps.pps_list[pps_id]->data; + + av_buffer_unref(&p->ps.pps_ref); + av_buffer_unref(&p->ps.sps_ref); + p->ps.pps = NULL; + p->ps.sps = NULL; + p->ps.pps_ref = av_buffer_ref(p->ps.pps_list[pps_id]); + if (!p->ps.pps_ref) + goto fail; + p->ps.pps = (const PPS*)p->ps.pps_ref->data; + if (!p->ps.sps_list[p->ps.pps->sps_id]) { av_log(avctx, AV_LOG_ERROR, "non-existing SPS %u referenced\n", p->ps.pps->sps_id); goto fail; } - p->ps.sps = (SPS*)p->ps.sps_list[p->ps.pps->sps_id]->data; + + p->ps.sps_ref = av_buffer_ref(p->ps.sps_list[p->ps.pps->sps_id]); + if (!p->ps.sps_ref) + goto fail; + p->ps.sps = (const SPS*)p->ps.sps_ref->data; sps = p->ps.sps; + // heuristic to detect non marked keyframes + if (p->ps.sps->ref_frame_count <= 1 && p->ps.pps->ref_count[0] <= 1 && s->pict_type == AV_PICTURE_TYPE_I) + s->key_frame = 1; + p->poc.frame_num = get_bits(&nal.gb, sps->log2_max_frame_num); s->coded_width = 16 * sps->mb_width; @@ -352,7 +439,7 @@ static inline int parse_nal_units(AVCodecParserContext *s, } if (nal.type == NAL_IDR_SLICE) - get_ue_golomb(&nal.gb); /* idr_pic_id */ + get_ue_golomb_long(&nal.gb); /* idr_pic_id */ if (sps->poc_type == 0) { p->poc.poc_lsb = get_bits(&nal.gb, sps->log2_max_poc_lsb); @@ -464,10 +551,13 @@ static inline int parse_nal_units(AVCodecParserContext *s, av_freep(&nal.rbsp_buffer); return 0; /* no need to evaluate the rest */ } - buf += consumed; + } + if (q264) { + av_freep(&nal.rbsp_buffer); + return 0; } /* didn't find a picture! */ - av_log(avctx, AV_LOG_ERROR, "missing picture in access unit\n"); + av_log(avctx, AV_LOG_ERROR, "missing picture in access unit with size %d\n", buf_size); fail: av_freep(&nal.rbsp_buffer); return -1; @@ -494,7 +584,7 @@ static int h264_parse(AVCodecParserContext *s, if (s->flags & PARSER_FLAG_COMPLETE_FRAMES) { next = buf_size; } else { - next = h264_find_frame_end(p, buf, buf_size); + next = h264_find_frame_end(p, buf, buf_size, avctx); if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) { *poutbuf = NULL; @@ -503,13 +593,15 @@ static int h264_parse(AVCodecParserContext *s, } if (next < 0 && next != END_NOT_FOUND) { - assert(pc->last_index + next >= 0); - h264_find_frame_end(p, &pc->buffer[pc->last_index + next], -next); // update state + av_assert1(pc->last_index + next >= 0); + h264_find_frame_end(p, &pc->buffer[pc->last_index + next], -next, avctx); // update state } } parse_nal_units(s, avctx, buf, buf_size); + if (avctx->framerate.num) + avctx->time_base = av_inv_q(av_mul_q(avctx->framerate, (AVRational){avctx->ticks_per_frame, 1})); if (p->sei.picture_timing.cpb_removal_delay >= 0) { s->dts_sync_point = p->sei.buffering_period.present; s->dts_ref_dts_delta = p->sei.picture_timing.cpb_removal_delay; @@ -532,31 +624,37 @@ static int h264_parse(AVCodecParserContext *s, static int h264_split(AVCodecContext *avctx, const uint8_t *buf, int buf_size) { - int i; uint32_t state = -1; int has_sps = 0; + int has_pps = 0; + const uint8_t *ptr = buf, *end = buf + buf_size; + int nalu_type; - for (i = 0; i <= buf_size; i++) { - if ((state & 0xFFFFFF1F) == 0x107) + while (ptr < end) { + ptr = avpriv_find_start_code(ptr, end, &state); + if ((state & 0xFFFFFF00) != 0x100) + break; + nalu_type = state & 0x1F; + if (nalu_type == NAL_SPS) { has_sps = 1; - /* if((state&0xFFFFFF1F) == 0x101 || - * (state&0xFFFFFF1F) == 0x102 || - * (state&0xFFFFFF1F) == 0x105) { + } else if (nalu_type == NAL_PPS) + has_pps = 1; + /* else if (nalu_type == 0x01 || + * nalu_type == 0x02 || + * nalu_type == 0x05) { * } */ - if ((state & 0xFFFFFF00) == 0x100 && (state & 0xFFFFFF1F) != 0x106 && - (state & 0xFFFFFF1F) != 0x107 && (state & 0xFFFFFF1F) != 0x108 && - (state & 0xFFFFFF1F) != 0x109 && (state & 0xFFFFFF1F) != 0x10d && - (state & 0xFFFFFF1F) != 0x10f) { + else if ((nalu_type != NAL_SEI || has_pps) && + nalu_type != NAL_AUD && nalu_type != NAL_SPS_EXT && + nalu_type != 0x0f) { if (has_sps) { - while (i > 4 && buf[i - 5] == 0) - i--; - return i - 4; + while (ptr - 4 > buf && ptr[-5] == 0) + ptr--; + return ptr - 4 - buf; } } - if (i < buf_size) - state = (state << 8) | buf[i]; } + return 0; } @@ -564,17 +662,11 @@ static void h264_close(AVCodecParserContext *s) { H264ParseContext *p = s->priv_data; ParseContext *pc = &p->pc; - int i; - av_free(pc->buffer); + av_freep(&pc->buffer); ff_h264_sei_uninit(&p->sei); - - for (i = 0; i < FF_ARRAY_ELEMS(p->ps.sps_list); i++) - av_buffer_unref(&p->ps.sps_list[i]); - - for (i = 0; i < FF_ARRAY_ELEMS(p->ps.pps_list); i++) - av_buffer_unref(&p->ps.pps_list[i]); + ff_h264_ps_uninit(&p->ps); } static av_cold int init(AVCodecParserContext *s) |