From patchwork Sun Oct 30 23:56:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 39064 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8e01:b0:a3:a294:714c with SMTP id y1csp607566pzj; Sun, 30 Oct 2022 16:58:04 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6WjBbbH5kNrKt8eHr+P/gaBBr5txTDhfM+Xt/TqYwsGmKPsPFJladvh1ERjllUTOjhEXfO X-Received: by 2002:a17:906:478d:b0:7a3:cf5e:9027 with SMTP id cw13-20020a170906478d00b007a3cf5e9027mr10573226ejc.718.1667174284171; Sun, 30 Oct 2022 16:58:04 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qf21-20020a1709077f1500b00732fa13e848si6999805ejc.597.2022.10.30.16.58.03; Sun, 30 Oct 2022 16:58:04 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=SITKkpUt; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3EE5868BDCC; Mon, 31 Oct 2022 01:57:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074015.outbound.protection.outlook.com [40.92.74.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 106EC68BD8D for ; Mon, 31 Oct 2022 01:57:07 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PwAIlJTXiSy68dpoWrHH8XFd2z4Tn1MB/3sWlI+ufFjOwZlrqCwkZlTi2VOPE6olMNJdYneiufXw9vuBtQJy+7Wu2VMe4cchevyEPGUipPfFGuuZvRYYhc7Apg7bcMi8vSYmpMYy/0tcPdFGldiod5YipokpjkdlkYWa15Uo//3BikeGDm6wNgYNmB1s6MTb1h6VcZrtnOH+wHid1GXkhzPkKHprSt54UemfkHPJH0mywPvfCeEE5ozcwA9NM+RBuIRsea4zQVvI6bsBy/+l8ICHDmag16wN9xrUYDzKD7fv7/yRrFeiwPqz0+SM27zcQTo+jNSBMP68P5xF9hMQXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=PeOeqauOJeGtwzJy1N+6Ch59Dq7wF2DCRAH0+bibVHg=; b=BdsTqd1wfZ1reOrhV22degrQjdD5tisAINorDajixPwsZeJpECz1brelVyjqwvoC0xhM82ksljHDyHeVxgI4V177Xp8rWsP0tvmeTA885Kvj6C7drwLecV+EUAXlg6xnnBiGZaVjLMzgu7l/osEYT8IF+30lIuo8q4gg15AWxvOAwLIDJB9ohysi7Ll1apZCeS+twRUwzCkedqiRnKNSjMeMxi8nCyO+Dhokbgmnsw+wO+N55UTak+S7VRTZfv4FYTxXyThCS46HoAxU5WewD6Sw8s3U+tGir68eHE0bavPCjkobIphuiJ8FSHD//xJKTA1+gOhOfSfp3NkShHz66g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PeOeqauOJeGtwzJy1N+6Ch59Dq7wF2DCRAH0+bibVHg=; b=SITKkpUtZS8aBdbCCqde0/yO0TF74+32am087m5CD99LD8gHUTqtGjDF0D8U5rvdGGL/q0E2SgXUV7/qtiRAcHxAxj3eE534f46LU8vlTaKWNKAm/WoH7cetyBasyofnuPyJFJSdXpo+ssg9Yh6MOIcBHqj1/8xoqTPx7D4r8IwU02coSuCD9XaCxMSbUL1RvSChMiOrbLN31o41jzFw9XvrKiZH87cVDys58y4jJOhcuRPJEW6ojpx9jzfv8kOyA0qo0LKZzGrWx3wQ8DscVnDiRKgheYKLKDKujSwXY7GA9gZ7Wo6seWzjKdHWvGpM3ggBjD+jeHMW9bqWfuhjsw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by GV1P250MB0857.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:97::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.19; Sun, 30 Oct 2022 23:57:00 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::739a:8740:19c5:925c]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::739a:8740:19c5:925c%5]) with mapi id 15.20.5769.019; Sun, 30 Oct 2022 23:57:00 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 31 Oct 2022 00:56:24 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [Gha182BPiZRjA4dltC/9AKPSTL//XYkE8RLBwnfS/d8=] X-ClientProxiedBy: FR0P281CA0146.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:96::20) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20221030235631.11750-11-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|GV1P250MB0857:EE_ X-MS-Office365-Filtering-Correlation-Id: e6a48d13-4c51-447b-a717-08dabad26f50 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqZLd1X3toBDX9YZ7dpDxvLn/mJCoMcot/+onqDE8JgHA0buXBpFQwXUC4P4MDf7nOxI9QO7aok3qvO7FhimrMWhQOTFAOfYmnmyZuZyAquiwO+tJyGD7wMIY5laG4w8gtvrAfFMRzUCEYxSD+GrkCxEMYAywQaBw2oEnpfK+iDoFsAGdwrxPu4lc/07nQv8pmR1MvVjy0awDuJUXPmHeA6v1/hQYM71DaJiy1Stp3JVoU5iBOMS/COSX6pJ1R9u1JNXkT7CxSU+G86CrHY3tbyubEWmYhDqXDGTt20BhFfRJWEskKPx1cIi6BXi6RQoVsYwKUeMePjzqtRTlzUXTd3coi92/669kBd1/Er20XBM9H0eIIp6LPqarYN6JM4gnTwJ0ZoT5eYbnPCmVCohuhUsxgtqDN29dhweNpE/IVog1qTOOJJi0cfFX8MxxqnK+ybzQfT58KKpjkv/8CQbTEgxjd/+Mq5uZ2zKKCCNIVIXv5Lx5gTHLbHVZVHaJNSdqFawYFFc/wEn0PXABZZF77QbhLehdq5hI8lobElamRIC4WTf4JBVPdzRz6rWgRUiZ80TwLCIJnZynmESrqz7tQvs9q9/+UC0lch0IxhamoR2pnoSU+P4Nlww96QML6xqOrxpcVI92d2Dhuz6QcmMJaArhS90V3ArzxJ2xJJu0bLpw9+ic+yrMTXFhevwHvabGFWu++PQIk7J5A7ZbEKzrSnw8BaWO3c/h1cjLMPg3riScBXWZlbRTvr+8LZGCqxW1E= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: f5xK4TPhwstKLqba9mkXnt0GvGcMDmuwqK4peoE112qFCu0cQAfcWgXqswllg4vSrgeiLpL7o+KAK3WvaAfnBs7x/ESMG3rViKhDFqTrWZbMqkJwjSUF/mYIIlgAnVb5nNLyogwPAWrrjeL0GP5r0OJq6yVvkeQLUNIE9sdv2IFm7tXRc9YWa8kPfo6+iNGX6vhK/oN8nrLJry8Q7YGVPOxDXbZrCWrvgE5z3BYIW3ofPyGHg0eiYBzT536uLKY/6ZNRBtXENH9JPQWSLge+F0LSzPAv4fmofL4pLkD1TuoKaCrUQWr1accCq8bDwrmVMcyCiHiwzBSZ5NrjrUCkysinZ1GD7eiYIR79UY1rQXGUMhZtvC7sW3lqdB+ul7dFJoyx2HyBdRy8ioMFue0j4Qol721I0cIyTzCfx+LgwHXjfVN2Hth0i5I8grpEuyYxB95HhgxcYNs5OYkMCBMCcMBEwm0L7906NiM4KsaMai6LhthZBqmrTndUipFJKjtz4AXa7nFviiaJjNJy2fjBdN5gKC67+ha0110XF2we3t9NoSyNAK17kzFxV8IszkBDMnCEIR4bAxMU5/GULNmJDo1EoFRTuZdgkkHkonXWdI+jXEfKwvRnW7uhFu40PNJf/nwvaLdVEcfBiud1ZTIFWCAy98zTbA5U9/5Yr4A8urQlGrM44FrSd4XFzweVvS8d X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QPELZ7Yjr//ziCIJ1JLcKdTwIWPQHXh72iX4C5ggZKigmmhq+HnDrpOyZZslbwHfjrcWbfEE4lKc5rXsEh2IQWscExIysnrhOJy8uW0gC0bKT9TkeOtWgZopJjcJYfxtWlgRXJ/sO+Ad4Jr3pFlfXFw4cYafg/wGpAGk8IaMliyE3MlcF2KFm5C+OanErDYHf50MN3jjxRrx4YzgQCjd/kztVjN8U4hwuRuOXT2tvFM46oTXfTpLORu8SId1AbIwYDK77zfUgC1Rx6hNgulX8cAf5XJD10uDe2muc1yzzTZbvmXHvjNQgOGqTNlLPdMhqxJbxli2oK6Lrr3H0JNrmaQavXa6YczDm/uuLTpOagmyzc5NYlBCqAoXzlwRm6yS70ET9GeupCcSz73GhxY5xkM629kGsOLKrt1poK5vI3LNtjvb+lI5yKiGFmVzUf3FY+VUvVL45fACkAmugmDrY8drX+5ityMDSF0awpJHCFNLMRzdAPlERlp4i92gSz1SB4jZjKW6bGu6/fjGQ/bkY/JCY4byIOhYh4TorilQv+ElUxGTSW2q0E+rL6Os+dmrIw/t/xxDWG1yVlubgjMTg1fkQNBG4u68zowj98Zy1oRdToLIdacjevYr8VgYBc3a2lpitx3DTz4c8t0lL0sfM5hlfnOxXYNrbkKh7cU9nwGy7p8w1PRtl1TAZp+Rt6GN5CdjIpScRwsvE/X9JFdI22YEwEV7MRGqEKwnCaA522XKT7Hk1Zprih6nDppPbjEXRwZKUYR3MoCncPRdUBYrtk1OXD/Pm0CrL+5yMwr19UHgEesENSDdo9kDFQnBrrbKKOgdKNKLcLvYJnxDz1NjqMTUgYp0/+HV/aJg0FZHWBEc6PkZjW1bz3tqWP5+AK/L1bdO7ovB02pNVN0fYg0WgEYAdXGTq/HPBizyoXFuyreExWThSHUA5NnxTwlQVzBea2Tuwj1h0WKdL3HW7CXEbApc9Z2kv17+S4caUwpkVq5ZWHqAa02D0zT5e+5pyX5Q+hax+10mZkktJpUkZXk55tfr0kkW8L03ifO20s6SYCtr5ReRYNoJVhw7M3PQp+J6qgnTO+yxq7JxbLozdgErhj2Qlg4CHi5gmyKquiiXsIi5YpiCFIx67fYG3IquHMxKxdUoRWLSyAvDOnaFbuXNp67qyYxGmEi7UBdAlr7d+pTN5qW6BaXnQolkbGsGpPWufG8tnZljQDJIcpmBRbCd89O+M4kqGGeLnHBILCbqiqElf7P4BzM6aHiVFmYAjzSzriKILmeHgGfRYe6j0uGOP7yU53UKTbmXC86UoZXP4dh8Uigj5s7Zx/Nt3FB9zeyC X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e6a48d13-4c51-447b-a717-08dabad26f50 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Oct 2022 23:57:00.1676 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1P250MB0857 Subject: [FFmpeg-devel] [PATCH 12/19] avcodec/vc1_block: Don't duplicate #defines X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: ouEasS3GMR5F VC1 shares some VLCs with MSMPEG-4, but vc1_block.c simply duplicates the defines instead of including the appropriate headers; furthermore, use a proper prefix for these defines: DC_VLC_BITS is also used by other codecs. Signed-off-by: Andreas Rheinhardt --- libavcodec/msmpeg4data.h | 2 ++ libavcodec/msmpeg4dec.c | 27 ++++++++++++++------------- libavcodec/msmpeg4dec.h | 1 - libavcodec/vc1_block.c | 27 ++++++++++++++++----------- libavcodec/wmv2dec.c | 3 ++- 5 files changed, 34 insertions(+), 26 deletions(-) diff --git a/libavcodec/msmpeg4data.h b/libavcodec/msmpeg4data.h index b2b5bade4d..4f904d7610 100644 --- a/libavcodec/msmpeg4data.h +++ b/libavcodec/msmpeg4data.h @@ -48,7 +48,9 @@ typedef struct MVTable { } MVTable; FF_VISIBILITY_PUSH_HIDDEN +#define MSMP4_MB_INTRA_VLC_BITS 9 extern VLC ff_msmp4_mb_i_vlc; +#define MSMP4_DC_VLC_BITS 9 extern VLC ff_msmp4_dc_luma_vlc[2]; extern VLC ff_msmp4_dc_chroma_vlc[2]; diff --git a/libavcodec/msmpeg4dec.c b/libavcodec/msmpeg4dec.c index bc554ed2eb..a7ba53f68e 100644 --- a/libavcodec/msmpeg4dec.c +++ b/libavcodec/msmpeg4dec.c @@ -37,7 +37,6 @@ #include "mpeg4videodec.h" #include "msmpeg4data.h" -#define DC_VLC_BITS 9 #define V2_INTRA_CBPC_VLC_BITS 3 #define V2_MB_TYPE_VLC_BITS 7 #define MV_VLC_BITS 9 @@ -237,7 +236,7 @@ static int msmpeg4v34_decode_mb(MpegEncContext *s, int16_t block[6][64]) cbp = code & 0x3f; } else { s->mb_intra = 1; - code = get_vlc2(&s->gb, ff_msmp4_mb_i_vlc.table, MB_INTRA_VLC_BITS, 2); + code = get_vlc2(&s->gb, ff_msmp4_mb_i_vlc.table, MSMP4_MB_INTRA_VLC_BITS, 2); /* predict coded block pattern */ cbp = 0; for(i=0;i<6;i++) { @@ -317,23 +316,23 @@ static av_cold void msmpeg4_decode_init_static(void) mv->table_mv_bits, 1, 1, mv->table_mv_code, 2, 2, 2694); - INIT_VLC_STATIC(&ff_msmp4_dc_luma_vlc[0], DC_VLC_BITS, 120, + INIT_VLC_STATIC(&ff_msmp4_dc_luma_vlc[0], MSMP4_DC_VLC_BITS, 120, &ff_table0_dc_lum[0][1], 8, 4, &ff_table0_dc_lum[0][0], 8, 4, 1158); - INIT_VLC_STATIC(&ff_msmp4_dc_chroma_vlc[0], DC_VLC_BITS, 120, + INIT_VLC_STATIC(&ff_msmp4_dc_chroma_vlc[0], MSMP4_DC_VLC_BITS, 120, &ff_table0_dc_chroma[0][1], 8, 4, &ff_table0_dc_chroma[0][0], 8, 4, 1118); - INIT_VLC_STATIC(&ff_msmp4_dc_luma_vlc[1], DC_VLC_BITS, 120, + INIT_VLC_STATIC(&ff_msmp4_dc_luma_vlc[1], MSMP4_DC_VLC_BITS, 120, &ff_table1_dc_lum[0][1], 8, 4, &ff_table1_dc_lum[0][0], 8, 4, 1476); - INIT_VLC_STATIC(&ff_msmp4_dc_chroma_vlc[1], DC_VLC_BITS, 120, + INIT_VLC_STATIC(&ff_msmp4_dc_chroma_vlc[1], MSMP4_DC_VLC_BITS, 120, &ff_table1_dc_chroma[0][1], 8, 4, &ff_table1_dc_chroma[0][0], 8, 4, 1216); - INIT_VLC_STATIC(&v2_dc_lum_vlc, DC_VLC_BITS, 512, + INIT_VLC_STATIC(&v2_dc_lum_vlc, MSMP4_DC_VLC_BITS, 512, &ff_v2_dc_lum_table[0][1], 8, 4, &ff_v2_dc_lum_table[0][0], 8, 4, 1472); - INIT_VLC_STATIC(&v2_dc_chroma_vlc, DC_VLC_BITS, 512, + INIT_VLC_STATIC(&v2_dc_chroma_vlc, MSMP4_DC_VLC_BITS, 512, &ff_v2_dc_chroma_table[0][1], 8, 4, &ff_v2_dc_chroma_table[0][0], 8, 4, 1506); @@ -355,7 +354,7 @@ static av_cold void msmpeg4_decode_init_static(void) offset += ff_mb_non_intra_vlc[i].table_size; } - INIT_VLC_STATIC(&ff_msmp4_mb_i_vlc, MB_INTRA_VLC_BITS, 64, + INIT_VLC_STATIC(&ff_msmp4_mb_i_vlc, MSMP4_MB_INTRA_VLC_BITS, 64, &ff_msmp4_mb_i_table[0][1], 4, 2, &ff_msmp4_mb_i_table[0][0], 4, 2, 536); @@ -591,9 +590,9 @@ static int msmpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr) if(s->msmpeg4_version<=2){ if (n < 4) { - level = get_vlc2(&s->gb, v2_dc_lum_vlc.table, DC_VLC_BITS, 3); + level = get_vlc2(&s->gb, v2_dc_lum_vlc.table, MSMP4_DC_VLC_BITS, 3); } else { - level = get_vlc2(&s->gb, v2_dc_chroma_vlc.table, DC_VLC_BITS, 3); + level = get_vlc2(&s->gb, v2_dc_chroma_vlc.table, MSMP4_DC_VLC_BITS, 3); } if (level < 0) { av_log(s->avctx, AV_LOG_ERROR, "illegal dc vlc\n"); @@ -603,9 +602,11 @@ static int msmpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr) level-=256; }else{ //FIXME optimize use unified tables & index if (n < 4) { - level = get_vlc2(&s->gb, ff_msmp4_dc_luma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3); + level = get_vlc2(&s->gb, ff_msmp4_dc_luma_vlc[s->dc_table_index].table, + MSMP4_DC_VLC_BITS, 3); } else { - level = get_vlc2(&s->gb, ff_msmp4_dc_chroma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3); + level = get_vlc2(&s->gb, ff_msmp4_dc_chroma_vlc[s->dc_table_index].table, + MSMP4_DC_VLC_BITS, 3); } if (level == DC_MAX) { diff --git a/libavcodec/msmpeg4dec.h b/libavcodec/msmpeg4dec.h index 19b5c12c6c..ad41eea9d4 100644 --- a/libavcodec/msmpeg4dec.h +++ b/libavcodec/msmpeg4dec.h @@ -27,7 +27,6 @@ #define INTER_INTRA_VLC_BITS 3 #define MB_NON_INTRA_VLC_BITS 9 -#define MB_INTRA_VLC_BITS 9 extern VLC ff_mb_non_intra_vlc[4]; extern VLC ff_inter_intra_vlc; diff --git a/libavcodec/vc1_block.c b/libavcodec/vc1_block.c index ef8ce40e68..9293c509cb 100644 --- a/libavcodec/vc1_block.c +++ b/libavcodec/vc1_block.c @@ -37,9 +37,6 @@ #include "vc1acdata.h" #include "vc1data.h" -#define MB_INTRA_VLC_BITS 9 -#define DC_VLC_BITS 9 - // offset tables for interlaced picture MVDATA decoding static const uint8_t offset_table[2][9] = { { 0, 1, 2, 4, 8, 16, 32, 64, 128 }, @@ -596,9 +593,11 @@ static int vc1_decode_i_block(VC1Context *v, int16_t block[64], int n, /* Get DC differential */ if (n < 4) { - dcdiff = get_vlc2(&s->gb, ff_msmp4_dc_luma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3); + dcdiff = get_vlc2(&s->gb, ff_msmp4_dc_luma_vlc[s->dc_table_index].table, + MSMP4_DC_VLC_BITS, 3); } else { - dcdiff = get_vlc2(&s->gb, ff_msmp4_dc_chroma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3); + dcdiff = get_vlc2(&s->gb, ff_msmp4_dc_chroma_vlc[s->dc_table_index].table, + MSMP4_DC_VLC_BITS, 3); } if (dcdiff) { const int m = (v->pq == 1 || v->pq == 2) ? 3 - v->pq : 0; @@ -740,9 +739,11 @@ static int vc1_decode_i_block_adv(VC1Context *v, int16_t block[64], int n, /* Get DC differential */ if (n < 4) { - dcdiff = get_vlc2(&s->gb, ff_msmp4_dc_luma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3); + dcdiff = get_vlc2(&s->gb, ff_msmp4_dc_luma_vlc[s->dc_table_index].table, + MSMP4_DC_VLC_BITS, 3); } else { - dcdiff = get_vlc2(&s->gb, ff_msmp4_dc_chroma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3); + dcdiff = get_vlc2(&s->gb, ff_msmp4_dc_chroma_vlc[s->dc_table_index].table, + MSMP4_DC_VLC_BITS, 3); } if (dcdiff) { const int m = (quant == 1 || quant == 2) ? 3 - quant : 0; @@ -940,9 +941,11 @@ static int vc1_decode_intra_block(VC1Context *v, int16_t block[64], int n, /* Get DC differential */ if (n < 4) { - dcdiff = get_vlc2(&s->gb, ff_msmp4_dc_luma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3); + dcdiff = get_vlc2(&s->gb, ff_msmp4_dc_luma_vlc[s->dc_table_index].table, + MSMP4_DC_VLC_BITS, 3); } else { - dcdiff = get_vlc2(&s->gb, ff_msmp4_dc_chroma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3); + dcdiff = get_vlc2(&s->gb, ff_msmp4_dc_chroma_vlc[s->dc_table_index].table, + MSMP4_DC_VLC_BITS, 3); } if (dcdiff) { const int m = (quant == 1 || quant == 2) ? 3 - quant : 0; @@ -2588,7 +2591,8 @@ static void vc1_decode_i_blocks(VC1Context *v) } // do actual MB decoding and displaying - cbp = get_vlc2(&v->s.gb, ff_msmp4_mb_i_vlc.table, MB_INTRA_VLC_BITS, 2); + cbp = get_vlc2(&v->s.gb, ff_msmp4_mb_i_vlc.table, + MSMP4_MB_INTRA_VLC_BITS, 2); v->s.ac_pred = get_bits1(&v->s.gb); for (k = 0; k < 6; k++) { @@ -2723,7 +2727,8 @@ static int vc1_decode_i_blocks_adv(VC1Context *v) return 0; } - cbp = get_vlc2(&v->s.gb, ff_msmp4_mb_i_vlc.table, MB_INTRA_VLC_BITS, 2); + cbp = get_vlc2(&v->s.gb, ff_msmp4_mb_i_vlc.table, + MSMP4_MB_INTRA_VLC_BITS, 2); if (v->acpred_is_raw) v->s.ac_pred = get_bits1(&v->s.gb); else diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c index 2daf6c70e8..1209b1902d 100644 --- a/libavcodec/wmv2dec.c +++ b/libavcodec/wmv2dec.c @@ -482,7 +482,8 @@ static int wmv2_decode_mb(MpegEncContext *s, int16_t block[6][64]) s->mb_intra = 1; if (get_bits_left(&s->gb) <= 0) return AVERROR_INVALIDDATA; - code = get_vlc2(&s->gb, ff_msmp4_mb_i_vlc.table, MB_INTRA_VLC_BITS, 2); + code = get_vlc2(&s->gb, ff_msmp4_mb_i_vlc.table, + MSMP4_MB_INTRA_VLC_BITS, 2); /* predict coded block pattern */ cbp = 0; for (i = 0; i < 6; i++) {