diff options
Diffstat (limited to 'libavcodec/hevc_sei.c')
-rw-r--r-- | libavcodec/hevc_sei.c | 110 |
1 files changed, 90 insertions, 20 deletions
diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c index 978a0e3..8ae680e 100644 --- a/libavcodec/hevc_sei.c +++ b/libavcodec/hevc_sei.c @@ -5,20 +5,20 @@ * Copyright (C) 2012 - 2013 Gildas Cocherel * Copyright (C) 2013 Vittorio Giovara * - * 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 */ @@ -28,10 +28,13 @@ static void decode_nal_sei_decoded_picture_hash(HEVCContext *s) { int cIdx, i; - GetBitContext *gb = &s->HEVClc.gb; - uint8_t hash_type = get_bits(gb, 8); + uint8_t hash_type; + //uint16_t picture_crc; + //uint32_t picture_checksum; + GetBitContext *gb = &s->HEVClc->gb; + hash_type = get_bits(gb, 8); - for (cIdx = 0; cIdx < 3; cIdx++) { + for (cIdx = 0; cIdx < 3/*((s->sps->chroma_format_idc == 0) ? 1 : 3)*/; cIdx++) { if (hash_type == 0) { s->is_md5 = 1; for (i = 0; i < 16; i++) @@ -40,7 +43,7 @@ static void decode_nal_sei_decoded_picture_hash(HEVCContext *s) // picture_crc = get_bits(gb, 16); skip_bits(gb, 16); } else if (hash_type == 2) { - // picture_checksum = get_bits(gb, 32); + // picture_checksum = get_bits_long(gb, 32); skip_bits(gb, 32); } } @@ -48,7 +51,7 @@ static void decode_nal_sei_decoded_picture_hash(HEVCContext *s) static void decode_nal_sei_frame_packing_arrangement(HEVCContext *s) { - GetBitContext *gb = &s->HEVClc.gb; + GetBitContext *gb = &s->HEVClc->gb; get_ue_golomb(gb); // frame_packing_arrangement_id s->sei_frame_packing_present = !get_bits1(gb); @@ -73,7 +76,7 @@ static void decode_nal_sei_frame_packing_arrangement(HEVCContext *s) static void decode_nal_sei_display_orientation(HEVCContext *s) { - GetBitContext *gb = &s->HEVClc.gb; + GetBitContext *gb = &s->HEVClc->gb; s->sei_display_orientation_present = !get_bits1(gb); @@ -86,9 +89,64 @@ static void decode_nal_sei_display_orientation(HEVCContext *s) } } +static int decode_pic_timing(HEVCContext *s) +{ + GetBitContext *gb = &s->HEVClc->gb; + HEVCSPS *sps; + + if (!s->ps.sps_list[s->active_seq_parameter_set_id]) + return(AVERROR(ENOMEM)); + sps = (HEVCSPS*)s->ps.sps_list[s->active_seq_parameter_set_id]->data; + + if (sps->vui.frame_field_info_present_flag) { + int pic_struct = get_bits(gb, 4); + s->picture_struct = AV_PICTURE_STRUCTURE_UNKNOWN; + if (pic_struct == 2) { + av_log(s->avctx, AV_LOG_DEBUG, "BOTTOM Field\n"); + s->picture_struct = AV_PICTURE_STRUCTURE_BOTTOM_FIELD; + } else if (pic_struct == 1) { + av_log(s->avctx, AV_LOG_DEBUG, "TOP Field\n"); + s->picture_struct = AV_PICTURE_STRUCTURE_TOP_FIELD; + } + get_bits(gb, 2); // source_scan_type + get_bits(gb, 1); // duplicate_flag + } + return 1; +} + +static int active_parameter_sets(HEVCContext *s) +{ + GetBitContext *gb = &s->HEVClc->gb; + int num_sps_ids_minus1; + int i; + unsigned active_seq_parameter_set_id; + + get_bits(gb, 4); // active_video_parameter_set_id + get_bits(gb, 1); // self_contained_cvs_flag + get_bits(gb, 1); // num_sps_ids_minus1 + num_sps_ids_minus1 = get_ue_golomb_long(gb); // num_sps_ids_minus1 + + if (num_sps_ids_minus1 < 0 || num_sps_ids_minus1 > 15) { + av_log(s->avctx, AV_LOG_ERROR, "num_sps_ids_minus1 %d invalid\n", num_sps_ids_minus1); + return AVERROR_INVALIDDATA; + } + + active_seq_parameter_set_id = get_ue_golomb_long(gb); + if (active_seq_parameter_set_id >= MAX_SPS_COUNT) { + av_log(s->avctx, AV_LOG_ERROR, "active_parameter_set_id %d invalid\n", active_seq_parameter_set_id); + return AVERROR_INVALIDDATA; + } + s->active_seq_parameter_set_id = active_seq_parameter_set_id; + + for (i = 1; i <= num_sps_ids_minus1; i++) + get_ue_golomb_long(gb); // active_seq_parameter_set_id[i] + + return 0; +} + static int decode_nal_sei_message(HEVCContext *s) { - GetBitContext *gb = &s->HEVClc.gb; + GetBitContext *gb = &s->HEVClc->gb; int payload_type = 0; int payload_size = 0; @@ -105,25 +163,33 @@ static int decode_nal_sei_message(HEVCContext *s) payload_size += byte; } if (s->nal_unit_type == NAL_SEI_PREFIX) { - if (payload_type == 256) + if (payload_type == 256 /*&& s->decode_checksum_sei*/) { decode_nal_sei_decoded_picture_hash(s); - else if (payload_type == 45) + } else if (payload_type == 45) { decode_nal_sei_frame_packing_arrangement(s); - else if (payload_type == 47) + } else if (payload_type == 47) { decode_nal_sei_display_orientation(s); - else { + } else if (payload_type == 1){ + int ret = decode_pic_timing(s); av_log(s->avctx, AV_LOG_DEBUG, "Skipped PREFIX SEI %d\n", payload_type); skip_bits(gb, 8 * payload_size); + return ret; + } else if (payload_type == 129){ + active_parameter_sets(s); + av_log(s->avctx, AV_LOG_DEBUG, "Skipped PREFIX SEI %d\n", payload_type); + } else { + av_log(s->avctx, AV_LOG_DEBUG, "Skipped PREFIX SEI %d\n", payload_type); + skip_bits(gb, 8*payload_size); } } else { /* nal_unit_type == NAL_SEI_SUFFIX */ - if (payload_type == 132) + if (payload_type == 132 /* && s->decode_checksum_sei */) decode_nal_sei_decoded_picture_hash(s); else { av_log(s->avctx, AV_LOG_DEBUG, "Skipped SUFFIX SEI %d\n", payload_type); skip_bits(gb, 8 * payload_size); } } - return 0; + return 1; } static int more_rbsp_data(GetBitContext *gb) @@ -133,8 +199,12 @@ static int more_rbsp_data(GetBitContext *gb) int ff_hevc_decode_nal_sei(HEVCContext *s) { + int ret; + do { - decode_nal_sei_message(s); - } while (more_rbsp_data(&s->HEVClc.gb)); - return 0; + ret = decode_nal_sei_message(s); + if (ret < 0) + return(AVERROR(ENOMEM)); + } while (more_rbsp_data(&s->HEVClc->gb)); + return 1; } |