X-Git-Url: https://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libavcodec%2Fhevc_ps.c;h=5f33005f21c5c6918e5217b1f53b1361966d1acf;hp=15f73be9bf4d091687441dcb460104ae42dae81e;hb=67bbaed5c498212bdd70b13b4fdcb37f4c9c77f5;hpb=064698d381e1e7790f21b0199a8930ea04e2e942 diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index 15f73be9bf..5f33005f21 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -192,7 +192,7 @@ int ff_hevc_decode_short_term_rps(HEVCContext *s, ShortTermRPS *rps, return 0; } -static int decode_profile_tier_level(HEVCLocalContext *lc, PTL *ptl, +static void decode_profile_tier_level(HEVCLocalContext *lc, PTL *ptl, int max_num_sub_layers) { int i, j; @@ -207,12 +207,9 @@ static int decode_profile_tier_level(HEVCLocalContext *lc, PTL *ptl, skip_bits1(gb); // general_interlaced_source_flag skip_bits1(gb); // general_non_packed_constraint_flag skip_bits1(gb); // general_frame_only_constraint_flag - if (get_bits(gb, 16) != 0) // XXX_reserved_zero_44bits[0..15] - return -1; - if (get_bits(gb, 16) != 0) // XXX_reserved_zero_44bits[16..31] - return -1; - if (get_bits(gb, 12) != 0) // XXX_reserved_zero_44bits[32..43] - return -1; + skip_bits(gb, 16); // XXX_reserved_zero_44bits[0..15] + skip_bits(gb, 16); // XXX_reserved_zero_44bits[16..31] + skip_bits(gb, 12); // XXX_reserved_zero_44bits[32..43] ptl->general_level_idc = get_bits(gb, 8); for (i = 0; i < max_num_sub_layers - 1; i++) { @@ -234,17 +231,13 @@ static int decode_profile_tier_level(HEVCLocalContext *lc, PTL *ptl, skip_bits1(gb); // sub_layer_non_packed_constraint_flag skip_bits1(gb); // sub_layer_frame_only_constraint_flag - if (get_bits(gb, 16) != 0) // sub_layer_reserved_zero_44bits[0..15] - return -1; - if (get_bits(gb, 16) != 0) // sub_layer_reserved_zero_44bits[16..31] - return -1; - if (get_bits(gb, 12) != 0) // sub_layer_reserved_zero_44bits[32..43] - return -1; + skip_bits(gb, 16); // sub_layer_reserved_zero_44bits[0..15] + skip_bits(gb, 16); // sub_layer_reserved_zero_44bits[16..31] + skip_bits(gb, 12); // sub_layer_reserved_zero_44bits[32..43] } if (ptl->sub_layer_level_present_flag[i]) ptl->sub_layer_level_idc[i] = get_bits(gb, 8); } - return 0; } static void decode_sublayer_hrd(HEVCContext *s, int nb_cpb, @@ -328,12 +321,13 @@ int ff_hevc_decode_nal_vps(HEVCContext *s) GetBitContext *gb = &s->HEVClc.gb; int vps_id = 0; HEVCVPS *vps; + AVBufferRef *vps_buf = av_buffer_allocz(sizeof(*vps)); - av_log(s->avctx, AV_LOG_DEBUG, "Decoding VPS\n"); + if (!vps_buf) + return AVERROR(ENOMEM); + vps = (HEVCVPS*)vps_buf->data; - vps = av_mallocz(sizeof(*vps)); - if (!vps) - return AVERROR(ENOMEM); + av_log(s->avctx, AV_LOG_DEBUG, "Decoding VPS\n"); vps_id = get_bits(gb, 4); if (vps_id >= MAX_VPS_COUNT) { @@ -361,10 +355,7 @@ int ff_hevc_decode_nal_vps(HEVCContext *s) goto err; } - if (decode_profile_tier_level(&s->HEVClc, &vps->ptl, vps->vps_max_sub_layers) < 0) { - av_log(s->avctx, AV_LOG_ERROR, "Error decoding profile tier level.\n"); - goto err; - } + decode_profile_tier_level(&s->HEVClc, &vps->ptl, vps->vps_max_sub_layers); vps->vps_sub_layer_ordering_info_present_flag = get_bits1(gb); i = vps->vps_sub_layer_ordering_info_present_flag ? 0 : vps->vps_max_sub_layers - 1; @@ -410,12 +401,12 @@ int ff_hevc_decode_nal_vps(HEVCContext *s) } get_bits1(gb); /* vps_extension_flag */ - av_free(s->vps_list[vps_id]); - s->vps_list[vps_id] = vps; + av_buffer_unref(&s->vps_list[vps_id]); + s->vps_list[vps_id] = vps_buf; return 0; err: - av_free(vps); + av_buffer_unref(&vps_buf); return AVERROR_INVALIDDATA; } @@ -449,10 +440,20 @@ static void decode_vui(HEVCContext *s, HEVCSPS *sps) vui->video_format = get_bits(gb, 3); vui->video_full_range_flag = get_bits1(gb); vui->colour_description_present_flag = get_bits1(gb); + if (vui->video_full_range_flag && sps->pix_fmt == AV_PIX_FMT_YUV420P) + sps->pix_fmt = AV_PIX_FMT_YUVJ420P; if (vui->colour_description_present_flag) { vui->colour_primaries = get_bits(gb, 8); vui->transfer_characteristic = get_bits(gb, 8); vui->matrix_coeffs = get_bits(gb, 8); + + // Set invalid values to "unspecified" + if (vui->colour_primaries >= AVCOL_PRI_NB) + vui->colour_primaries = AVCOL_PRI_UNSPECIFIED; + if (vui->transfer_characteristic >= AVCOL_TRC_NB) + vui->transfer_characteristic = AVCOL_TRC_UNSPECIFIED; + if (vui->matrix_coeffs >= AVCOL_SPC_NB) + vui->matrix_coeffs = AVCOL_SPC_UNSPECIFIED; } } @@ -636,12 +637,7 @@ int ff_hevc_decode_nal_sps(HEVCContext *s) } skip_bits1(gb); // temporal_id_nesting_flag - if (decode_profile_tier_level(&s->HEVClc, &sps->ptl, - sps->max_sub_layers) < 0) { - av_log(s->avctx, AV_LOG_ERROR, "error decoding profile tier level\n"); - ret = AVERROR_INVALIDDATA; - goto err; - } + decode_profile_tier_level(&s->HEVClc, &sps->ptl, sps->max_sub_layers); sps_id = get_ue_golomb_long(gb); if (sps_id >= MAX_SPS_COUNT) { av_log(s->avctx, AV_LOG_ERROR, "SPS id out of range: %d\n", sps_id);