X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fh264_parser.c;h=8c84d439d8a5a134f785854207e72dd0ea3a5ed4;hb=f099d3d1d5466bd63f4ab36270d169ff9ea613b8;hp=a3cbe3b39cd066cf46ee05fa60d4d57312cb1d77;hpb=ba87f0801d77c21eb1e4891ca1f846500bbb0939;p=ffmpeg diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index a3cbe3b39cd..8c84d439d8a 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 * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav 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. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav 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 FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -26,19 +26,17 @@ */ #include "parser.h" -#include "h264_parser.h" #include "h264data.h" #include "golomb.h" #include -int ff_h264_find_frame_end(H264Context *h, const uint8_t *buf, int buf_size) +static int ff_h264_find_frame_end(H264Context *h, const uint8_t *buf, int buf_size) { int i; uint32_t state; - ParseContext *pc = &(h->s.parse_context); -//printf("first %02X%02X%02X%02X\n", buf[0], buf[1],buf[2],buf[3]); + ParseContext *pc = &h->parse_context; // mb_addr= pc->mb_addr - 1; state= pc->state; if(state>13) @@ -98,7 +96,7 @@ found: return i-(state&5); } -/*! +/** * Parse NAL units of found picture and decode some basic information. * * @param s parser context. @@ -118,18 +116,21 @@ static inline int parse_nal_units(AVCodecParserContext *s, const uint8_t *ptr; /* set some sane default values */ - s->pict_type = FF_I_TYPE; + s->pict_type = AV_PICTURE_TYPE_I; s->key_frame = 0; - h->s.avctx= avctx; + 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; + if (!buf_size) + return 0; + for(;;) { int src_length, dst_length, consumed; - buf = ff_find_start_code(buf, buf_end, &state); + buf = avpriv_mpv_find_start_code(buf, buf_end, &state); if(buf >= buf_end) break; --buf; @@ -146,13 +147,13 @@ static inline int parse_nal_units(AVCodecParserContext *s, if (ptr==NULL || dst_length < 0) break; - init_get_bits(&h->s.gb, ptr, 8*dst_length); + init_get_bits(&h->gb, ptr, 8*dst_length); switch(h->nal_unit_type) { case NAL_SPS: ff_h264_decode_seq_parameter_set(h); break; case NAL_PPS: - ff_h264_decode_picture_parameter_set(h, h->s.gb.size_in_bits); + ff_h264_decode_picture_parameter_set(h, h->gb.size_in_bits); break; case NAL_SEI: ff_h264_decode_sei(h); @@ -161,40 +162,40 @@ static inline int parse_nal_units(AVCodecParserContext *s, s->key_frame = 1; /* fall through */ case NAL_SLICE: - get_ue_golomb(&h->s.gb); // skip first_mb_in_slice - slice_type = get_ue_golomb_31(&h->s.gb); + 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) { /* key frame, since recovery_frame_cnt is set */ s->key_frame = 1; } - pps_id= get_ue_golomb(&h->s.gb); + pps_id= get_ue_golomb(&h->gb); if(pps_id>=MAX_PPS_COUNT) { - av_log(h->s.avctx, AV_LOG_ERROR, "pps_id out of range\n"); + av_log(h->avctx, AV_LOG_ERROR, "pps_id out of range\n"); return -1; } if(!h->pps_buffers[pps_id]) { - av_log(h->s.avctx, AV_LOG_ERROR, "non-existing PPS referenced\n"); + av_log(h->avctx, AV_LOG_ERROR, "non-existing PPS referenced\n"); return -1; } h->pps= *h->pps_buffers[pps_id]; if(!h->sps_buffers[h->pps.sps_id]) { - av_log(h->s.avctx, AV_LOG_ERROR, "non-existing SPS referenced\n"); + av_log(h->avctx, AV_LOG_ERROR, "non-existing SPS referenced\n"); return -1; } h->sps = *h->sps_buffers[h->pps.sps_id]; - h->frame_num = get_bits(&h->s.gb, h->sps.log2_max_frame_num); + h->frame_num = get_bits(&h->gb, h->sps.log2_max_frame_num); - avctx->profile = h->sps.profile_idc; + avctx->profile = ff_h264_get_profile(&h->sps); avctx->level = h->sps.level_idc; if(h->sps.frame_mbs_only_flag){ - h->s.picture_structure= PICT_FRAME; + h->picture_structure= PICT_FRAME; }else{ - if(get_bits1(&h->s.gb)) { //field_pic_flag - h->s.picture_structure= PICT_TOP_FIELD + get_bits1(&h->s.gb); //bottom_field_flag + if(get_bits1(&h->gb)) { //field_pic_flag + h->picture_structure= PICT_TOP_FIELD + get_bits1(&h->gb); //bottom_field_flag } else { - h->s.picture_structure= PICT_FRAME; + h->picture_structure= PICT_FRAME; } } @@ -220,11 +221,11 @@ static inline int parse_nal_units(AVCodecParserContext *s, s->repeat_pict = 5; break; default: - s->repeat_pict = h->s.picture_structure == PICT_FRAME ? 1 : 0; + s->repeat_pict = h->picture_structure == PICT_FRAME ? 1 : 0; break; } } else { - s->repeat_pict = h->s.picture_structure == PICT_FRAME ? 1 : 0; + s->repeat_pict = h->picture_structure == PICT_FRAME ? 1 : 0; } return 0; /* no need to evaluate the rest */ @@ -232,7 +233,7 @@ static inline int parse_nal_units(AVCodecParserContext *s, buf += consumed; } /* didn't find a picture! */ - av_log(h->s.avctx, AV_LOG_ERROR, "missing picture in access unit\n"); + av_log(h->avctx, AV_LOG_ERROR, "missing picture in access unit\n"); return -1; } @@ -242,9 +243,24 @@ static int h264_parse(AVCodecParserContext *s, const uint8_t *buf, int buf_size) { H264Context *h = s->priv_data; - ParseContext *pc = &h->s.parse_context; + ParseContext *pc = &h->parse_context; int next; + if (!h->got_first) { + h->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); + } + } + if(s->flags & PARSER_FLAG_COMPLETE_FRAMES){ next= buf_size; }else{ @@ -260,18 +276,22 @@ static int h264_parse(AVCodecParserContext *s, assert(pc->last_index + next >= 0 ); ff_h264_find_frame_end(h, &pc->buffer[pc->last_index + next], -next); //update state } + } - parse_nal_units(s, avctx, buf, buf_size); + 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; - } else { - s->dts_sync_point = INT_MIN; - s->dts_ref_dts_delta = INT_MIN; - s->pts_dts_delta = INT_MIN; - } + 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; + } else { + s->dts_sync_point = INT_MIN; + s->dts_ref_dts_delta = INT_MIN; + s->pts_dts_delta = INT_MIN; + } + + if (s->flags & PARSER_FLAG_ONCE) { + s->flags &= PARSER_FLAG_COMPLETE_FRAMES; } *poutbuf = buf; @@ -306,7 +326,7 @@ static int h264_split(AVCodecContext *avctx, static void close(AVCodecParserContext *s) { H264Context *h = s->priv_data; - ParseContext *pc = &h->s.parse_context; + ParseContext *pc = &h->parse_context; av_free(pc->buffer); ff_h264_free_context(h); @@ -316,14 +336,15 @@ static int init(AVCodecParserContext *s) { H264Context *h = s->priv_data; h->thread_context[0] = h; + h->slice_context_count = 1; return 0; } -AVCodecParser h264_parser = { - { CODEC_ID_H264 }, - sizeof(H264Context), - init, - h264_parse, - close, - h264_split, +AVCodecParser ff_h264_parser = { + .codec_ids = { AV_CODEC_ID_H264 }, + .priv_data_size = sizeof(H264Context), + .parser_init = init, + .parser_parse = h264_parse, + .parser_close = close, + .split = h264_split, };