X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fh264_parser.c;h=0bb78e09c8cbcc2ae6f0343fb554d0d0ded96012;hb=83678dbbae64ad8c501e0c732c1117e642c25dae;hp=e6e27042fd6dc3eb7b90f09e751186a24189bc24;hpb=4baba6c813b7a1f27370e20fb1a87b05fcb39208;p=ffmpeg diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index e6e27042fd6..0bb78e09c8c 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -21,25 +21,49 @@ /** * @file - * H.264 / AVC / MPEG4 part10 parser. + * H.264 / AVC / MPEG-4 part10 parser. * @author Michael Niedermayer */ -#include "libavutil/attributes.h" -#include "parser.h" +#include +#include + +#include "libavutil/avutil.h" +#include "libavutil/error.h" +#include "libavutil/log.h" +#include "libavutil/mem.h" +#include "libavutil/pixfmt.h" + +#include "avcodec.h" +#include "get_bits.h" +#include "golomb_legacy.h" +#include "h264.h" +#include "h264_sei.h" +#include "h264_ps.h" #include "h264data.h" -#include "golomb.h" #include "internal.h" +#include "mpegutils.h" +#include "parser.h" -#include +typedef struct H264ParseContext { + ParseContext pc; + H264ParamSets ps; + H264DSPContext h264dsp; + H264POCContext poc; + H264SEIContext sei; + int is_avc; + int nal_length_size; + int got_first; + int picture_structure; +} H264ParseContext; -static int h264_find_frame_end(H264Context *h, const uint8_t *buf, +static int h264_find_frame_end(H264ParseContext *p, const uint8_t *buf, int buf_size) { int i; uint32_t state; - ParseContext *pc = &h->parse_context; + ParseContext *pc = &p->pc; // mb_addr= pc->mb_addr - 1; state = pc->state; if (state > 13) @@ -47,7 +71,7 @@ static int h264_find_frame_end(H264Context *h, const uint8_t *buf, for (i = 0; i < buf_size; i++) { if (state == 7) { - i += h->h264dsp.h264_find_start_code_candidate(buf + i, buf_size - i); + i += p->h264dsp.startcode_find_candidate(buf + i, buf_size - i); if (i < buf_size) state = 2; } else if (state <= 2) { @@ -58,13 +82,15 @@ static int h264_find_frame_end(H264Context *h, const uint8_t *buf, else state >>= 1; // 2->1, 1->0, 0->0 } else if (state <= 5) { - int v = buf[i] & 0x1F; - if (v == 6 || v == 7 || v == 8 || v == 9) { + int nalu_type = buf[i] & 0x1F; + if (nalu_type == H264_NAL_SEI || nalu_type == H264_NAL_SPS || + nalu_type == H264_NAL_PPS || nalu_type == H264_NAL_AUD) { if (pc->frame_start_found) { i++; goto found; } - } else if (v == 1 || v == 2 || v == 5) { + } else if (nalu_type == H264_NAL_SLICE || nalu_type == H264_NAL_DPA || + nalu_type == H264_NAL_IDR_SLICE) { if (pc->frame_start_found) { state += 8; continue; @@ -73,6 +99,7 @@ static int h264_find_frame_end(H264Context *h, const uint8_t *buf, } 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; @@ -87,38 +114,46 @@ found: return i - (state & 5); } -static int scan_mmco_reset(AVCodecParserContext *s) +static int scan_mmco_reset(AVCodecParserContext *s, GetBitContext *gb, + AVCodecContext *avctx) { - H264Context *h = s->priv_data; + H264PredWeightTable pwt; + int slice_type_nos = s->pict_type & 3; + H264ParseContext *p = s->priv_data; + int list_count, ref_count[2]; + - h->slice_type_nos = s->pict_type & 3; + if (p->ps.pps->redundant_pic_cnt_present) + get_ue_golomb(gb); // redundant_pic_count - if (h->pps.redundant_pic_cnt_present) - get_ue_golomb(&h->gb); // redundant_pic_count + if (slice_type_nos == AV_PICTURE_TYPE_B) + get_bits1(gb); // direct_spatial_mv_pred - if (ff_set_ref_count(h) < 0) + if (ff_h264_parse_ref_count(&list_count, ref_count, gb, p->ps.pps, + slice_type_nos, p->picture_structure) < 0) return AVERROR_INVALIDDATA; - if (h->slice_type_nos != AV_PICTURE_TYPE_I) { + if (slice_type_nos != AV_PICTURE_TYPE_I) { int list; - for (list = 0; list < h->list_count; list++) { - if (get_bits1(&h->gb)) { + for (list = 0; list < list_count; list++) { + if (get_bits1(gb)) { int index; for (index = 0; ; index++) { - unsigned int reordering_of_pic_nums_idc = get_ue_golomb_31(&h->gb); + unsigned int reordering_of_pic_nums_idc = get_ue_golomb_31(gb); if (reordering_of_pic_nums_idc < 3) - get_ue_golomb(&h->gb); + get_ue_golomb(gb); else if (reordering_of_pic_nums_idc > 3) { - av_log(h->avctx, AV_LOG_ERROR, + av_log(avctx, AV_LOG_ERROR, "illegal reordering_of_pic_nums_idc %d\n", reordering_of_pic_nums_idc); return AVERROR_INVALIDDATA; } else break; - if (index >= h->ref_count[list]) { - av_log(h->avctx, AV_LOG_ERROR, "reference count overflow\n"); + if (index >= ref_count[list]) { + av_log(avctx, AV_LOG_ERROR, + "reference count %d overflow\n", index); return AVERROR_INVALIDDATA; } } @@ -126,16 +161,17 @@ static int scan_mmco_reset(AVCodecParserContext *s) } } - if ((h->pps.weighted_pred && h->slice_type_nos == AV_PICTURE_TYPE_P) || - (h->pps.weighted_bipred_idc == 1 && h->slice_type_nos == AV_PICTURE_TYPE_B)) - ff_pred_weight_table(h); + 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); - if (get_bits1(&h->gb)) { // adaptive_ref_pic_marking_mode_flag + 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(&h->gb); + MMCOOpcode opcode = get_ue_golomb_31(gb); if (opcode > (unsigned) MMCO_LONG) { - av_log(h->avctx, AV_LOG_ERROR, + av_log(avctx, AV_LOG_ERROR, "illegal memory management control operation %d\n", opcode); return AVERROR_INVALIDDATA; @@ -146,10 +182,10 @@ static int scan_mmco_reset(AVCodecParserContext *s) return 1; if (opcode == MMCO_SHORT2UNUSED || opcode == MMCO_SHORT2LONG) - get_ue_golomb(&h->gb); + get_ue_golomb(gb); if (opcode == MMCO_SHORT2LONG || opcode == MMCO_LONG2UNUSED || opcode == MMCO_LONG || opcode == MMCO_SET_MAX_LONG) - get_ue_golomb_31(&h->gb); + get_ue_golomb_31(gb); } } @@ -168,40 +204,40 @@ static inline int parse_nal_units(AVCodecParserContext *s, AVCodecContext *avctx, const uint8_t *buf, int buf_size) { - H264Context *h = s->priv_data; + H264ParseContext *p = s->priv_data; const uint8_t *buf_end = buf + buf_size; + + H2645NAL nal = { NULL }; + unsigned int pps_id; unsigned int slice_type; int state = -1, got_reset = 0; - const uint8_t *ptr; int field_poc[2]; + int ret; /* set some sane default values */ s->pict_type = AV_PICTURE_TYPE_I; s->key_frame = 0; s->picture_structure = AV_PICTURE_STRUCTURE_UNKNOWN; - h->avctx = avctx; - h->sei_recovery_frame_cnt = -1; - h->sei_dpb_output_delay = 0; - h->sei_cpb_removal_delay = -1; - h->sei_buffering_period_present = 0; + ff_h264_sei_uninit(&p->sei); if (!buf_size) return 0; for (;;) { - int src_length, dst_length, consumed; + 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; switch (state & 0x1f) { - case NAL_SLICE: - case NAL_IDR_SLICE: + case H264_NAL_SLICE: + case H264_NAL_IDR_SLICE: // Do not walk the whole buffer just to decode slice header - if (state & 0x1f == NAL_IDR_SLICE || (state >> 5) & 0x3 == 0) { + if ((state & 0x1f) == H264_NAL_IDR_SLICE || ((state >> 5) & 0x3) == 0) { /* IDR or disposable slice * No need to decode many bytes because MMCOs shall not be present. */ if (src_length > 60) @@ -213,157 +249,198 @@ static inline int parse_nal_units(AVCodecParserContext *s, } break; } - ptr = ff_h264_decode_nal(h, buf, &dst_length, &consumed, src_length); - if (ptr == NULL || dst_length < 0) + + consumed = ff_h2645_extract_rbsp(buf, src_length, &nal); + if (consumed < 0) break; - init_get_bits(&h->gb, ptr, 8 * dst_length); - switch (h->nal_unit_type) { - case NAL_SPS: - ff_h264_decode_seq_parameter_set(h); + ret = init_get_bits(&nal.gb, nal.data, nal.size * 8); + if (ret < 0) + goto fail; + get_bits1(&nal.gb); + nal.ref_idc = get_bits(&nal.gb, 2); + nal.type = get_bits(&nal.gb, 5); + + switch (nal.type) { + case H264_NAL_SPS: + ff_h264_decode_seq_parameter_set(&nal.gb, avctx, &p->ps); break; - case NAL_PPS: - ff_h264_decode_picture_parameter_set(h, h->gb.size_in_bits); + case H264_NAL_PPS: + ff_h264_decode_picture_parameter_set(&nal.gb, avctx, &p->ps, + nal.size_bits); break; - case NAL_SEI: - ff_h264_decode_sei(h); + case H264_NAL_SEI: + ff_h264_sei_decode(&p->sei, &nal.gb, &p->ps, avctx); break; - case NAL_IDR_SLICE: + case H264_NAL_IDR_SLICE: s->key_frame = 1; - h->prev_frame_num = 0; - h->prev_frame_num_offset = 0; - h->prev_poc_msb = - h->prev_poc_lsb = 0; + p->poc.prev_frame_num = 0; + p->poc.prev_frame_num_offset = 0; + p->poc.prev_poc_msb = + p->poc.prev_poc_lsb = 0; /* fall through */ - case NAL_SLICE: - get_ue_golomb(&h->gb); // skip first_mb_in_slice - slice_type = get_ue_golomb_31(&h->gb); - s->pict_type = golomb_to_pict_type[slice_type % 5]; - if (h->sei_recovery_frame_cnt >= 0) { + case H264_NAL_SLICE: + get_ue_golomb(&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) { /* key frame, since recovery_frame_cnt is set */ s->key_frame = 1; } - pps_id = get_ue_golomb(&h->gb); + pps_id = get_ue_golomb(&nal.gb); if (pps_id >= MAX_PPS_COUNT) { - av_log(h->avctx, AV_LOG_ERROR, - "pps_id out of range\n"); - return -1; + av_log(avctx, AV_LOG_ERROR, + "pps_id %u out of range\n", pps_id); + goto fail; + } + if (!p->ps.pps_list[pps_id]) { + av_log(avctx, AV_LOG_ERROR, + "non-existing PPS %u referenced\n", pps_id); + goto fail; } - if (!h->pps_buffers[pps_id]) { - av_log(h->avctx, AV_LOG_ERROR, - "non-existing PPS referenced\n"); - return -1; + p->ps.pps = (const PPS*)p->ps.pps_list[pps_id]->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; } - h->pps = *h->pps_buffers[pps_id]; - if (!h->sps_buffers[h->pps.sps_id]) { - av_log(h->avctx, AV_LOG_ERROR, - "non-existing SPS referenced\n"); - return -1; + p->ps.sps = (SPS*)p->ps.sps_list[p->ps.pps->sps_id]->data; + + sps = p->ps.sps; + + p->poc.frame_num = get_bits(&nal.gb, sps->log2_max_frame_num); + + s->coded_width = 16 * sps->mb_width; + s->coded_height = 16 * sps->mb_height; + s->width = s->coded_width - (sps->crop_right + sps->crop_left); + s->height = s->coded_height - (sps->crop_top + sps->crop_bottom); + if (s->width <= 0 || s->height <= 0) { + s->width = s->coded_width; + s->height = s->coded_height; + } + + switch (sps->bit_depth_luma) { + case 9: + if (sps->chroma_format_idc == 3) s->format = AV_PIX_FMT_YUV444P9; + else if (sps->chroma_format_idc == 2) s->format = AV_PIX_FMT_YUV422P9; + else s->format = AV_PIX_FMT_YUV420P9; + break; + case 10: + if (sps->chroma_format_idc == 3) s->format = AV_PIX_FMT_YUV444P10; + else if (sps->chroma_format_idc == 2) s->format = AV_PIX_FMT_YUV422P10; + else s->format = AV_PIX_FMT_YUV420P10; + break; + case 8: + if (sps->chroma_format_idc == 3) s->format = AV_PIX_FMT_YUV444P; + else if (sps->chroma_format_idc == 2) s->format = AV_PIX_FMT_YUV422P; + else s->format = AV_PIX_FMT_YUV420P; + break; + default: + s->format = AV_PIX_FMT_NONE; } - h->sps = *h->sps_buffers[h->pps.sps_id]; - h->frame_num = get_bits(&h->gb, h->sps.log2_max_frame_num); - avctx->profile = ff_h264_get_profile(&h->sps); - avctx->level = h->sps.level_idc; + avctx->profile = ff_h264_get_profile(sps); + avctx->level = sps->level_idc; - if (h->sps.frame_mbs_only_flag) { - h->picture_structure = PICT_FRAME; + if (sps->frame_mbs_only_flag) { + p->picture_structure = PICT_FRAME; } else { - if (get_bits1(&h->gb)) { // field_pic_flag - h->picture_structure = PICT_TOP_FIELD + get_bits1(&h->gb); // bottom_field_flag + if (get_bits1(&nal.gb)) { // field_pic_flag + p->picture_structure = PICT_TOP_FIELD + get_bits1(&nal.gb); // bottom_field_flag } else { - h->picture_structure = PICT_FRAME; + p->picture_structure = PICT_FRAME; } } - if (h->nal_unit_type == NAL_IDR_SLICE) - get_ue_golomb(&h->gb); /* idr_pic_id */ - if (h->sps.poc_type == 0) { - h->poc_lsb = get_bits(&h->gb, h->sps.log2_max_poc_lsb); + if (nal.type == H264_NAL_IDR_SLICE) + get_ue_golomb(&nal.gb); /* idr_pic_id */ + if (sps->poc_type == 0) { + p->poc.poc_lsb = get_bits(&nal.gb, sps->log2_max_poc_lsb); - if (h->pps.pic_order_present == 1 && - h->picture_structure == PICT_FRAME) - h->delta_poc_bottom = get_se_golomb(&h->gb); + if (p->ps.pps->pic_order_present == 1 && + p->picture_structure == PICT_FRAME) + p->poc.delta_poc_bottom = get_se_golomb(&nal.gb); } - if (h->sps.poc_type == 1 && - !h->sps.delta_pic_order_always_zero_flag) { - h->delta_poc[0] = get_se_golomb(&h->gb); + if (sps->poc_type == 1 && + !sps->delta_pic_order_always_zero_flag) { + p->poc.delta_poc[0] = get_se_golomb(&nal.gb); - if (h->pps.pic_order_present == 1 && - h->picture_structure == PICT_FRAME) - h->delta_poc[1] = get_se_golomb(&h->gb); + if (p->ps.pps->pic_order_present == 1 && + p->picture_structure == PICT_FRAME) + p->poc.delta_poc[1] = get_se_golomb(&nal.gb); } /* Decode POC of this picture. * The prev_ values needed for decoding POC of the next picture are not set here. */ field_poc[0] = field_poc[1] = INT_MAX; - ff_init_poc(h, field_poc, &s->output_picture_number); + ff_h264_init_poc(field_poc, &s->output_picture_number, sps, + &p->poc, p->picture_structure, nal.ref_idc); /* Continue parsing to check if MMCO_RESET is present. * FIXME: MMCO_RESET could appear in non-first slice. * Maybe, we should parse all undisposable non-IDR slice of this * picture until encountering MMCO_RESET in a slice of it. */ - if (h->nal_ref_idc && h->nal_unit_type != NAL_IDR_SLICE) { - got_reset = scan_mmco_reset(s); + if (nal.ref_idc && nal.type != H264_NAL_IDR_SLICE) { + got_reset = scan_mmco_reset(s, &nal.gb, avctx); if (got_reset < 0) - return got_reset; + goto fail; } /* Set up the prev_ values for decoding POC of the next picture. */ - h->prev_frame_num = got_reset ? 0 : h->frame_num; - h->prev_frame_num_offset = got_reset ? 0 : h->frame_num_offset; - if (h->nal_ref_idc != 0) { + p->poc.prev_frame_num = got_reset ? 0 : p->poc.frame_num; + p->poc.prev_frame_num_offset = got_reset ? 0 : p->poc.frame_num_offset; + if (nal.ref_idc != 0) { if (!got_reset) { - h->prev_poc_msb = h->poc_msb; - h->prev_poc_lsb = h->poc_lsb; + p->poc.prev_poc_msb = p->poc.poc_msb; + p->poc.prev_poc_lsb = p->poc.poc_lsb; } else { - h->prev_poc_msb = 0; - h->prev_poc_lsb = - h->picture_structure == PICT_BOTTOM_FIELD ? 0 : field_poc[0]; + p->poc.prev_poc_msb = 0; + p->poc.prev_poc_lsb = + p->picture_structure == PICT_BOTTOM_FIELD ? 0 : field_poc[0]; } } - if (h->sps.pic_struct_present_flag) { - switch (h->sei_pic_struct) { - case SEI_PIC_STRUCT_TOP_FIELD: - case SEI_PIC_STRUCT_BOTTOM_FIELD: + if (sps->pic_struct_present_flag && p->sei.picture_timing.present) { + switch (p->sei.picture_timing.pic_struct) { + case H264_SEI_PIC_STRUCT_TOP_FIELD: + case H264_SEI_PIC_STRUCT_BOTTOM_FIELD: s->repeat_pict = 0; break; - case SEI_PIC_STRUCT_FRAME: - case SEI_PIC_STRUCT_TOP_BOTTOM: - case SEI_PIC_STRUCT_BOTTOM_TOP: + case H264_SEI_PIC_STRUCT_FRAME: + case H264_SEI_PIC_STRUCT_TOP_BOTTOM: + case H264_SEI_PIC_STRUCT_BOTTOM_TOP: s->repeat_pict = 1; break; - case SEI_PIC_STRUCT_TOP_BOTTOM_TOP: - case SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM: + case H264_SEI_PIC_STRUCT_TOP_BOTTOM_TOP: + case H264_SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM: s->repeat_pict = 2; break; - case SEI_PIC_STRUCT_FRAME_DOUBLING: + case H264_SEI_PIC_STRUCT_FRAME_DOUBLING: s->repeat_pict = 3; break; - case SEI_PIC_STRUCT_FRAME_TRIPLING: + case H264_SEI_PIC_STRUCT_FRAME_TRIPLING: s->repeat_pict = 5; break; default: - s->repeat_pict = h->picture_structure == PICT_FRAME ? 1 : 0; + s->repeat_pict = p->picture_structure == PICT_FRAME ? 1 : 0; break; } } else { - s->repeat_pict = h->picture_structure == PICT_FRAME ? 1 : 0; + s->repeat_pict = p->picture_structure == PICT_FRAME ? 1 : 0; } - if (h->picture_structure == PICT_FRAME) { + if (p->picture_structure == PICT_FRAME) { s->picture_structure = AV_PICTURE_STRUCTURE_FRAME; - if (h->sps.pic_struct_present_flag) { - switch (h->sei_pic_struct) { - case SEI_PIC_STRUCT_TOP_BOTTOM: - case SEI_PIC_STRUCT_TOP_BOTTOM_TOP: + if (sps->pic_struct_present_flag && p->sei.picture_timing.present) { + switch (p->sei.picture_timing.pic_struct) { + case H264_SEI_PIC_STRUCT_TOP_BOTTOM: + case H264_SEI_PIC_STRUCT_TOP_BOTTOM_TOP: s->field_order = AV_FIELD_TT; break; - case SEI_PIC_STRUCT_BOTTOM_TOP: - case SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM: + case H264_SEI_PIC_STRUCT_BOTTOM_TOP: + case H264_SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM: s->field_order = AV_FIELD_BB; break; default: @@ -379,19 +456,22 @@ static inline int parse_nal_units(AVCodecParserContext *s, s->field_order = AV_FIELD_PROGRESSIVE; } } else { - if (h->picture_structure == PICT_TOP_FIELD) + if (p->picture_structure == PICT_TOP_FIELD) s->picture_structure = AV_PICTURE_STRUCTURE_TOP_FIELD; else s->picture_structure = AV_PICTURE_STRUCTURE_BOTTOM_FIELD; s->field_order = AV_FIELD_UNKNOWN; } + av_freep(&nal.rbsp_buffer); return 0; /* no need to evaluate the rest */ } buf += consumed; } /* didn't find a picture! */ - av_log(h->avctx, AV_LOG_ERROR, "missing picture in access unit\n"); + av_log(avctx, AV_LOG_ERROR, "missing picture in access unit\n"); +fail: + av_freep(&nal.rbsp_buffer); return -1; } @@ -400,29 +480,23 @@ static int h264_parse(AVCodecParserContext *s, const uint8_t **poutbuf, int *poutbuf_size, const uint8_t *buf, int buf_size) { - H264Context *h = s->priv_data; - ParseContext *pc = &h->parse_context; + H264ParseContext *p = s->priv_data; + ParseContext *pc = &p->pc; int next; - if (!h->got_first) { - h->got_first = 1; + if (!p->got_first) { + p->got_first = 1; if (avctx->extradata_size) { - h->avctx = avctx; - // must be done like in the decoder. - // otherwise opening the parser, creating extradata, - // and then closing and opening again - // will cause has_b_frames to be always set. - // NB: estimate_timings_from_pts behaves exactly like this. - if (!avctx->has_b_frames) - h->low_delay = 1; - ff_h264_decode_extradata(h); + ff_h264_decode_extradata(avctx->extradata, avctx->extradata_size, + &p->ps, &p->is_avc, &p->nal_length_size, + avctx->err_recognition, avctx); } } if (s->flags & PARSER_FLAG_COMPLETE_FRAMES) { next = buf_size; } else { - next = h264_find_frame_end(h, buf, buf_size); + next = h264_find_frame_end(p, buf, buf_size); if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) { *poutbuf = NULL; @@ -432,16 +506,16 @@ static int h264_parse(AVCodecParserContext *s, if (next < 0 && next != END_NOT_FOUND) { assert(pc->last_index + next >= 0); - h264_find_frame_end(h, &pc->buffer[pc->last_index + next], -next); // update state + h264_find_frame_end(p, &pc->buffer[pc->last_index + next], -next); // update state } } parse_nal_units(s, avctx, buf, buf_size); - if (h->sei_cpb_removal_delay >= 0) { - s->dts_sync_point = h->sei_buffering_period_present; - s->dts_ref_dts_delta = h->sei_cpb_removal_delay; - s->pts_dts_delta = h->sei_dpb_output_delay; + 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; + s->pts_dts_delta = p->sei.picture_timing.dpb_output_delay; } else { s->dts_sync_point = INT_MIN; s->dts_ref_dts_delta = INT_MIN; @@ -472,8 +546,10 @@ static int h264_split(AVCodecContext *avctx, * (state&0xFFFFFF1F) == 0x105) { * } */ - if ((state & 0xFFFFFF00) == 0x100 && (state & 0xFFFFFF1F) != 0x107 && - (state & 0xFFFFFF1F) != 0x108 && (state & 0xFFFFFF1F) != 0x109) { + if ((state & 0xFFFFFF00) == 0x100 && (state & 0xFFFFFF1F) != 0x106 && + (state & 0xFFFFFF1F) != 0x107 && (state & 0xFFFFFF1F) != 0x108 && + (state & 0xFFFFFF1F) != 0x109 && (state & 0xFFFFFF1F) != 0x10d && + (state & 0xFFFFFF1F) != 0x10f) { if (has_sps) { while (i > 4 && buf[i - 5] == 0) i--; @@ -486,29 +562,36 @@ static int h264_split(AVCodecContext *avctx, return 0; } -static void close(AVCodecParserContext *s) +static void h264_close(AVCodecParserContext *s) { - H264Context *h = s->priv_data; - ParseContext *pc = &h->parse_context; + H264ParseContext *p = s->priv_data; + ParseContext *pc = &p->pc; + int i; av_free(pc->buffer); - ff_h264_free_context(h); + + 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]); } static av_cold int init(AVCodecParserContext *s) { - H264Context *h = s->priv_data; - h->thread_context[0] = h; - h->slice_context_count = 1; - ff_h264dsp_init(&h->h264dsp, 8, 1); + H264ParseContext *p = s->priv_data; + + ff_h264dsp_init(&p->h264dsp, 8, 1); return 0; } AVCodecParser ff_h264_parser = { .codec_ids = { AV_CODEC_ID_H264 }, - .priv_data_size = sizeof(H264Context), + .priv_data_size = sizeof(H264ParseContext), .parser_init = init, .parser_parse = h264_parse, - .parser_close = close, + .parser_close = h264_close, .split = h264_split, };