diff options
Diffstat (limited to 'libavcodec/h264_sei.c')
| -rw-r--r-- | libavcodec/h264_sei.c | 83 |
1 files changed, 71 insertions, 12 deletions
diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c index df4c49fe3e..5f68a139a3 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,11 +45,18 @@ 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); h->sei_ct_type = 0; @@ -83,8 +90,8 @@ static int decode_picture_timing(H264Context *h){ } } } - if(h->sps.time_offset_length > 0) - skip_bits(&h->gb, h->sps.time_offset_length); /* time_offset */ + if(sps->time_offset_length > 0) + skip_bits(&h->gb, sps->time_offset_length); /* time_offset */ } } @@ -94,6 +101,42 @@ 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]; int e, build, i; @@ -109,6 +152,8 @@ static int decode_unregistered_user_data(H264Context *h, int size){ e= sscanf(user_data+16, "x264 - core %d"/*%s - H.264/MPEG-4 AVC codec - Copyleft 2005 - http://www.videolan.org/x264.html*/, &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); @@ -123,6 +168,9 @@ static int decode_recovery_point(H264Context *h){ h->sei_recovery_frame_cnt = get_ue_golomb(&h->gb); skip_bits(&h->gb, 4); /* 1b exact_match_flag, 1b broken_link_flag, 2b changing_slice_group_idc */ + 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); + return 0; } @@ -141,13 +189,13 @@ static int decode_buffering_period(H264Context *h){ // 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); + h->initial_cpb_removal_delay[sched_sel_idx] = get_bits_long(&h->gb, sps->initial_cpb_removal_delay_length); skip_bits(&h->gb, sps->initial_cpb_removal_delay_length); // initial_cpb_removal_delay_offset } } 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); + h->initial_cpb_removal_delay[sched_sel_idx] = get_bits_long(&h->gb, sps->initial_cpb_removal_delay_length); skip_bits(&h->gb, sps->initial_cpb_removal_delay_length); // initial_cpb_removal_delay_offset } } @@ -162,19 +210,30 @@ int ff_h264_decode_sei(H264Context *h){ type=0; do{ + if (get_bits_left(&h->gb) < 8) + return -1; type+= show_bits(&h->gb, 8); }while(get_bits(&h->gb, 8) == 255); size=0; do{ + if (get_bits_left(&h->gb) < 8) + return -1; size+= show_bits(&h->gb, 8); }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); + switch(type){ case SEI_TYPE_PIC_TIMING: // Picture timing SEI if(decode_picture_timing(h) < 0) return -1; 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: if(decode_unregistered_user_data(h, size) < 0) return -1; |