From patchwork Fri Nov 20 07:32:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23858 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 8C49C44B17A for ; Fri, 20 Nov 2020 09:45:37 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E8D7768BCB4; Fri, 20 Nov 2020 09:34:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f68.google.com (mail-ed1-f68.google.com [209.85.208.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E46CF68BC91 for ; Fri, 20 Nov 2020 09:34:12 +0200 (EET) Received: by mail-ed1-f68.google.com with SMTP id y4so8498843edy.5 for ; Thu, 19 Nov 2020 23:34:12 -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=hBfRonJDar8u7bPWwf8ZKMpCj4geEMLhWuj/fa3cTGA=; b=fthjwXaDomIREB1TzRqVlUuUISdxEel2W3z7geCGOQ0yFdF9hD6clIM9bmyEKZbw0K iVhlImBcJVMohIOgDLv4whs8e/SUCEUI0jF1UGNozgoS/x7Kdl5/sb4+HI7HSRmK9+zH JWV1gzj1bkQwQMfGM1DXpuRZn+UzSQhG7I02xHDrJhEDXroeqATUZ6UuL+oa/9YhKQGR krhZ9/H81zkAefOZemWguMfYWp8Ni15lVWDlRWUVPAoq2LmHE7MH6DNIdg1lPhj4dqzH LMQZblVeXB+y+yfjKRz1nw8Jo1zp1dG+jIZ9/ROo98nfbW1b+Nrh9DWs9tP5W32IVQQP cjjQ== 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=hBfRonJDar8u7bPWwf8ZKMpCj4geEMLhWuj/fa3cTGA=; b=nLecBlKX6/o5PyK3uODmVVXl/vqhBNQynnfDmDVCunoRbFzUW2Ihvu1iOION4S22me wEi+o4CEaV3U4/tLouT/qSRVs6arNZ6ShIN/zqnEwSJJcY+KqGnOetYB588TbxfPxy+R ZSn7piA6SAnLgM5CEGBWxbb7QJIEZo/bqMJM0Yj/oYBsl9Nl3it46bLFRcTGAss79iMy qutZ0bgg0sPYtXVmJpsP8IxlMveL8l5j7Xo4ixiWEV1hhFvz6T8+PsxJiGT4qfaAlGQ9 PnKdmFMSsKcUwqBA/McSUdwK41ry2AhizLo50t/vtRqfa7BzNeYVXo5Fk4DJ4wr4Xlv8 x73w== X-Gm-Message-State: AOAM532FMUeMg0HSMwTFV+doXbgglewzm/ZnuZb5qSMYS8vqjLT0wN5g K2+6gUETO9KA3Eebbm1IagQOR+wjEww7Ww== X-Google-Smtp-Source: ABdhPJwGG6D2cwRi9jcOFREzCxsdm4KarDGgoauoidRINMmBME4SN0SkUh3F3xTnEXJZxS8qUnA1VA== X-Received: by 2002:a50:cc98:: with SMTP id q24mr5635989edi.184.1605857652214; Thu, 19 Nov 2020 23:34:12 -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.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2020 23:34:11 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Nov 2020 08:32:35 +0100 Message-Id: <20201120073327.820745-11-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 110/162] avcodec/vc1: Reindentation 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" Also combine two loops while at it. Signed-off-by: Andreas Rheinhardt --- libavcodec/vc1.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index ed31b03a8a..a4f72c1808 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -1364,7 +1364,6 @@ static av_cold void vc1_init_vlc(VLC *vlc, int nb_bits, int nb_codes, static av_cold void vc1_init_static(void) { unsigned offset = 0; - int i = 0; vc1_init_vlc(&ff_vc1_bfraction_vlc, VC1_BFRACTION_VLC_BITS, 23, &offset, ff_vc1_bfraction_tab, 0); @@ -1374,15 +1373,15 @@ static av_cold void vc1_init_static(void) &offset, ff_vc1_norm6_tab, 0); vc1_init_vlc(&ff_vc1_imode_vlc, VC1_IMODE_VLC_BITS, 7, &offset, ff_vc1_imode_tab, 0); - for (i = 0; i < 3; i++) { + for (int i = 0; i < 3; i++) { vc1_init_vlc(&ff_vc1_ttmb_vlc[i], VC1_TTMB_VLC_BITS, 16, &offset, ff_vc1_ttmb_tabs[i], 0); vc1_init_vlc(&ff_vc1_ttblk_vlc[i], VC1_TTBLK_VLC_BITS, 8, &offset, ff_vc1_ttblk_tabs[i], 0); vc1_init_vlc(&ff_vc1_subblkpat_vlc[i], VC1_SUBBLKPAT_VLC_BITS, 15, &offset, ff_vc1_subblkpat_tabs[i], 0); - } - for (i = 0; i < 4; i++) { + } + for (int i = 0; i < 4; i++) { vc1_init_vlc(&ff_vc1_4mv_block_pattern_vlc[i], VC1_4MV_BLOCK_PATTERN_VLC_BITS, 16, &offset, ff_vc1_4mv_block_pattern_tabs[i], 0); vc1_init_vlc(&ff_vc1_cbpcy_p_vlc[i], VC1_CBPCY_P_VLC_BITS, 64, @@ -1401,30 +1400,28 @@ static av_cold void vc1_init_static(void) /* Initialize 2MV Block pattern VLC tables */ vc1_init_vlc(&ff_vc1_2mv_block_pattern_vlc[i], VC1_2MV_BLOCK_PATTERN_VLC_BITS, 4, &offset, ff_vc1_2mv_block_pattern_tabs[i], 0); - } - for (int i = 0, ac_offset = 0; i < 8; i++) { + } + for (int i = 0, ac_offset = 0; i < 8; i++) { ff_vc1_ac_coeff_table[i].table = &vlc_buf[offset]; ff_vc1_ac_coeff_table[i].table_allocated = FF_ARRAY_ELEMS(vlc_buf) - offset; - ff_init_vlc_from_lengths(&ff_vc1_ac_coeff_table[i], AC_VLC_BITS, ff_vc1_ac_sizes[i], - ff_vc1_ac_coeff_lens + ac_offset, 1, - ff_vc1_ac_coeff_syms + ac_offset, 2, 2, + ff_init_vlc_from_lengths(&ff_vc1_ac_coeff_table[i], AC_VLC_BITS, ff_vc1_ac_sizes[i], + ff_vc1_ac_coeff_lens + ac_offset, 1, + ff_vc1_ac_coeff_syms + ac_offset, 2, 2, 0, INIT_VLC_STATIC_OVERLONG, NULL); - ac_offset += ff_vc1_ac_sizes[i]; + ac_offset += ff_vc1_ac_sizes[i]; offset += ff_vc1_ac_coeff_table[i].table_size; - /* initialize interlaced MVDATA tables (2-Ref) */ + /* initialize interlaced MVDATA tables (2-Ref) */ vc1_init_vlc(&ff_vc1_2ref_mvdata_vlc[i], VC1_2REF_MVDATA_VLC_BITS, 126, &offset, ff_vc1_2ref_mvdata_tabs[i], 0); - } - for (i = 0; i < 8; i++) { - /* Initialize interlaced CBPCY VLC tables (Table 124 - Table 131) */ + /* Initialize interlaced CBPCY VLC tables (Table 124 - Table 131) */ vc1_init_vlc(&ff_vc1_icbpcy_vlc[i], VC1_ICBPCY_VLC_BITS, 63, &offset, ff_vc1_icbpcy_p_tabs[i], 0); - /* Initialize interlaced field picture MBMODE VLC tables */ + /* Initialize interlaced field picture MBMODE VLC tables */ vc1_init_vlc(&ff_vc1_if_mmv_mbmode_vlc[i], VC1_IF_MMV_MBMODE_VLC_BITS, 8, &offset, ff_vc1_if_mmv_mbmode_tabs[i], 0); vc1_init_vlc(&ff_vc1_if_1mv_mbmode_vlc[i], VC1_IF_1MV_MBMODE_VLC_BITS, 6, &offset, ff_vc1_if_1mv_mbmode_tabs[i], 0); - } + } } /**