From 728d90a0c1973661a9e73da697bf4f90c9d19577 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Tue, 22 Mar 2016 13:31:21 +0100 Subject: h264: decouple h264_sei from the h264 decoder Make the SEI parsing independent of the H264Context, to allow decoupling the parser from the decoder. --- libavcodec/h264.c | 74 ++++++------- libavcodec/h264.h | 103 +----------------- libavcodec/h264_direct.c | 4 +- libavcodec/h264_parser.c | 22 ++-- libavcodec/h264_sei.c | 266 ++++++++++++++++++++++++----------------------- libavcodec/h264_sei.h | 137 ++++++++++++++++++++++++ libavcodec/h264_slice.c | 2 +- 7 files changed, 333 insertions(+), 275 deletions(-) create mode 100644 libavcodec/h264_sei.h (limited to 'libavcodec') diff --git a/libavcodec/h264.c b/libavcodec/h264.c index e415103..060feb9 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -400,7 +400,6 @@ static int h264_init_context(AVCodecContext *avctx, H264Context *h) h->workaround_bugs = avctx->workaround_bugs; h->flags = avctx->flags; h->poc.prev_poc_msb = 1 << 16; - h->x264_build = -1; h->recovery_frame = -1; h->frame_recovered = 0; @@ -408,7 +407,7 @@ static int h264_init_context(AVCodecContext *avctx, H264Context *h) for (i = 0; i < MAX_DELAYED_PIC_COUNT; i++) h->last_pocs[i] = INT_MIN; - ff_h264_reset_sei(h); + ff_h264_sei_uninit(&h->sei); avctx->chroma_sample_location = AVCHROMA_LOC_LEFT; @@ -545,7 +544,8 @@ static void decode_postinit(H264Context *h, int setup_finished) * decoding process if it exists. */ if (sps->pic_struct_present_flag) { - switch (h->sei_pic_struct) { + H264SEIPictureTiming *pt = &h->sei.picture_timing; + switch (pt->pic_struct) { case SEI_PIC_STRUCT_FRAME: break; case SEI_PIC_STRUCT_TOP_FIELD: @@ -575,9 +575,9 @@ static void decode_postinit(H264Context *h, int setup_finished) break; } - if ((h->sei_ct_type & 3) && - h->sei_pic_struct <= SEI_PIC_STRUCT_BOTTOM_TOP) - cur->f->interlaced_frame = (h->sei_ct_type & (1 << 1)) != 0; + if ((pt->ct_type & 3) && + pt->pic_struct <= SEI_PIC_STRUCT_BOTTOM_TOP) + cur->f->interlaced_frame = (pt->ct_type & (1 << 1)) != 0; } else { /* Derive interlacing flag from used decoding process. */ cur->f->interlaced_frame = FIELD_OR_MBAFF_PICTURE(h); @@ -591,8 +591,8 @@ static void decode_postinit(H264Context *h, int setup_finished) if (cur->f->interlaced_frame || sps->pic_struct_present_flag) { /* Use picture timing SEI information. Even if it is a * information of a past frame, better than nothing. */ - if (h->sei_pic_struct == SEI_PIC_STRUCT_TOP_BOTTOM || - h->sei_pic_struct == SEI_PIC_STRUCT_TOP_BOTTOM_TOP) + if (h->sei.picture_timing.pic_struct == SEI_PIC_STRUCT_TOP_BOTTOM || + h->sei.picture_timing.pic_struct == SEI_PIC_STRUCT_TOP_BOTTOM_TOP) cur->f->top_field_first = 1; else cur->f->top_field_first = 0; @@ -602,16 +602,17 @@ static void decode_postinit(H264Context *h, int setup_finished) } } - if (h->sei_frame_packing_present && - h->frame_packing_arrangement_type >= 0 && - h->frame_packing_arrangement_type <= 6 && - h->content_interpretation_type > 0 && - h->content_interpretation_type < 3) { + if (h->sei.frame_packing.present && + h->sei.frame_packing.arrangement_type >= 0 && + h->sei.frame_packing.arrangement_type <= 6 && + h->sei.frame_packing.content_interpretation_type > 0 && + h->sei.frame_packing.content_interpretation_type < 3) { + H264SEIFramePacking *fp = &h->sei.frame_packing; AVStereo3D *stereo = av_stereo3d_create_side_data(cur->f); if (!stereo) return; - switch (h->frame_packing_arrangement_type) { + switch (fp->arrangement_type) { case 0: stereo->type = AV_STEREO3D_CHECKERBOARD; break; @@ -622,7 +623,7 @@ static void decode_postinit(H264Context *h, int setup_finished) stereo->type = AV_STEREO3D_LINES; break; case 3: - if (h->quincunx_subsampling) + if (fp->quincunx_subsampling) stereo->type = AV_STEREO3D_SIDEBYSIDE_QUINCUNX; else stereo->type = AV_STEREO3D_SIDEBYSIDE; @@ -638,13 +639,16 @@ static void decode_postinit(H264Context *h, int setup_finished) break; } - if (h->content_interpretation_type == 2) + if (fp->content_interpretation_type == 2) stereo->flags = AV_STEREO3D_FLAG_INVERT; } - if (h->sei_display_orientation_present && - (h->sei_anticlockwise_rotation || h->sei_hflip || h->sei_vflip)) { - double angle = h->sei_anticlockwise_rotation * 360 / (double) (1 << 16); + if (h->sei.display_orientation.present && + (h->sei.display_orientation.anticlockwise_rotation || + h->sei.display_orientation.hflip || + h->sei.display_orientation.vflip)) { + H264SEIDisplayOrientation *o = &h->sei.display_orientation; + double angle = o->anticlockwise_rotation * 360 / (double) (1 << 16); AVFrameSideData *rotation = av_frame_new_side_data(cur->f, AV_FRAME_DATA_DISPLAYMATRIX, sizeof(int32_t) * 9); @@ -653,29 +657,30 @@ static void decode_postinit(H264Context *h, int setup_finished) av_display_rotation_set((int32_t *)rotation->data, angle); av_display_matrix_flip((int32_t *)rotation->data, - h->sei_hflip, h->sei_vflip); + o->hflip, o->vflip); } - if (h->sei_reguserdata_afd_present) { + if (h->sei.afd.present) { AVFrameSideData *sd = av_frame_new_side_data(cur->f, AV_FRAME_DATA_AFD, sizeof(uint8_t)); if (!sd) return; - *sd->data = h->active_format_description; - h->sei_reguserdata_afd_present = 0; + *sd->data = h->sei.afd.active_format_description; + h->sei.afd.present = 0; } - if (h->a53_caption) { + if (h->sei.a53_caption.a53_caption) { + H264SEIA53Caption *a53 = &h->sei.a53_caption; AVFrameSideData *sd = av_frame_new_side_data(cur->f, AV_FRAME_DATA_A53_CC, - h->a53_caption_size); + a53->a53_caption_size); if (!sd) return; - memcpy(sd->data, h->a53_caption, h->a53_caption_size); - av_freep(&h->a53_caption); - h->a53_caption_size = 0; + memcpy(sd->data, a53->a53_caption, a53->a53_caption_size); + av_freep(&a53->a53_caption); + a53->a53_caption_size = 0; } // FIXME do something with unavailable reference frames @@ -831,7 +836,7 @@ void ff_h264_flush_change(H264Context *h) if (h->cur_pic_ptr) h->cur_pic_ptr->reference = 0; h->first_field = 0; - ff_h264_reset_sei(h); + ff_h264_sei_uninit(&h->sei); h->recovery_frame = -1; h->frame_recovered = 0; } @@ -927,7 +932,7 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size, h->current_slice = 0; if (!h->first_field) h->cur_pic_ptr = NULL; - ff_h264_reset_sei(h); + ff_h264_sei_uninit(&h->sei); } ret = ff_h2645_packet_split(&h->pkt, buf, buf_size, avctx, h->is_avc, @@ -984,13 +989,13 @@ again: if ((err = ff_h264_decode_slice_header(h, sl))) break; - if (h->sei_recovery_frame_cnt >= 0 && h->recovery_frame < 0) { - h->recovery_frame = (h->poc.frame_num + h->sei_recovery_frame_cnt) & + if (h->sei.recovery_point.recovery_frame_cnt >= 0 && h->recovery_frame < 0) { + h->recovery_frame = (h->poc.frame_num + h->sei.recovery_point.recovery_frame_cnt) & ((1 << h->ps.sps->log2_max_frame_num) - 1); } h->cur_pic_ptr->f->key_frame |= - (nal->type == NAL_IDR_SLICE) || (h->sei_recovery_frame_cnt >= 0); + (nal->type == NAL_IDR_SLICE) || (h->sei.recovery_point.recovery_frame_cnt >= 0); if (nal->type == NAL_IDR_SLICE || h->recovery_frame == h->poc.frame_num) { h->recovery_frame = -1; @@ -1034,8 +1039,7 @@ again: goto end; break; case NAL_SEI: - h->gb = nal->gb; - ret = ff_h264_decode_sei(h); + ret = ff_h264_sei_decode(&h->sei, &nal->gb, &h->ps, avctx); if (ret < 0 && (h->avctx->err_recognition & AV_EF_EXPLODE)) goto end; break; diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 007ce58..a7e926b 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -35,6 +35,7 @@ #include "error_resilience.h" #include "get_bits.h" #include "h264_parse.h" +#include "h264_sei.h" #include "h2645_parse.h" #include "h264chroma.h" #include "h264dsp.h" @@ -128,34 +129,6 @@ enum { }; /** - * SEI message types - */ -typedef enum { - SEI_TYPE_BUFFERING_PERIOD = 0, ///< buffering period (H.264, D.1.1) - SEI_TYPE_PIC_TIMING = 1, ///< picture timing - SEI_TYPE_USER_DATA_REGISTERED = 4, ///< registered user data as specified by Rec. ITU-T T.35 - SEI_TYPE_USER_DATA_UNREGISTERED = 5, ///< unregistered user data - SEI_TYPE_RECOVERY_POINT = 6, ///< recovery point (frame # to decoder sync) - SEI_TYPE_FRAME_PACKING = 45, ///< frame packing arrangement - SEI_TYPE_DISPLAY_ORIENTATION = 47, ///< display orientation -} SEI_Type; - -/** - * pic_struct in picture timing SEI message - */ -typedef enum { - SEI_PIC_STRUCT_FRAME = 0, ///< 0: %frame - SEI_PIC_STRUCT_TOP_FIELD = 1, ///< 1: top field - SEI_PIC_STRUCT_BOTTOM_FIELD = 2, ///< 2: bottom field - SEI_PIC_STRUCT_TOP_BOTTOM = 3, ///< 3: top field, bottom field, in that order - SEI_PIC_STRUCT_BOTTOM_TOP = 4, ///< 4: bottom field, top field, in that order - SEI_PIC_STRUCT_TOP_BOTTOM_TOP = 5, ///< 5: top field, bottom field, top field repeated, in that order - SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM = 6, ///< 6: bottom field, top field, bottom field repeated, in that order - SEI_PIC_STRUCT_FRAME_DOUBLING = 7, ///< 7: %frame doubling - SEI_PIC_STRUCT_FRAME_TRIPLING = 8 ///< 8: %frame tripling -} SEI_PicStructType; - -/** * Sequence parameter set */ typedef struct SPS { @@ -551,8 +524,6 @@ typedef struct H264Context { const uint8_t *field_scan8x8_q0; const uint8_t *field_scan8x8_cavlc_q0; - int x264_build; - int mb_y; int mb_height, mb_width; int mb_stride; @@ -636,11 +607,6 @@ typedef struct H264Context { /** @} */ /** - * pic_struct in picture timing SEI message - */ - SEI_PicStructType sei_pic_struct; - - /** * Complement sei_pic_struct * SEI_PIC_STRUCT_TOP_BOTTOM and SEI_PIC_STRUCT_BOTTOM_TOP indicate interlaced frames. * However, soft telecined frames may have these values. @@ -649,55 +615,6 @@ typedef struct H264Context { int prev_interlaced_frame; /** - * frame_packing_arrangment SEI message - */ - int sei_frame_packing_present; - int frame_packing_arrangement_type; - int content_interpretation_type; - int quincunx_subsampling; - - /** - * display orientation SEI message - */ - int sei_display_orientation_present; - int sei_anticlockwise_rotation; - int sei_hflip, sei_vflip; - - /** - * User data registered by Rec. ITU-T T.35 SEI - */ - int sei_reguserdata_afd_present; - uint8_t active_format_description; - int a53_caption_size; - uint8_t *a53_caption; - - /** - * Bit set of clock types for fields/frames in picture timing SEI message. - * For each found ct_type, appropriate bit is set (e.g., bit 1 for - * interlaced). - */ - int sei_ct_type; - - /** - * dpb_output_delay in picture timing SEI message, see H.264 C.2.2 - */ - int sei_dpb_output_delay; - - /** - * cpb_removal_delay in picture timing SEI message, see H.264 C.1.2 - */ - int sei_cpb_removal_delay; - - /** - * recovery_frame_cnt from SEI message - * - * Set to -1 if no recovery point SEI message found or to number of frames - * before playback synchronizes. Frames having recovery point are key - * frames. - */ - int sei_recovery_frame_cnt; - - /** * recovery_frame is the frame_num at which the next frame should * be fully constructed. * @@ -724,12 +641,10 @@ typedef struct H264Context { * slices) anymore */ int setup_finished; - // Timestamp stuff - int sei_buffering_period_present; ///< Buffering period SEI flag - int initial_cpb_removal_delay[32]; ///< Initial timestamps for CPBs - int enable_er; + H264SEIContext sei; + AVBufferPool *qscale_table_pool; AVBufferPool *mb_type_pool; AVBufferPool *motion_val_pool; @@ -743,11 +658,6 @@ typedef struct H264Context { extern const uint16_t ff_h264_mb_sizes[4]; /** - * Decode SEI - */ -int ff_h264_decode_sei(H264Context *h); - -/** * Decode SPS */ int ff_h264_decode_seq_parameter_set(GetBitContext *gb, AVCodecContext *avctx, @@ -828,13 +738,6 @@ void ff_h264_filter_mb(const H264Context *h, H264SliceContext *sl, int mb_x, int uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr, unsigned int linesize, unsigned int uvlinesize); -/** - * Reset SEI values at the beginning of the frame. - * - * @param h H.264 context. - */ -void ff_h264_reset_sei(H264Context *h); - /* * o-o o-o * / / / diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c index 391f8f1..9b6bb44 100644 --- a/libavcodec/h264_direct.c +++ b/libavcodec/h264_direct.c @@ -390,7 +390,7 @@ single_col: (l1ref0[0] < 0 && !l1ref1[0] && FFABS(l1mv1[0][0]) <= 1 && FFABS(l1mv1[0][1]) <= 1 && - h->x264_build > 33U))) { + h->sei.unregistered.x264_build > 33U))) { a = b = 0; if (ref[0] > 0) a = mv[0]; @@ -425,7 +425,7 @@ single_col: (l1ref0[i8] == 0 || (l1ref0[i8] < 0 && l1ref1[i8] == 0 && - h->x264_build > 33U))) { + h->sei.unregistered.x264_build > 33U))) { const int16_t (*l1mv)[2] = l1ref0[i8] == 0 ? l1mv0 : l1mv1; if (IS_SUB_8X8(sub_mb_type)) { const int16_t *mv_col = l1mv[x8 * 3 + y8 * 3 * b4_stride]; diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index 991a841..7c674b8 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -37,6 +37,7 @@ #include "get_bits.h" #include "golomb.h" #include "h264.h" +#include "h264_sei.h" #include "h264data.h" #include "internal.h" #include "mpegutils.h" @@ -48,6 +49,7 @@ typedef struct H264ParseContext { H264ParamSets ps; H264DSPContext h264dsp; H264POCContext poc; + H264SEIContext sei; int got_first; } H264ParseContext; @@ -216,7 +218,7 @@ static inline int parse_nal_units(AVCodecParserContext *s, s->picture_structure = AV_PICTURE_STRUCTURE_UNKNOWN; h->avctx = avctx; - ff_h264_reset_sei(h); + ff_h264_sei_uninit(&p->sei); if (!buf_size) return 0; @@ -270,7 +272,7 @@ static inline int parse_nal_units(AVCodecParserContext *s, nal.size_bits); break; case NAL_SEI: - ff_h264_decode_sei(h); + ff_h264_sei_decode(&p->sei, &nal.gb, &p->ps, avctx); break; case NAL_IDR_SLICE: s->key_frame = 1; @@ -284,7 +286,7 @@ static inline int parse_nal_units(AVCodecParserContext *s, 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 (h->sei_recovery_frame_cnt >= 0) { + if (p->sei.recovery_point.recovery_frame_cnt >= 0) { /* key frame, since recovery_frame_cnt is set */ s->key_frame = 1; } @@ -405,7 +407,7 @@ static inline int parse_nal_units(AVCodecParserContext *s, } if (sps->pic_struct_present_flag) { - switch (h->sei_pic_struct) { + switch (p->sei.picture_timing.pic_struct) { case SEI_PIC_STRUCT_TOP_FIELD: case SEI_PIC_STRUCT_BOTTOM_FIELD: s->repeat_pict = 0; @@ -436,7 +438,7 @@ static inline int parse_nal_units(AVCodecParserContext *s, if (h->picture_structure == PICT_FRAME) { s->picture_structure = AV_PICTURE_STRUCTURE_FRAME; if (sps->pic_struct_present_flag) { - switch (h->sei_pic_struct) { + switch (p->sei.picture_timing.pic_struct) { case SEI_PIC_STRUCT_TOP_BOTTOM: case SEI_PIC_STRUCT_TOP_BOTTOM_TOP: s->field_order = AV_FIELD_TT; @@ -521,10 +523,10 @@ static int h264_parse(AVCodecParserContext *s, 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; @@ -581,6 +583,8 @@ static void h264_close(AVCodecParserContext *s) 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]); diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c index aedb295..5e794d6 100644 --- a/libavcodec/h264_sei.c +++ b/libavcodec/h264_sei.c @@ -26,113 +26,116 @@ */ #include "avcodec.h" +#include "get_bits.h" #include "golomb.h" #include "h264.h" +#include "h264_sei.h" #include "internal.h" static const uint8_t sei_num_clock_ts_table[9] = { 1, 1, 1, 2, 2, 3, 3, 2, 3 }; -void ff_h264_reset_sei(H264Context *h) +void ff_h264_sei_uninit(H264SEIContext *h) { - h->sei_recovery_frame_cnt = -1; - h->sei_dpb_output_delay = 0; - h->sei_cpb_removal_delay = -1; - h->sei_buffering_period_present = 0; - h->sei_frame_packing_present = 0; - h->sei_display_orientation_present = 0; - h->sei_reguserdata_afd_present = 0; - - h->a53_caption_size = 0; - av_freep(&h->a53_caption); + h->unregistered.x264_build = -1; + h->recovery_point.recovery_frame_cnt = -1; + + h->picture_timing.dpb_output_delay = 0; + h->picture_timing.cpb_removal_delay = -1; + + h->buffering_period.present = 0; + h->frame_packing.present = 0; + h->display_orientation.present = 0; + h->afd.present = 0; + + h->a53_caption.a53_caption_size = 0; + av_freep(&h->a53_caption.a53_caption); } -static int decode_picture_timing(H264Context *h) +static int decode_picture_timing(H264SEIPictureTiming *h, GetBitContext *gb, + const SPS *sps, void *logctx) { - const SPS *sps = h->ps.sps; - if (!sps) return AVERROR_INVALIDDATA; if (sps->nal_hrd_parameters_present_flag || sps->vcl_hrd_parameters_present_flag) { - h->sei_cpb_removal_delay = get_bits(&h->gb, - sps->cpb_removal_delay_length); - h->sei_dpb_output_delay = get_bits(&h->gb, - sps->dpb_output_delay_length); + h->cpb_removal_delay = get_bits(gb, sps->cpb_removal_delay_length); + h->dpb_output_delay = get_bits(gb, sps->dpb_output_delay_length); } if (sps->pic_struct_present_flag) { unsigned int i, num_clock_ts; - h->sei_pic_struct = get_bits(&h->gb, 4); - h->sei_ct_type = 0; + h->pic_struct = get_bits(gb, 4); + h->ct_type = 0; - if (h->sei_pic_struct > SEI_PIC_STRUCT_FRAME_TRIPLING) + if (h->pic_struct > SEI_PIC_STRUCT_FRAME_TRIPLING) return AVERROR_INVALIDDATA; - num_clock_ts = sei_num_clock_ts_table[h->sei_pic_struct]; + num_clock_ts = sei_num_clock_ts_table[h->pic_struct]; for (i = 0; i < num_clock_ts; i++) { - if (get_bits(&h->gb, 1)) { /* clock_timestamp_flag */ + if (get_bits(gb, 1)) { /* clock_timestamp_flag */ unsigned int full_timestamp_flag; - h->sei_ct_type |= 1 << get_bits(&h->gb, 2); - skip_bits(&h->gb, 1); /* nuit_field_based_flag */ - skip_bits(&h->gb, 5); /* counting_type */ - full_timestamp_flag = get_bits(&h->gb, 1); - skip_bits(&h->gb, 1); /* discontinuity_flag */ - skip_bits(&h->gb, 1); /* cnt_dropped_flag */ - skip_bits(&h->gb, 8); /* n_frames */ + h->ct_type |= 1 << get_bits(gb, 2); + skip_bits(gb, 1); /* nuit_field_based_flag */ + skip_bits(gb, 5); /* counting_type */ + full_timestamp_flag = get_bits(gb, 1); + skip_bits(gb, 1); /* discontinuity_flag */ + skip_bits(gb, 1); /* cnt_dropped_flag */ + skip_bits(gb, 8); /* n_frames */ if (full_timestamp_flag) { - skip_bits(&h->gb, 6); /* seconds_value 0..59 */ - skip_bits(&h->gb, 6); /* minutes_value 0..59 */ - skip_bits(&h->gb, 5); /* hours_value 0..23 */ + skip_bits(gb, 6); /* seconds_value 0..59 */ + skip_bits(gb, 6); /* minutes_value 0..59 */ + skip_bits(gb, 5); /* hours_value 0..23 */ } else { - if (get_bits(&h->gb, 1)) { /* seconds_flag */ - skip_bits(&h->gb, 6); /* seconds_value range 0..59 */ - if (get_bits(&h->gb, 1)) { /* minutes_flag */ - skip_bits(&h->gb, 6); /* minutes_value 0..59 */ - if (get_bits(&h->gb, 1)) /* hours_flag */ - skip_bits(&h->gb, 5); /* hours_value 0..23 */ + if (get_bits(gb, 1)) { /* seconds_flag */ + skip_bits(gb, 6); /* seconds_value range 0..59 */ + if (get_bits(gb, 1)) { /* minutes_flag */ + skip_bits(gb, 6); /* minutes_value 0..59 */ + if (get_bits(gb, 1)) /* hours_flag */ + skip_bits(gb, 5); /* hours_value 0..23 */ } } } if (sps->time_offset_length > 0) - skip_bits(&h->gb, + skip_bits(gb, sps->time_offset_length); /* time_offset */ } } - if (h->avctx->debug & FF_DEBUG_PICT_INFO) - av_log(h->avctx, AV_LOG_DEBUG, "ct_type:%X pic_struct:%d\n", - h->sei_ct_type, h->sei_pic_struct); + av_log(logctx, AV_LOG_DEBUG, "ct_type:%X pic_struct:%d\n", + h->ct_type, h->pic_struct); } return 0; } -static int decode_registered_user_data_afd(H264Context *h, int size) +static int decode_registered_user_data_afd(H264SEIAFD *h, GetBitContext *gb, int size) { int flag; if (size-- < 1) return AVERROR_INVALIDDATA; - skip_bits(&h->gb, 1); // 0 - flag = get_bits(&h->gb, 1); // active_format_flag - skip_bits(&h->gb, 6); // reserved + skip_bits(gb, 1); // 0 + flag = get_bits(gb, 1); // active_format_flag + skip_bits(gb, 6); // reserved if (flag) { if (size-- < 1) return AVERROR_INVALIDDATA; - skip_bits(&h->gb, 4); // reserved - h->active_format_description = get_bits(&h->gb, 4); - h->sei_reguserdata_afd_present = 1; + skip_bits(gb, 4); // reserved + h->active_format_description = get_bits(gb, 4); + h->present = 1; } return 0; } -static int decode_registered_user_data_closed_caption(H264Context *h, int size) +static int decode_registered_user_data_closed_caption(H264SEIA53Caption *h, + GetBitContext *gb, void *logctx, + int size) { int flag; int user_data_type_code; @@ -141,15 +144,15 @@ static int decode_registered_user_data_closed_caption(H264Context *h, int size) if (size < 3) return AVERROR(EINVAL); - user_data_type_code = get_bits(&h->gb, 8); + user_data_type_code = get_bits(gb, 8); if (user_data_type_code == 0x3) { - skip_bits(&h->gb, 1); // reserved + skip_bits(gb, 1); // reserved - flag = get_bits(&h->gb, 1); // process_cc_data_flag + flag = get_bits(gb, 1); // process_cc_data_flag if (flag) { - skip_bits(&h->gb, 1); // zero bit - cc_count = get_bits(&h->gb, 5); - skip_bits(&h->gb, 8); // reserved + skip_bits(gb, 1); // zero bit + cc_count = get_bits(gb, 5); + skip_bits(gb, 8); // reserved size -= 2; if (cc_count && size >= cc_count * 3) { @@ -166,26 +169,27 @@ static int decode_registered_user_data_closed_caption(H264Context *h, int size) return ret; for (i = 0; i < cc_count; i++) { - h->a53_caption[h->a53_caption_size++] = get_bits(&h->gb, 8); - h->a53_caption[h->a53_caption_size++] = get_bits(&h->gb, 8); - h->a53_caption[h->a53_caption_size++] = get_bits(&h->gb, 8); + h->a53_caption[h->a53_caption_size++] = get_bits(gb, 8); + h->a53_caption[h->a53_caption_size++] = get_bits(gb, 8); + h->a53_caption[h->a53_caption_size++] = get_bits(gb, 8); } - skip_bits(&h->gb, 8); // marker_bits + skip_bits(gb, 8); // marker_bits } } } else { int i; - avpriv_request_sample(h->avctx, "Subtitles with data type 0x%02x", + avpriv_request_sample(logctx, "Subtitles with data type 0x%02x", user_data_type_code); for (i = 0; i < size - 1; i++) - skip_bits(&h->gb, 8); + skip_bits(gb, 8); } return 0; } -static int decode_registered_user_data(H264Context *h, int size) +static int decode_registered_user_data(H264SEIContext *h, GetBitContext *gb, + void *logctx, int size) { uint32_t country_code; uint32_t user_identifier; @@ -194,31 +198,33 @@ static int decode_registered_user_data(H264Context *h, int size) return AVERROR_INVALIDDATA; size -= 7; - country_code = get_bits(&h->gb, 8); // itu_t_t35_country_code + country_code = get_bits(gb, 8); // itu_t_t35_country_code if (country_code == 0xFF) { - skip_bits(&h->gb, 8); // itu_t_t35_country_code_extension_byte + skip_bits(gb, 8); // itu_t_t35_country_code_extension_byte size--; } /* itu_t_t35_payload_byte follows */ - skip_bits(&h->gb, 8); // terminal provider code - skip_bits(&h->gb, 8); // terminal provider oriented code - user_identifier = get_bits_long(&h->gb, 32); + skip_bits(gb, 8); // terminal provider code + skip_bits(gb, 8); // terminal provider oriented code + user_identifier = get_bits_long(gb, 32); switch (user_identifier) { case MKBETAG('D', 'T', 'G', '1'): // afd_data - return decode_registered_user_data_afd(h, size); + return decode_registered_user_data_afd(&h->afd, gb, size); case MKBETAG('G', 'A', '9', '4'): // closed captions - return decode_registered_user_data_closed_caption(h, size); + return decode_registered_user_data_closed_caption(&h->a53_caption, gb, + logctx, size); default: - skip_bits(&h->gb, size * 8); + skip_bits(gb, size * 8); break; } return 0; } -static int decode_unregistered_user_data(H264Context *h, int size) +static int decode_unregistered_user_data(H264SEIUnregistered *h, GetBitContext *gb, + void *logctx, int size) { uint8_t *user_data; int e, build, i; @@ -231,7 +237,7 @@ static int decode_unregistered_user_data(H264Context *h, int size) return AVERROR(ENOMEM); for (i = 0; i < size + 16; i++) - user_data[i] = get_bits(&h->gb, 8); + user_data[i] = get_bits(gb, 8); user_data[i] = 0; e = sscanf(user_data + 16, "x264 - core %d", &build); @@ -239,159 +245,163 @@ static int decode_unregistered_user_data(H264Context *h, int size) h->x264_build = build; if (strlen(user_data + 16) > 0) - av_log(h->avctx, AV_LOG_DEBUG, "user data:\"%s\"\n", user_data + 16); + av_log(logctx, AV_LOG_DEBUG, "user data:\"%s\"\n", user_data + 16); av_free(user_data); return 0; } -static int decode_recovery_point(H264Context *h) +static int decode_recovery_point(H264SEIRecoveryPoint *h, GetBitContext *gb) { - h->sei_recovery_frame_cnt = get_ue_golomb(&h->gb); + h->recovery_frame_cnt = get_ue_golomb(gb); /* 1b exact_match_flag, * 1b broken_link_flag, * 2b changing_slice_group_idc */ - skip_bits(&h->gb, 4); + skip_bits(gb, 4); return 0; } -static int decode_buffering_period(H264Context *h) +static int decode_buffering_period(H264SEIBufferingPeriod *h, GetBitContext *gb, + const H264ParamSets *ps, void *logctx) { unsigned int sps_id; int sched_sel_idx; SPS *sps; - sps_id = get_ue_golomb_31(&h->gb); - if (sps_id > 31 || !h->ps.sps_list[sps_id]) { - av_log(h->avctx, AV_LOG_ERROR, + sps_id = get_ue_golomb_31(gb); + if (sps_id > 31 || !ps->sps_list[sps_id]) { + av_log(logctx, AV_LOG_ERROR, "non-existing SPS %d referenced in buffering period\n", sps_id); return AVERROR_INVALIDDATA; } - sps = (SPS*)h->ps.sps_list[sps_id]->data; + sps = (SPS*)ps->sps_list[sps_id]->data; // NOTE: This is really so duplicated in the standard... See H.264, D.1.1 if (sps->nal_hrd_parameters_present_flag) { for (sched_sel_idx = 0; sched_sel_idx < sps->cpb_cnt; sched_sel_idx++) { h->initial_cpb_removal_delay[sched_sel_idx] = - get_bits(&h->gb, sps->initial_cpb_removal_delay_length); + get_bits(gb, sps->initial_cpb_removal_delay_length); // initial_cpb_removal_delay_offset - skip_bits(&h->gb, sps->initial_cpb_removal_delay_length); + skip_bits(gb, sps->initial_cpb_removal_delay_length); } } if (sps->vcl_hrd_parameters_present_flag) { for (sched_sel_idx = 0; sched_sel_idx < sps->cpb_cnt; sched_sel_idx++) { h->initial_cpb_removal_delay[sched_sel_idx] = - get_bits(&h->gb, sps->initial_cpb_removal_delay_length); + get_bits(gb, sps->initial_cpb_removal_delay_length); // initial_cpb_removal_delay_offset - skip_bits(&h->gb, sps->initial_cpb_removal_delay_length); + skip_bits(gb, sps->initial_cpb_removal_delay_length); } } - h->sei_buffering_period_present = 1; + h->present = 1; return 0; } -static int decode_frame_packing_arrangement(H264Context *h) +static int decode_frame_packing_arrangement(H264SEIFramePacking *h, + GetBitContext *gb) { - get_ue_golomb(&h->gb); // frame_packing_arrangement_id - h->sei_frame_packing_present = !get_bits1(&h->gb); + get_ue_golomb(gb); // frame_packing_arrangement_id + h->present = !get_bits1(gb); - if (h->sei_frame_packing_present) { - h->frame_packing_arrangement_type = get_bits(&h->gb, 7); - h->quincunx_subsampling = get_bits1(&h->gb); - h->content_interpretation_type = get_bits(&h->gb, 6); + if (h->present) { + h->arrangement_type = get_bits(gb, 7); + h->quincunx_subsampling = get_bits1(gb); + h->content_interpretation_type = get_bits(gb, 6); // the following skips: spatial_flipping_flag, frame0_flipped_flag, // field_views_flag, current_frame_is_frame0_flag, // frame0_self_contained_flag, frame1_self_contained_flag - skip_bits(&h->gb, 6); + skip_bits(gb, 6); - if (!h->quincunx_subsampling && h->frame_packing_arrangement_type != 5) - skip_bits(&h->gb, 16); // frame[01]_grid_position_[xy] - skip_bits(&h->gb, 8); // frame_packing_arrangement_reserved_byte - get_ue_golomb(&h->gb); // frame_packing_arrangement_repetition_period + if (!h->quincunx_subsampling && h->arrangement_type != 5) + skip_bits(gb, 16); // frame[01]_grid_position_[xy] + skip_bits(gb, 8); // frame_packing_arrangement_reserved_byte + get_ue_golomb(gb); // frame_packing_arrangement_repetition_period } - skip_bits1(&h->gb); // frame_packing_arrangement_extension_flag + skip_bits1(gb); // frame_packing_arrangement_extension_flag return 0; } -static int decode_display_orientation(H264Context *h) +static int decode_display_orientation(H264SEIDisplayOrientation *h, + GetBitContext *gb) { - h->sei_display_orientation_present = !get_bits1(&h->gb); + h->present = !get_bits1(gb); - if (h->sei_display_orientation_present) { - h->sei_hflip = get_bits1(&h->gb); // hor_flip - h->sei_vflip = get_bits1(&h->gb); // ver_flip + if (h->present) { + h->hflip = get_bits1(gb); // hor_flip + h->vflip = get_bits1(gb); // ver_flip - h->sei_anticlockwise_rotation = get_bits(&h->gb, 16); - get_ue_golomb(&h->gb); // display_orientation_repetition_period - skip_bits1(&h->gb); // display_orientation_extension_flag + h->anticlockwise_rotation = get_bits(gb, 16); + get_ue_golomb(gb); // display_orientation_repetition_period + skip_bits1(gb); // display_orientation_extension_flag } return 0; } -int ff_h264_decode_sei(H264Context *h) +int ff_h264_sei_decode(H264SEIContext *h, GetBitContext *gb, + const H264ParamSets *ps, void *logctx) { - while (get_bits_left(&h->gb) > 16) { + while (get_bits_left(gb) > 16) { int size = 0; int type = 0; int ret = 0; int last = 0; - while (get_bits_left(&h->gb) >= 8 && - (last = get_bits(&h->gb, 8)) == 255) { + while (get_bits_left(gb) >= 8 && + (last = get_bits(gb, 8)) == 255) { type += 255; } type += last; last = 0; - while (get_bits_left(&h->gb) >= 8 && - (last = get_bits(&h->gb, 8)) == 255) { + while (get_bits_left(gb) >= 8 && + (last = get_bits(gb, 8)) == 255) { size += 255; } size += last; - if (size > get_bits_left(&h->gb) / 8) { - av_log(h->avctx, AV_LOG_ERROR, "SEI type %d truncated at %d\n", - type, get_bits_left(&h->gb)); + if (size > get_bits_left(gb) / 8) { + av_log(logctx, AV_LOG_ERROR, "SEI type %d truncated at %d\n", + type, get_bits_left(gb)); return AVERROR_INVALIDDATA; } switch (type) { case SEI_TYPE_PIC_TIMING: // Picture timing SEI - ret = decode_picture_timing(h); + ret = decode_picture_timing(&h->picture_timing, gb, ps->sps, logctx); break; case SEI_TYPE_USER_DATA_REGISTERED: - ret = decode_registered_user_data(h, size); + ret = decode_registered_user_data(h, gb, logctx, size); break; case SEI_TYPE_USER_DATA_UNREGISTERED: - ret = decode_unregistered_user_data(h, size); + ret = decode_unregistered_user_data(&h->unregistered, gb, logctx, size); break; case SEI_TYPE_RECOVERY_POINT: - ret = decode_recovery_point(h); + ret = decode_recovery_point(&h->recovery_point, gb); break; case SEI_TYPE_BUFFERING_PERIOD: - ret = decode_buffering_period(h); + ret = decode_buffering_period(&h->buffering_period, gb, ps, logctx); break; case SEI_TYPE_FRAME_PACKING: - ret = decode_frame_packing_arrangement(h); + ret = decode_frame_packing_arrangement(&h->frame_packing, gb); break; case SEI_TYPE_DISPLAY_ORIENTATION: - ret = decode_display_orientation(h); + ret = decode_display_orientation(&h->display_orientation, gb); break; default: - av_log(h->avctx, AV_LOG_DEBUG, "unknown SEI type %d\n", type); - skip_bits(&h->gb, 8 * size); + av_log(logctx, AV_LOG_DEBUG, "unknown SEI type %d\n", type); + skip_bits(gb, 8 * size); } if (ret < 0) return ret; // FIXME check bits here - align_get_bits(&h->gb); + align_get_bits(gb); } return 0; diff --git a/libavcodec/h264_sei.h b/libavcodec/h264_sei.h new file mode 100644 index 0000000..58f5ecc --- /dev/null +++ b/libavcodec/h264_sei.h @@ -0,0 +1,137 @@ +/* + * This file is part of Libav. + * + * 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. + * + * 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 Libav; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_H264_SEI_H +#define AVCODEC_H264_SEI_H + +#include "get_bits.h" + +/** + * SEI message types + */ +typedef enum { + SEI_TYPE_BUFFERING_PERIOD = 0, ///< buffering period (H.264, D.1.1) + SEI_TYPE_PIC_TIMING = 1, ///< picture timing + SEI_TYPE_USER_DATA_REGISTERED = 4, ///< registered user data as specified by Rec. ITU-T T.35 + SEI_TYPE_USER_DATA_UNREGISTERED = 5, ///< unregistered user data + SEI_TYPE_RECOVERY_POINT = 6, ///< recovery point (frame # to decoder sync) + SEI_TYPE_FRAME_PACKING = 45, ///< frame packing arrangement + SEI_TYPE_DISPLAY_ORIENTATION = 47, ///< display orientation +} SEI_Type; + +/** + * pic_struct in picture timing SEI message + */ +typedef enum { + SEI_PIC_STRUCT_FRAME = 0, ///< 0: %frame + SEI_PIC_STRUCT_TOP_FIELD = 1, ///< 1: top field + SEI_PIC_STRUCT_BOTTOM_FIELD = 2, ///< 2: bottom field + SEI_PIC_STRUCT_TOP_BOTTOM = 3, ///< 3: top field, bottom field, in that order + SEI_PIC_STRUCT_BOTTOM_TOP = 4, ///< 4: bottom field, top field, in that order + SEI_PIC_STRUCT_TOP_BOTTOM_TOP = 5, ///< 5: top field, bottom field, top field repeated, in that order + SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM = 6, ///< 6: bottom field, top field, bottom field repeated, in that order + SEI_PIC_STRUCT_FRAME_DOUBLING = 7, ///< 7: %frame doubling + SEI_PIC_STRUCT_FRAME_TRIPLING = 8 ///< 8: %frame tripling +} SEI_PicStructType; + +typedef struct H264SEIPictureTiming { + SEI_PicStructType pic_struct; + + /** + * Bit set of clock types for fields/frames in picture timing SEI message. + * For each found ct_type, appropriate bit is set (e.g., bit 1 for + * interlaced). + */ + int ct_type; + + /** + * dpb_output_delay in picture timing SEI message, see H.264 C.2.2 + */ + int dpb_output_delay; + + /** + * cpb_removal_delay in picture timing SEI message, see H.264 C.1.2 + */ + int cpb_removal_delay; +} H264SEIPictureTiming; + +typedef struct H264SEIAFD { + int present; + uint8_t active_format_description; +} H264SEIAFD; + +typedef struct H264SEIA53Caption { + int a53_caption_size; + uint8_t *a53_caption; +} H264SEIA53Caption; + +typedef struct H264SEIUnregistered { + int x264_build; +} H264SEIUnregistered; + +typedef struct H264SEIRecoveryPoint { + /** + * recovery_frame_cnt + * + * Set to -1 if no recovery point SEI message found or to number of frames + * before playback synchronizes. Frames having recovery point are key + * frames. + */ + int recovery_frame_cnt; +} H264SEIRecoveryPoint; + +typedef struct H264SEIBufferingPeriod { + int present; ///< Buffering period SEI flag + int initial_cpb_removal_delay[32]; ///< Initial timestamps for CPBs +} H264SEIBufferingPeriod; + +typedef struct H264SEIFramePacking { + int present; + int arrangement_type; + int content_interpretation_type; + int quincunx_subsampling; +} H264SEIFramePacking; + +typedef struct H264SEIDisplayOrientation { + int present; + int anticlockwise_rotation; + int hflip, vflip; +} H264SEIDisplayOrientation; + +typedef struct H264SEIContext { + H264SEIPictureTiming picture_timing; + H264SEIAFD afd; + H264SEIA53Caption a53_caption; + H264SEIUnregistered unregistered; + H264SEIRecoveryPoint recovery_point; + H264SEIBufferingPeriod buffering_period; + H264SEIFramePacking frame_packing; + H264SEIDisplayOrientation display_orientation; +} H264SEIContext; + +struct H264ParamSets; + +int ff_h264_sei_decode(H264SEIContext *h, GetBitContext *gb, + const struct H264ParamSets *ps, void *logctx); + +/** + * Reset SEI values at the beginning of the frame. + */ +void ff_h264_sei_uninit(H264SEIContext *h); + +#endif /* AVCODEC_H264_SEI_H */ diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 82a5a82..5cbfee1 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -826,7 +826,7 @@ static int h264_slice_header_init(H264Context *h) if (sps->timing_info_present_flag) { int64_t den = sps->time_scale; - if (h->x264_build < 44U) + if (h->sei.unregistered.x264_build < 44U) den *= 2; av_reduce(&h->avctx->framerate.den, &h->avctx->framerate.num, sps->num_units_in_tick, den, 1 << 30); -- cgit v1.1