diff options
Diffstat (limited to 'libavcodec/h264_sei.c')
| -rw-r--r-- | libavcodec/h264_sei.c | 173 |
1 files changed, 147 insertions, 26 deletions
diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c index 6fca2c32a9..88bf0f4977 100644 --- a/libavcodec/h264_sei.c +++ b/libavcodec/h264_sei.c @@ -2,20 +2,20 @@ * H.26L/H.264/AVC/JVT/14496-10/... sei decoding * 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 */ @@ -45,14 +45,20 @@ void ff_h264_reset_sei(H264Context *h) static int decode_picture_timing(H264Context *h) { - if (h->sps.nal_hrd_parameters_present_flag || - h->sps.vcl_hrd_parameters_present_flag) { - h->sei_cpb_removal_delay = get_bits(&h->gb, - h->sps.cpb_removal_delay_length); - h->sei_dpb_output_delay = get_bits(&h->gb, - h->sps.dpb_output_delay_length); + SPS *sps = &h->sps; + int i; + + for (i = 0; i<MAX_SPS_COUNT; i++) + if (!sps->log2_max_frame_num && h->sps_buffers[i]) + sps = h->sps_buffers[i]; + + if (sps->nal_hrd_parameters_present_flag || sps->vcl_hrd_parameters_present_flag) { + h->sei_cpb_removal_delay = get_bits_long(&h->gb, + sps->cpb_removal_delay_length); + h->sei_dpb_output_delay = get_bits_long(&h->gb, + sps->dpb_output_delay_length); } - if (h->sps.pic_struct_present_flag) { + if (sps->pic_struct_present_flag) { unsigned int i, num_clock_ts; h->sei_pic_struct = get_bits(&h->gb, 4); @@ -88,9 +94,9 @@ static int decode_picture_timing(H264Context *h) } } } - if (h->sps.time_offset_length > 0) + if (sps->time_offset_length > 0) skip_bits(&h->gb, - h->sps.time_offset_length); /* time_offset */ + sps->time_offset_length); /* time_offset */ } } @@ -101,6 +107,43 @@ static int decode_picture_timing(H264Context *h) return 0; } +static int decode_user_data_itu_t_t35(H264Context *h, int size) +{ + uint32_t user_identifier; + int dtg_active_format; + + if (size < 7) + return -1; + size -= 7; + + skip_bits(&h->gb, 8); // country_code + skip_bits(&h->gb, 16); // provider_code + user_identifier = get_bits_long(&h->gb, 32); + + switch (user_identifier) { + case 0x44544731: // "DTG1" - AFD_data + if (size < 1) + return -1; + skip_bits(&h->gb, 1); + if (get_bits(&h->gb, 1)) { + skip_bits(&h->gb, 6); + if (size < 2) + return -1; + skip_bits(&h->gb, 4); + dtg_active_format = get_bits(&h->gb, 4); + h->avctx->dtg_active_format = dtg_active_format; + } else { + skip_bits(&h->gb, 6); + } + break; + default: + skip_bits(&h->gb, size * 8); + break; + } + + return 0; +} + static int decode_unregistered_user_data(H264Context *h, int size) { uint8_t user_data[16 + 256]; @@ -116,6 +159,8 @@ static int decode_unregistered_user_data(H264Context *h, int size) e = sscanf(user_data + 16, "x264 - core %d", &build); if (e == 1 && build > 0) h->x264_build = build; + if (e == 1 && build == 1 && !strncmp(user_data+16, "x264 - core 0000", 16)) + h->x264_build = 67; if (h->avctx->debug & FF_DEBUG_BUGS) av_log(h->avctx, AV_LOG_DEBUG, "user data:\"%s\"\n", user_data + 16); @@ -135,6 +180,11 @@ static int decode_recovery_point(H264Context *h) * 2b changing_slice_group_idc */ skip_bits(&h->gb, 4); + if (h->avctx->debug & FF_DEBUG_PICT_INFO) + av_log(h->avctx, AV_LOG_DEBUG, "sei_recovery_frame_cnt: %d\n", h->sei_recovery_frame_cnt); + + h->has_recovery_point = 1; + return 0; } @@ -156,7 +206,7 @@ static int decode_buffering_period(H264Context *h) 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_long(&h->gb, sps->initial_cpb_removal_delay_length); // initial_cpb_removal_delay_offset skip_bits(&h->gb, sps->initial_cpb_removal_delay_length); } @@ -164,7 +214,7 @@ static int decode_buffering_period(H264Context *h) 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_long(&h->gb, sps->initial_cpb_removal_delay_length); // initial_cpb_removal_delay_offset skip_bits(&h->gb, sps->initial_cpb_removal_delay_length); } @@ -176,12 +226,16 @@ static int decode_buffering_period(H264Context *h) static int decode_frame_packing_arrangement(H264Context *h) { - get_ue_golomb(&h->gb); // frame_packing_arrangement_id - h->sei_frame_packing_present = !get_bits1(&h->gb); + h->sei_fpa.frame_packing_arrangement_id = get_ue_golomb(&h->gb); + h->sei_fpa.frame_packing_arrangement_cancel_flag = get_bits1(&h->gb); + h->sei_frame_packing_present = !h->sei_fpa.frame_packing_arrangement_cancel_flag; if (h->sei_frame_packing_present) { + h->sei_fpa.frame_packing_arrangement_type = h->frame_packing_arrangement_type = get_bits(&h->gb, 7); + h->sei_fpa.quincunx_sampling_flag = h->quincunx_subsampling = get_bits1(&h->gb); + h->sei_fpa.content_interpretation_type = h->content_interpretation_type = get_bits(&h->gb, 6); // the following skips: spatial_flipping_flag, frame0_flipped_flag, @@ -192,33 +246,51 @@ static int decode_frame_packing_arrangement(H264Context *h) 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 + h->sei_fpa.frame_packing_arrangement_repetition_period = get_ue_golomb(&h->gb) /* frame_packing_arrangement_repetition_period */; } skip_bits1(&h->gb); // frame_packing_arrangement_extension_flag + if (h->avctx->debug & FF_DEBUG_PICT_INFO) + av_log(h->avctx, AV_LOG_DEBUG, "SEI FPA %d %d %d %d %d %d\n", + h->sei_fpa.frame_packing_arrangement_id, + h->sei_fpa.frame_packing_arrangement_cancel_flag, + h->sei_fpa.frame_packing_arrangement_type, + h->sei_fpa.quincunx_sampling_flag, + h->sei_fpa.content_interpretation_type, + h->sei_fpa.frame_packing_arrangement_repetition_period); + return 0; } int ff_h264_decode_sei(H264Context *h) { while (get_bits_left(&h->gb) > 16) { - int size = 0; int type = 0; + unsigned size = 0; + unsigned next; int ret = 0; - do + do { + if (get_bits_left(&h->gb) < 8) + return AVERROR_INVALIDDATA; type += show_bits(&h->gb, 8); - while (get_bits(&h->gb, 8) == 255); + } while (get_bits(&h->gb, 8) == 255); - do + do { + if (get_bits_left(&h->gb) < 8) + return AVERROR_INVALIDDATA; size += show_bits(&h->gb, 8); - while (get_bits(&h->gb, 8) == 255); + } while (get_bits(&h->gb, 8) == 255); + + if (h->avctx->debug&FF_DEBUG_STARTCODE) + av_log(h->avctx, AV_LOG_DEBUG, "SEI %d len:%d\n", type, size); 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)); + av_log(h->avctx, AV_LOG_ERROR, "SEI type %d size %d truncated at %d\n", + type, 8*size, get_bits_left(&h->gb)); return AVERROR_INVALIDDATA; } + next = get_bits_count(&h->gb) + 8 * size; switch (type) { case SEI_TYPE_PIC_TIMING: // Picture timing SEI @@ -226,6 +298,10 @@ int ff_h264_decode_sei(H264Context *h) if (ret < 0) return ret; break; + case SEI_TYPE_USER_DATA_ITU_T_T35: + if (decode_user_data_itu_t_t35(h, size) < 0) + return -1; + break; case SEI_TYPE_USER_DATA_UNREGISTERED: ret = decode_unregistered_user_data(h, size); if (ret < 0) @@ -248,8 +324,8 @@ int ff_h264_decode_sei(H264Context *h) break; default: av_log(h->avctx, AV_LOG_DEBUG, "unknown SEI type %d\n", type); - skip_bits(&h->gb, 8 * size); } + skip_bits_long(&h->gb, next - get_bits_count(&h->gb)); // FIXME check bits here align_get_bits(&h->gb); @@ -257,3 +333,48 @@ int ff_h264_decode_sei(H264Context *h) return 0; } + +const char* ff_h264_sei_stereo_mode(H264Context *h) +{ + if (h->sei_fpa.frame_packing_arrangement_cancel_flag == 0) { + switch (h->sei_fpa.frame_packing_arrangement_type) { + case SEI_FPA_TYPE_CHECKERBOARD: + if (h->sei_fpa.content_interpretation_type == 2) + return "checkerboard_rl"; + else + return "checkerboard_lr"; + case SEI_FPA_TYPE_INTERLEAVE_COLUMN: + if (h->sei_fpa.content_interpretation_type == 2) + return "col_interleaved_rl"; + else + return "col_interleaved_lr"; + case SEI_FPA_TYPE_INTERLEAVE_ROW: + if (h->sei_fpa.content_interpretation_type == 2) + return "row_interleaved_rl"; + else + return "row_interleaved_lr"; + case SEI_FPA_TYPE_SIDE_BY_SIDE: + if (h->sei_fpa.content_interpretation_type == 2) + return "right_left"; + else + return "left_right"; + case SEI_FPA_TYPE_TOP_BOTTOM: + if (h->sei_fpa.content_interpretation_type == 2) + return "bottom_top"; + else + return "top_bottom"; + case SEI_FPA_TYPE_INTERLEAVE_TEMPORAL: + if (h->sei_fpa.content_interpretation_type == 2) + return "block_rl"; + else + return "block_lr"; + case SEI_FPA_TYPE_2D: + default: + return "mono"; + } + } else if (h->sei_fpa.frame_packing_arrangement_cancel_flag == 1) { + return "mono"; + } else { + return NULL; + } +} |