From patchwork Fri Jan 29 05:23:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25253 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 F0BEF44B9EE for ; Fri, 29 Jan 2021 07:34:11 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DBE3268A800; Fri, 29 Jan 2021 07:34:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 049B068A76A for ; Fri, 29 Jan 2021 07:34:06 +0200 (EET) Received: by mail-wr1-f53.google.com with SMTP id p15so7585281wrq.8 for ; Thu, 28 Jan 2021 21:34:06 -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 :mime-version:content-transfer-encoding; bh=RCRPso8e+bJlkvV83Xx6R+RyLt9tsh80eRO6e9b8FuE=; b=jAAxP5CfMKSuaFwNrVHhtLDYzz8BjaaI3Ne4mVhktXmJYoKyMkfoJZDsq4XMvj1Rn1 uZV047MNbVWQElaUyp+CXj8iXjoT+WIxjr5+8o/FSoQrAwjxviCgzfFvwGNhjfXhefIQ d6lVoG66lvdby3wkfQvZXlfzydPyGTLsQkiWrr8XvkUS0NrHLPfV0/xGJ/fKBDxjMsex /vl7T/oTeSNgtWGLt3/oc77nvmQT8IBxKAlPLfC25651ZHAIzLlgRQ80PTWXvnMrWFJr vl0J7qPxx3uJxOmc/zPsRDN3yyx3dr1JXkFQ2iIAf0XP2MrDz6z0mvq9PV3RVnA6CEoE KZ1Q== 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=RCRPso8e+bJlkvV83Xx6R+RyLt9tsh80eRO6e9b8FuE=; b=VNLVndT2x6HpHUyVbOfk3h1Fhs5EhIwir5E5uLhrG0yeBSRwiLI76JKk9zyUS4YfU/ 0ZOJ5QHW8JcyXpQdZ8lGFLKNJtCO0t2vJwpIBWS8dcYxHSJMXlnWC/ZFzKmtEvP+JfeY rn20mrORDIyCafY2l8uAlyeASADQMx57Mhm/3SZrPdxoqqAhsrzcUbB+j6wP0+ET+dMR QlsgZNFjcUOWUMGENUwYz/C1iJ88nBd29b8kcghZjl8FpmPiuBxK4aoDZRYbeM9zwdi9 EXKPr9farTP6VK/XACX95WtaayiWzoemPOXkWRWrnAoOpxQRIopKnneAlnhlUDZE8bLr S5tQ== X-Gm-Message-State: AOAM530RGHe+sXr5RGHpiul8zzKQPGI7GG15jJLRenTgstnQVBkCkWPd Hoak2t58k+VxrfrQ9Fa5hQtjLWdG/mg= X-Google-Smtp-Source: ABdhPJwY2NrOX1uSuzXhf/r8FvUzN+GgNP0RW0vd9qi0JlfprI9iVzJ/Dql8rsuufm6PtxYvW9hjVg== X-Received: by 2002:adf:f1c3:: with SMTP id z3mr2509531wro.96.1611897984580; Thu, 28 Jan 2021 21:26:24 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id d13sm10068611wrx.93.2021.01.28.21.26.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Jan 2021 21:26:24 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Jan 2021 06:23:00 +0100 Message-Id: <20210129052302.3124447-11-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210129052302.3124447-1-andreas.rheinhardt@gmail.com> References: <20210129052302.3124447-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 11/13] avcodec/cabac: Move encoder related stuff to libavcodec/tests/cabac.c 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 is actually the second time the encoder stuff is removed; the first was in 8b4119187b62d6932e07aded11d33d3b24e1b42f.) Signed-off-by: Andreas Rheinhardt --- libavcodec/cabac.c | 12 ------ libavcodec/cabac.h | 5 --- libavcodec/tests/cabac.c | 93 +++++++++++++++++++++++++--------------- 3 files changed, 59 insertions(+), 51 deletions(-) diff --git a/libavcodec/cabac.c b/libavcodec/cabac.c index 3bbecf50dd..6649feebeb 100644 --- a/libavcodec/cabac.c +++ b/libavcodec/cabac.c @@ -158,18 +158,6 @@ DECLARE_ASM_ALIGNED(1, const uint8_t, ff_h264_cabac_tables)[512 + 4*2*64 + 4*64 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8 }; -/** - * @param buf_size size of buf in bits - */ -void ff_init_cabac_encoder(CABACContext *c, uint8_t *buf, int buf_size){ - init_put_bits(&c->pb, buf, buf_size); - - c->low= 0; - c->range= 0x1FE; - c->outstanding_count= 0; - c->pb.bit_left++; //avoids firstBitFlag -} - /** * * @param buf_size size of buf in bits diff --git a/libavcodec/cabac.h b/libavcodec/cabac.h index 1bf1c620d6..38d06b2842 100644 --- a/libavcodec/cabac.h +++ b/libavcodec/cabac.h @@ -29,8 +29,6 @@ #include -#include "put_bits.h" - extern const uint8_t ff_h264_cabac_tables[512 + 4*2*64 + 4*64 + 63]; #define H264_NORM_SHIFT_OFFSET 0 #define H264_LPS_RANGE_OFFSET 512 @@ -43,14 +41,11 @@ extern const uint8_t ff_h264_cabac_tables[512 + 4*2*64 + 4*64 + 63]; typedef struct CABACContext{ int low; int range; - int outstanding_count; const uint8_t *bytestream_start; const uint8_t *bytestream; const uint8_t *bytestream_end; - PutBitContext pb; }CABACContext; -void ff_init_cabac_encoder(CABACContext *c, uint8_t *buf, int buf_size); int ff_init_cabac_decoder(CABACContext *c, const uint8_t *buf, int buf_size); #endif /* AVCODEC_CABAC_H */ diff --git a/libavcodec/tests/cabac.c b/libavcodec/tests/cabac.c index affe4eb141..a8bd131c95 100644 --- a/libavcodec/tests/cabac.c +++ b/libavcodec/tests/cabac.c @@ -24,41 +24,51 @@ #include "libavutil/lfg.h" #include "libavcodec/avcodec.h" +#include "libavcodec/put_bits.h" -static inline void put_cabac_bit(CABACContext *c, int b){ +typedef struct CABACTestContext { + CABACContext dec; + int outstanding_count; + PutBitContext pb; +} CABACTestContext; + +static inline void put_cabac_bit(CABACTestContext *c, int b) +{ put_bits(&c->pb, 1, b); for(;c->outstanding_count; c->outstanding_count--){ put_bits(&c->pb, 1, 1-b); } } -static inline void renorm_cabac_encoder(CABACContext *c){ - while(c->range < 0x100){ +static inline void renorm_cabac_encoder(CABACTestContext *c) +{ + while (c->dec.range < 0x100) { //FIXME optimize - if(c->low<0x100){ + if (c->dec.low < 0x100) { put_cabac_bit(c, 0); - }else if(c->low<0x200){ + } else if (c->dec.low < 0x200) { c->outstanding_count++; - c->low -= 0x100; + c->dec.low -= 0x100; }else{ put_cabac_bit(c, 1); - c->low -= 0x200; + c->dec.low -= 0x200; } - c->range+= c->range; - c->low += c->low; + c->dec.range += c->dec.range; + c->dec.low += c->dec.low; } } -static void put_cabac(CABACContext *c, uint8_t * const state, int bit){ - int RangeLPS= ff_h264_lps_range[2*(c->range&0xC0) + *state]; +static void put_cabac(CABACTestContext *c, uint8_t * const state, int bit) +{ + int RangeLPS = ff_h264_lps_range[2 * (c->dec.range & 0xC0) + *state]; if(bit == ((*state)&1)){ - c->range -= RangeLPS; + c->dec.range -= RangeLPS; *state = ff_h264_mlps_state[128 + *state]; }else{ - c->low += c->range - RangeLPS; - c->range = RangeLPS; + c->dec.low += c->dec.range - RangeLPS; + c->dec.range = RangeLPS; *state= ff_h264_mlps_state[127 - *state]; } @@ -68,21 +78,22 @@ static void put_cabac(CABACContext *c, uint8_t * const state, int bit){ /** * @param bit 0 -> write zero bit, !=0 write one bit */ -static void put_cabac_bypass(CABACContext *c, int bit){ - c->low += c->low; +static void put_cabac_bypass(CABACTestContext *c, int bit) +{ + c->dec.low += c->dec.low; if(bit){ - c->low += c->range; + c->dec.low += c->dec.range; } //FIXME optimize - if(c->low<0x200){ + if (c->dec.low < 0x200) { put_cabac_bit(c, 0); - }else if(c->low<0x400){ + } else if (c->dec.low < 0x400) { c->outstanding_count++; - c->low -= 0x200; + c->dec.low -= 0x200; }else{ put_cabac_bit(c, 1); - c->low -= 0x400; + c->dec.low -= 0x400; } } @@ -90,20 +101,21 @@ static void put_cabac_bypass(CABACContext *c, int bit){ * * @return the number of bytes written */ -static int put_cabac_terminate(CABACContext *c, int bit){ - c->range -= 2; +static int put_cabac_terminate(CABACTestContext *c, int bit) +{ + c->dec.range -= 2; if(!bit){ renorm_cabac_encoder(c); }else{ - c->low += c->range; - c->range= 2; + c->dec.low += c->dec.range; + c->dec.range = 2; renorm_cabac_encoder(c); - av_assert0(c->low <= 0x1FF); - put_cabac_bit(c, c->low>>9); - put_bits(&c->pb, 2, ((c->low>>7)&3)|1); + av_assert0(c->dec.low <= 0x1FF); + put_cabac_bit(c, c->dec.low >> 9); + put_bits(&c->pb, 2, ((c->dec.low >> 7) & 3) | 1); flush_put_bits(&c->pb); //FIXME FIXME FIXME XXX wrong } @@ -111,8 +123,21 @@ static int put_cabac_terminate(CABACContext *c, int bit){ return (put_bits_count(&c->pb)+7)>>3; } +/** + * @param buf_size size of buf in bits + */ +static void init_cabac_encoder(CABACTestContext *c, uint8_t *buf, int buf_size) +{ + init_put_bits(&c->pb, buf, buf_size); + + c->dec.low = 0; + c->dec.range = 0x1FE; + c->outstanding_count = 0; + c->pb.bit_left++; //avoids firstBitFlag +} + int main(void){ - CABACContext c; + CABACTestContext c; uint8_t b[9*SIZE]; uint8_t r[9*SIZE]; int i, ret = 0; @@ -120,7 +145,7 @@ int main(void){ AVLFG prng; av_lfg_init(&prng, 1); - ff_init_cabac_encoder(&c, b, SIZE); + init_cabac_encoder(&c, b, SIZE); for(i=0; i