From patchwork Fri Nov 20 07:32:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23807 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 D42E344A644 for ; Fri, 20 Nov 2020 09:34:05 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B3CD868BB7F; Fri, 20 Nov 2020 09:34:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f65.google.com (mail-ed1-f65.google.com [209.85.208.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ABE3768B698 for ; Fri, 20 Nov 2020 09:34:04 +0200 (EET) Received: by mail-ed1-f65.google.com with SMTP id q16so8481857edv.10 for ; Thu, 19 Nov 2020 23:34:04 -0800 (PST) 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:reply-to :mime-version:content-transfer-encoding; bh=QNCjy+cEW8CwpPhseZf2RqsJwHwkU9oRHu6zxXSaftU=; b=kY4gT8zs9iM6PI9S04yvozgpkTef8GIkr8ik4gDDSZxbULV8z2Fpoto0tGfmHSZ1sG p9YWyTFokd4p/Dn7+LRXot4Ul5XtUST8QiRgSYAdgd6zPD3rs7c0dcN7zfqBvNDk9dkB 33/uzwlmWZPuYfKXspH/oN6ifQvVs/n2dGCJVCMccbJR8jHzti6Yvd7BvxY9BBzBy+bW DnR2s1b8puB0S8AIweB18Drs1JuaPcg2w0OsGihOFJzyoT1EOOYN3I0840JY/tWxDF2/ q3ixsGxeU2x5J12OYfOiwo7LBoxcs+Nhhy+2m2VndwTiQ9q7w2kuCPigp8mnb2PH41IS RWOg== 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:reply-to:mime-version:content-transfer-encoding; bh=QNCjy+cEW8CwpPhseZf2RqsJwHwkU9oRHu6zxXSaftU=; b=tsl+qKJBh0+NyzhL0ia6x0QKgUQK3mALk5DA02vbiV96AYC5dLoXSANHhNzbwUNF06 qLCAMRXq6F78LubhtIJhojnLdmNh+w3scM7/7UxDSCyGEO0EO1aPUtW6hD39r/wsUUaE 6YfBd+toRsBYAjFowS+wKQqcLroP0JH63XabLWq5gNtoho1c4XZ0nIhwm9RTeZm7dfnj t/J3mW2CJ6yQh/Wzmr/YS5PQZGAL8c1HvUZAn3A9oEqPPXi/q27OVxyQvAB75HAs8eUp rYLqV6jACm0XltOR9jgmRPA9NIw/mZZeCa0EFZJVm+AfuQCqURr4PMpP6EaRTYQQFbYm guEA== X-Gm-Message-State: AOAM533RfEUdaJqLVlu2KnZF8capj/jrXv+nzxcpajaq9liADTiJ3ngn /YUVxTUPabw/Agv2c5HfCUJ6EkwBXVkuUA== X-Google-Smtp-Source: ABdhPJyZu/AVM/9edDtTjjop8lb9H4/hCAcLIM/t3xBvaXq8/1muHgY1cFiVeORUi6hmzKtrR6O9hQ== X-Received: by 2002:a50:b584:: with SMTP id a4mr34616929ede.301.1605857643793; Thu, 19 Nov 2020 23:34:03 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id i13sm769110ejv.84.2020.11.19.23.34.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2020 23:34:03 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Nov 2020 08:32:27 +0100 Message-Id: <20201120073327.820745-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201120072116.818090-1-andreas.rheinhardt@gmail.com> References: <20201120072116.818090-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 102/162] avcodec/vc1_block: Use local variables inside macro 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" This makes it clearer which variables are really just temporary variables of the macro and which are actually used externally. Signed-off-by: Andreas Rheinhardt --- libavcodec/vc1_block.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/libavcodec/vc1_block.c b/libavcodec/vc1_block.c index 42de71eb25..3ff67d83bf 100644 --- a/libavcodec/vc1_block.c +++ b/libavcodec/vc1_block.c @@ -222,7 +222,8 @@ static void vc1_put_blocks_clamped(VC1Context *v, int put_signed) * @param _dmv_y Vertical differential for decoded MV */ #define GET_MVDATA(_dmv_x, _dmv_y) \ - index = 1 + get_vlc2(gb, ff_vc1_mv_diff_vlc[s->mv_table_index].table, \ +do { \ + int index = 1 + get_vlc2(gb, ff_vc1_mv_diff_vlc[s->mv_table_index].table, \ VC1_MV_DIFF_VLC_BITS, 2); \ if (index > 36) { \ mb_has_coeffs = 1; \ @@ -240,7 +241,7 @@ static void vc1_put_blocks_clamped(VC1Context *v, int put_signed) _dmv_y = 0; \ s->mb_intra = 1; \ } else { \ - index1 = index % 6; \ + int index1 = index % 6, sign, val; \ _dmv_x = offset_table[1][index1]; \ val = size_table[index1] - (!s->quarter_sample && index1 == 5); \ if (val > 0) { \ @@ -257,7 +258,8 @@ static void vc1_put_blocks_clamped(VC1Context *v, int put_signed) sign = 0 - (val & 1); \ _dmv_y = (sign ^ ((val >> 1) + _dmv_y)) - sign; \ } \ - } + } \ +} while (0) static av_always_inline void get_mvdata_interlaced(VC1Context *v, int *dmv_x, int *dmv_y, int *pred_flag) @@ -1287,8 +1289,6 @@ static int vc1_decode_p_mb(VC1Context *v) int mb_has_coeffs = 1; /* last_flag */ int dmv_x, dmv_y; /* Differential MV components */ - int index, index1; /* LUT indexes */ - int val, sign; /* temp values */ int first_block = 1; int dst_idx, off; int skipped, fourmv; @@ -1338,9 +1338,9 @@ static int vc1_decode_p_mb(VC1Context *v) if (!s->mb_intra) ff_vc1_mc_1mv(v, 0); dst_idx = 0; for (i = 0; i < 6; i++) { + int val = ((cbp >> (5 - i)) & 1); s->dc_val[0][s->block_index[i]] = 0; dst_idx += i >> 2; - val = ((cbp >> (5 - i)) & 1); off = (i & 4) ? 0 : ((i & 1) * 8 + (i & 2) * 4 * s->linesize); v->mb_type[0][s->block_index[i]] = s->mb_intra; if (s->mb_intra) { @@ -1391,7 +1391,7 @@ static int vc1_decode_p_mb(VC1Context *v) /* Get CBPCY */ cbp = get_vlc2(&v->s.gb, v->cbpcy_vlc->table, VC1_CBPCY_P_VLC_BITS, 2); for (i = 0; i < 6; i++) { - val = ((cbp >> (5 - i)) & 1); + int val = ((cbp >> (5 - i)) & 1); s->dc_val[0][s->block_index[i]] = 0; s->mb_intra = 0; if (i < 4) { @@ -1851,8 +1851,6 @@ static int vc1_decode_b_mb(VC1Context *v) int mqdiff, mquant; /* MB quantization */ int ttmb = v->ttfrm; /* MB Transform type */ int mb_has_coeffs = 0; /* last_flag */ - int index, index1; /* LUT indexes */ - int val, sign; /* temp values */ int first_block = 1; int dst_idx, off; int skipped, direct; @@ -1957,9 +1955,9 @@ static int vc1_decode_b_mb(VC1Context *v) } dst_idx = 0; for (i = 0; i < 6; i++) { + int val = ((cbp >> (5 - i)) & 1); s->dc_val[0][s->block_index[i]] = 0; dst_idx += i >> 2; - val = ((cbp >> (5 - i)) & 1); off = (i & 4) ? 0 : ((i & 1) * 8 + (i & 2) * 4 * s->linesize); v->mb_type[0][s->block_index[i]] = s->mb_intra; if (s->mb_intra) {