From patchwork Tue Jul 14 15:34:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 21009 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 780F344AA50 for ; Tue, 14 Jul 2020 18:35:22 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 69A0B68B3F4; Tue, 14 Jul 2020 18:35:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1356568A585 for ; Tue, 14 Jul 2020 18:35:15 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id a6so22514136wrm.4 for ; Tue, 14 Jul 2020 08:35:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HDx1jrqRAV5Bk8PK4DHqdt6pUmULJOsk134xIM5mEYM=; b=bov8HlUd5zYRynENnWCypOqdVbCTajJFFzNzgcQwzqn5CVKY4Prp/jHZvSMqxJBhIg kn0hJzDaRRzyVDIHJko0NaizvrbrJgDKXRy9BX7BIrAVz3imLqApEjhYsGt16Dxvo41w yM7FElsybQBYYoPHyeUDf++tRYXKU2+03PEnuL2bHQoB7xe2Q/CXS2easLQLev0QW2Cg kXGiPZYfGlJjIcbYGCCIdzHxTsoMkxQ6Ci5w9BGUZoAgu1468ficzAFmrIupnMGZJdOB oiZ3Qxv6bswI9LLPU2gJSoeZ5BknRHyv8LgnMOcz/AHWLvGz6BTi6Lf9EvtznRdygfMe Ogjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HDx1jrqRAV5Bk8PK4DHqdt6pUmULJOsk134xIM5mEYM=; b=jGQqQes1BFt8ZClXWOPIoKMhC7aQiPqGbwOy8Kr6oMRSInAr8Nbey8drQlj+9Tmar+ kB/lVZ5dCdsL8xmiH/kjN51SbQg/3ZUU70fe4noddGuaeBZQN3oIYYq85nNdHIVkHsMj JT8dteEumrvw+k2UrVZx7GUh+xNTjhwqP5zB6UBbupDBaz0VpsyQ0ss+L3SSyU9CID0u d9nRjrwdtQ3BzLRstkdLoLY9ltmzrB9UyqIVxhpLUeEipAAFBAut5jMOGfQwPYVDQQDe SqzpXM/JoVNn1ynAM3D6S49HcVbX4iZgyQEEmXuNBsFOmm/LDuATtWl0W/UXrGNqbBaF ITbA== X-Gm-Message-State: AOAM530EqekPRgxycwyBP9ZX/gZxJgogDpiVOHoKjf15G6uG6KCnMxsz Uj+pLBuc97AWRFLYHWUQTNYoEIH0 X-Google-Smtp-Source: ABdhPJwbkz6mid1hWmF7JhKaIE2VEDK9dDFfI0Uxqhuq8lpUJQee7zWiZmpvMClcsFhr5Yx/5dj/MA== X-Received: by 2002:adf:f082:: with SMTP id n2mr6811200wro.326.1594740914152; Tue, 14 Jul 2020 08:35:14 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc10296.dynamic.kabel-deutschland.de. [188.193.2.150]) by smtp.gmail.com with ESMTPSA id w14sm29545452wrt.55.2020.07.14.08.35.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jul 2020 08:35:12 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Jul 2020 17:34:54 +0200 Message-Id: <20200714153454.9354-6-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200710134803.4347-1-andreas.rheinhardt@gmail.com> References: <20200710134803.4347-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 7/7] avcodec/h264*: Use get_ue_golomb2() where appropriate X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The difference of this function and get_ue_golomb() is that the latter emits an error message upon encountering an exp golomb code outside the range of 0..8190. But this error message is unnecessary in cases where there is a dedicate error message in case of range error (these error messages also use a correct logcontext and not NULL). So replace get_ue_golomb() by get_ue_golomb2() everywhere where there is a dedicated error message in case of errors. Signed-off-by: Andreas Rheinhardt --- libavcodec/cavsdec.c | 6 +++--- libavcodec/h264_cavlc.c | 4 ++-- libavcodec/h264_parse.c | 4 ++-- libavcodec/h264_parser.c | 2 +- libavcodec/h264_ps.c | 8 ++++---- libavcodec/h264_slice.c | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c index 0aea9757b7..8da57ec80a 100644 --- a/libavcodec/cavsdec.c +++ b/libavcodec/cavsdec.c @@ -502,7 +502,7 @@ static inline void mv_pred_sym(AVSContext *h, cavs_vector *src, /** kth-order exponential golomb code */ static inline int get_ue_code(GetBitContext *gb, int order) { - unsigned ret = get_ue_golomb(gb); + unsigned ret = get_ue_golomb2(gb); if (ret >= ((1U<<31)>>order)) { av_log(NULL, AV_LOG_ERROR, "get_ue_code: value too larger\n"); return AVERROR_INVALIDDATA; @@ -613,7 +613,7 @@ static inline int decode_residual_inter(AVSContext *h) int block; /* get coded block pattern */ - int cbp = get_ue_golomb(&h->gb); + int cbp = get_ue_golomb2(&h->gb); if (cbp > 63U) { av_log(h->avctx, AV_LOG_ERROR, "Inter cbp not in 0-63 range\n"); return AVERROR_INVALIDDATA; @@ -685,7 +685,7 @@ static int decode_mb_i(AVSContext *h, int cbp_code) /* get coded block pattern */ if (h->cur.f->pict_type == AV_PICTURE_TYPE_I) - cbp_code = get_ue_golomb(gb); + cbp_code = get_ue_golomb2(gb); if (cbp_code > 63U) { av_log(h->avctx, AV_LOG_ERROR, "illegal intra cbp\n"); return AVERROR_INVALIDDATA; diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c index c4b14d2578..3dcb82c71c 100644 --- a/libavcodec/h264_cavlc.c +++ b/libavcodec/h264_cavlc.c @@ -739,7 +739,7 @@ int ff_h264_decode_mb_cavlc(const H264Context *h, H264SliceContext *sl) sl->prev_mb_skipped = 0; - mb_type= get_ue_golomb(&sl->gb); + mb_type = get_ue_golomb2(&sl->gb); if (sl->slice_type_nos == AV_PICTURE_TYPE_B) { if(mb_type < 23){ partition_count = ff_h264_b_mb_type_info[mb_type].partition_count; @@ -1067,7 +1067,7 @@ decode_intra_mb: write_back_motion(h, sl, mb_type); if(!IS_INTRA16x16(mb_type)){ - cbp= get_ue_golomb(&sl->gb); + cbp = get_ue_golomb2(&sl->gb); if(decode_chroma){ if(cbp > 47){ diff --git a/libavcodec/h264_parse.c b/libavcodec/h264_parse.c index fd9b824756..11ae20a32a 100644 --- a/libavcodec/h264_parse.c +++ b/libavcodec/h264_parse.c @@ -234,9 +234,9 @@ int ff_h264_parse_ref_count(int *plist_count, int ref_count[2], num_ref_idx_active_override_flag = get_bits1(gb); if (num_ref_idx_active_override_flag) { - ref_count[0] = get_ue_golomb(gb) + 1; + ref_count[0] = get_ue_golomb2(gb) + 1; if (slice_type_nos == AV_PICTURE_TYPE_B) { - ref_count[1] = get_ue_golomb(gb) + 1; + ref_count[1] = get_ue_golomb2(gb) + 1; } else // full range is spec-ok in this case, even for frames ref_count[1] = 1; diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index 3b62567245..d5bf80a89a 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -348,7 +348,7 @@ static inline int parse_nal_units(AVCodecParserContext *s, /* key frame, since recovery_frame_cnt is set */ s->key_frame = 1; } - pps_id = get_ue_golomb(&nal.gb); + pps_id = get_ue_golomb2(&nal.gb); if (pps_id >= MAX_PPS_COUNT) { av_log(avctx, AV_LOG_ERROR, "pps_id not in 0-255 range\n"); diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index 18e5d9578f..9f0d07810b 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -459,7 +459,7 @@ int ff_h264_decode_seq_parameter_set(GetBitContext *gb, AVCodecContext *avctx, goto fail; } - sps->poc_cycle_length = get_ue_golomb(gb); + sps->poc_cycle_length = get_ue_golomb2(gb); if ((unsigned)sps->poc_cycle_length >= FF_ARRAY_ELEMS(sps->offset_for_ref_frame)) { @@ -750,7 +750,7 @@ int ff_h264_decode_picture_parameter_set(GetBitContext *gb, AVCodecContext *avct { AVBufferRef *pps_buf; const SPS *sps; - unsigned int pps_id = get_ue_golomb(gb); + unsigned int pps_id = get_ue_golomb2(gb); PPS *pps; int qp_bd_offset; int bits_left; @@ -821,8 +821,8 @@ int ff_h264_decode_picture_parameter_set(GetBitContext *gb, AVCodecContext *avct ret = AVERROR_PATCHWELCOME; goto fail; } - pps->ref_count[0] = get_ue_golomb(gb) + 1; - pps->ref_count[1] = get_ue_golomb(gb) + 1; + pps->ref_count[0] = get_ue_golomb2(gb) + 1; + pps->ref_count[1] = get_ue_golomb2(gb) + 1; if (pps->ref_count[0] - 1 > 32 - 1 || pps->ref_count[1] - 1 > 32 - 1) { av_log(avctx, AV_LOG_ERROR, "reference overflow (pps)\n"); ret = AVERROR_INVALIDDATA; diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 29b57bc305..fab8cbc839 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1762,7 +1762,7 @@ static int h264_slice_header_parse(const H264Context *h, H264SliceContext *sl, return AVERROR_INVALIDDATA; } - sl->pps_id = get_ue_golomb(&sl->gb); + sl->pps_id = get_ue_golomb2(&sl->gb); if (sl->pps_id >= MAX_PPS_COUNT) { av_log(h->avctx, AV_LOG_ERROR, "pps_id not in 0-255 range\n"); return AVERROR_INVALIDDATA;