From patchwork Tue Oct 13 09:10:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22919 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:3414:0:0:0:0:0 with SMTP id b20csp1644980yba; Tue, 13 Oct 2020 02:11:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwzRESYcqbXCXJ+tsrlR8Zn3xi/Df1x1BX5Cbj4guptx3k7d6ihJnQn+kr0xPq117Bzp0M6 X-Received: by 2002:adf:9f4c:: with SMTP id f12mr22657814wrg.108.1602580276784; Tue, 13 Oct 2020 02:11:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602580276; cv=none; d=google.com; s=arc-20160816; b=JHNQJ5k+cpuEh5RA74nRr3wM2owIGx6j09WE6fWco6sS3j3m2e99TySdnIlLJUKlR+ dCGq3btMZFCATBUVXZeTdAChPRaOkaDr+zLe8dgrV2BDEtX6/TzJi5Wu8zV9sygqdRQf SqVC178G7pPBchTqLIMZy4BH4iXpvfS3rSPIFi3WrK9g4vbKbeyAVj9HRvRjKTnGGJW5 MI0iVTusV64hMU/O8EvHiIUGal+Ge/NNMQ8vGtZ1r6VT0H7yS1nQtaxMc8VbFUR/oR6+ Zpe0tMxE378KX9ZYycJsx97z5GTawmI8+0c8Nz4TMz93K6NmNE8iJjeBYPvxqHwXsJDV j3zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=drGRwj1AUFw4rPK6zjsQa1MQORvclRrRkvVOT191Ik8=; b=rwlfpuWMxrUgVwtkZLiLMg2pZH7drFrb9fxzTUgaWRiX4PoXKyJSjbYZDMiy/TvCuL MJdr1eeCQ8FSgaKCGJdl/ckKWTAc+yf80g/jwu7X5dG1Yd+4G71cXQ0/ux/q88IoFhjh 62nJjPbY9jYl6TukA7qpOu19M7Y7eQubljQRSj3M05uC+l/0At06p2KBneARfuB/xL1P X+b1BKb8zxo4AKXYPFM+XniAqcrs4B42oRWACbjGUM1olXb+HsFXNHRPManGxEc9axdl vzj0vaEI8huL6G+02UFXqoRVPdVGbiNe/ybPk0YDOl6vGS9AeM2g1aHPW/sFKZ1dp7Gg Wl0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=t94E4lUL; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u22si18248789wmc.123.2020.10.13.02.11.16; Tue, 13 Oct 2020 02:11:16 -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=@gmail.com header.s=20161025 header.b=t94E4lUL; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 824ED68BB59; Tue, 13 Oct 2020 12:11:02 +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 3EA8F68BB27 for ; Tue, 13 Oct 2020 12:10:53 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id h7so23096617wre.4 for ; Tue, 13 Oct 2020 02:10:53 -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=LTeK1Zk3P0Gp2CXzewLdkHLHDxqlYvoYtd5dwckpWb4=; b=t94E4lULq5dVYb1ldWDhAqosy6shD2kjPyKAsnAPq/yxL/DEQpL2csRy/YDad4U6WE JVcXQs/KQH91PAQ0Ywldas9kx2mU5x5xxvZcUAyJQznDVHcGuvV43MgdBnluWhosyoKm aO1WP4zKy2FuXxBgYfaQFfI0IXcCEsem6r3Fi7hJbvc9xK966nFaRbfAKwoeaW6XUIhq QqM8MnLaM37ZEguR5qraofhWUYTOeLi+/NN0KXkPiQwDd2/iorQxUDDMKf2TWJx+3Auh fe+z3d2QRMi0yzSV4No6ErCPQLuFm7BfjUrQLFetU5ySZppO/lbJQwbCL8GQRi1L/rR0 jLkg== 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=LTeK1Zk3P0Gp2CXzewLdkHLHDxqlYvoYtd5dwckpWb4=; b=MfkpTg6O0TYG2rZLfmXMSU9rSVQY228DhtjK9LJkGD4S6kxXw+GDzmSk8+H5uPDK3H 3O6+7WGFvqdyVFMDoglFV26fSJxMiN1tRmtv2AOP62tB0tBpfrhTTLjvWeCNwak4LmEr alpcvh+ZAIeicvCfaHHFIJ2FfowP7bF5PelfqcMPyEzyqSCiRcgZSPTdKU6J/DiGwnet 9V50q0VgAe3W8OhMNwwzN6b/eJKEB+gM2MDyr+fylz2PbUZK+erD6PYgMVKcpJJyTGG9 5dg2/tqxHZZS0e2LWc7v7ghzLNyaaM4quFujYPOVG2qEeQOt7Zzryn6b6aRrOM2g7mFh CUmQ== X-Gm-Message-State: AOAM530s8KoidQdlFQ3VojRc13ncxS32Q5yDkditPFKTLmpcZyetc7I5 TP4xT4Ae3f1iwNt3SJZWKR9IevgOS64= X-Received: by 2002:adf:ee44:: with SMTP id w4mr1921594wro.114.1602580252195; Tue, 13 Oct 2020 02:10:52 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id g83sm25913159wmf.15.2020.10.13.02.10.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2020 02:10:51 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Oct 2020 11:10:12 +0200 Message-Id: <20201013091017.1899676-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201013091017.1899676-1-andreas.rheinhardt@gmail.com> References: <20201013091017.1899676-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/9] avcodec/asvenc: Inline constants 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" X-TUID: BUW4JFldx6eA Content-Length: 2890 Signed-off-by: Andreas Rheinhardt --- libavcodec/asvenc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/asvenc.c b/libavcodec/asvenc.c index 28f7a94071..054ec8ee65 100644 --- a/libavcodec/asvenc.c +++ b/libavcodec/asvenc.c @@ -47,7 +47,7 @@ static inline void asv1_put_level(PutBitContext *pb, int level) if (index <= 6) { put_bits(pb, ff_asv_level_tab[index][1], ff_asv_level_tab[index][0]); } else { - put_bits(pb, ff_asv_level_tab[3][1], ff_asv_level_tab[3][0]); + put_bits(pb, 3, 0); /* Escape code */ put_sbits(pb, 8, level); } } @@ -59,7 +59,7 @@ static inline void asv2_put_level(ASV1Context *a, PutBitContext *pb, int level) if (index <= 62) { put_bits(pb, ff_asv2_level_tab[index][1], ff_asv2_level_tab[index][0]); } else { - put_bits(pb, ff_asv2_level_tab[31][1], ff_asv2_level_tab[31][0]); + put_bits(pb, 5, 0); /* Escape code */ if (level < -128 || level > 127) { av_log(a->avctx, AV_LOG_WARNING, "Clipping level %d, increase qscale\n", level); level = av_clip_int8(level); @@ -95,7 +95,7 @@ static inline void asv1_encode_block(ASV1Context *a, int16_t block[64]) if (ccp) { for (; nc_count; nc_count--) - put_bits(&a->pb, ff_asv_ccp_tab[0][1], ff_asv_ccp_tab[0][0]); + put_bits(&a->pb, 2, 2); /* Skip */ put_bits(&a->pb, ff_asv_ccp_tab[ccp][1], ff_asv_ccp_tab[ccp][0]); @@ -111,7 +111,7 @@ static inline void asv1_encode_block(ASV1Context *a, int16_t block[64]) nc_count++; } } - put_bits(&a->pb, ff_asv_ccp_tab[16][1], ff_asv_ccp_tab[16][0]); + put_bits(&a->pb, 5, 0xF); /* End of block */ } static inline void asv2_encode_block(ASV1Context *a, int16_t block[64])