From patchwork Fri Nov 20 07:33:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23896 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 3757E448F1E for ; Fri, 20 Nov 2020 09:52:53 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4C13968BCED; Fri, 20 Nov 2020 09:35:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f66.google.com (mail-ej1-f66.google.com [209.85.218.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0E97868BCB9 for ; Fri, 20 Nov 2020 09:34:51 +0200 (EET) Received: by mail-ej1-f66.google.com with SMTP id gj5so11528040ejb.8 for ; Thu, 19 Nov 2020 23:34:50 -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=aYiSF4BwyQIXylqnfNh/iAtGGmNSt2ok2sUiyVCAzvw=; b=iaSbPZbX9CHqMxL4LBHBXCF1KcI1s+A9YszL9C2XfLAZs77UpqllY6rse+7JixCoyl C7dMpYIIoFRtVgVmZxQU+5QYTh4Yh617W+iIW5ZN24t/9QsH5x0OWGKaLkS/Wh9YUvhO PWXSacYRGOyIojNZCMqfPo4O1ZL8zr1dlMfvIbmGXyMV9QUw57cmiKzLUYy76WcSgxIu QH2uP9OTu9QxBSC0lzp9t0vIw6yTbIarwpgO0asex9dduxP6p6cjTezHYiaLWP6bjpDS ZByHbfsJF/c7B/LgWTLIWttzKDtsjr4GS182+uNDmqhH/1LfkTD+0r17UBmobhA42ii+ 5TKA== 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=aYiSF4BwyQIXylqnfNh/iAtGGmNSt2ok2sUiyVCAzvw=; b=fXL7t3g9X6JNIuYf72o8vVYLMnqqce5oBLgbGkswU4KE3agU8Q5UX3tOD8+dEO1HFp boswtpA/ydevhb41vRA2svG9N6y+iuyEffLnYjYs7UByDITdfc8sTfMh3JpA88eOQe1F fReZP7O3yVbmAIATjYhmOD7QF7JkJuLeFT9vXIIufjZUUNCZJyao32qFyCcXrG4cUvHn YTdh2C7mGihUgop45HVoeNdZV7rmPsG9qlgz4F3xQ8FOmSnKRwJnieRINlicpH6mqUyQ W2QBcfodJ3dNC9DYxtnO9EfdKFXulc318vxTPjRu2m62/8G5ikigZTHu8rq30yguFHdi Z0JQ== X-Gm-Message-State: AOAM532iC2s/+gRP+YJ2Dnl1S6WqWksf3+HWr33Hgqc8EDpFZgkxBCXF I0NJnwR5WXyySo43Lyj2Ac9buknPUq+Yqg== X-Google-Smtp-Source: ABdhPJwB6tLXfjQe/wyWxNwCWQsXDWrCMt07QHv+jpbLbcdxvk6l+2CW/GEe/B6uS0Dq1P1myOfrlQ== X-Received: by 2002:a17:906:3ac4:: with SMTP id z4mr31662444ejd.92.1605857690194; Thu, 19 Nov 2020 23:34:50 -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.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2020 23:34:49 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Nov 2020 08:33:10 +0100 Message-Id: <20201120073327.820745-46-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 145/162] avcodec/imm4: Make better use of symbols table 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 inline the VLC's number of bits while at it. Signed-off-by: Andreas Rheinhardt --- libavcodec/imm4.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/imm4.c b/libavcodec/imm4.c index 85d8526bc8..85046f7d06 100644 --- a/libavcodec/imm4.c +++ b/libavcodec/imm4.c @@ -61,7 +61,7 @@ static const uint8_t inter_cb[] = { }; static const uint8_t cbplo_symbols[] = { - 3, 4, 19, 20, 35, 36, 51, 52 + 0, 0, 1, 1, 2, 2, 3, 3 }; static const uint8_t cbplo_bits[] = { @@ -236,7 +236,7 @@ static int decode_intra(AVCodecContext *avctx, GetBitContext *gb, AVFrame *frame for (x = 0; x < avctx->width; x += 16) { unsigned flag, cbphi, cbplo; - cbplo = get_vlc2(gb, cbplo_tab.table, cbplo_tab.bits, 1) >> 4; + cbplo = get_vlc2(gb, cbplo_tab.table, CBPLO_VLC_BITS, 1); flag = get_bits1(gb); cbphi = get_cbphi(gb, 1);