From patchwork Tue May 26 14:13:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Dekker X-Patchwork-Id: 19875 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 816F344B617 for ; Tue, 26 May 2020 17:14:04 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5425E6891E5; Tue, 26 May 2020 17:14:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 24B10687F6C for ; Tue, 26 May 2020 17:13:57 +0300 (EEST) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.west.internal (Postfix) with ESMTP id C0CA52CA for ; Tue, 26 May 2020 10:13:54 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Tue, 26 May 2020 10:13:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=itanimul.li; h= from:to:subject:date:message-id:mime-version :content-transfer-encoding; s=fm2; bh=vb2niuqYBgsEFw1q8BBsiCENtN 30Uksdy20c0dg01e8=; b=qDjRFg4RdQveUu1RofFOiG31mcoQ8R+oDHqCl9BbOl YnB+Bgd1nA24CUtqT9bL1rnoV0bZZ57vVvjo08blCESsvFuvj6Ryrj+eQkCCASx1 6pVfmdNeB90maRwH+4MqldVpIWpPcLWE9qrkLjp9eSCnQ9d61E6msvbTinlv1SFZ +xYLm2+waF1e299QyRX8XwTNEv9SNVSexwYkP5WQL2/MXCOEs/hVn29Zwzj6awZu LrVPFE3n1kra4p9Z4BaMO1A+U6zFu1VbWCa7zczql+tCQZ7Mr5rQfG6B4MvsLTao ovi71zN2EuWoirvmnwNCSZKB5Y7krwWxKBVMPA/OXLTw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=vb2niuqYBgsEFw1q8 BBsiCENtN30Uksdy20c0dg01e8=; b=vvG/dK2K6e9CMKrfbxbb3y951ZQiTTp8H ovIO7Dq8ZaQITKIVprlAGS8gLtWusy9S9C6c3tmAXa2Xv+8Z6OcXkMnOrmMIPRRH ycpUQGMMieFDElBtCOyCI+yWv0QyUQksQZOvMKyI8d+C/NV0PlxDfwTKRh1+Qjg+ l1x09Y0N/mUVHdzb2ltmkrVzPtD4wJZ1ks2gf1ZidIhUYJfOc7j8ITxtKsrZ3DMf 9EWUX/ibK36ozKs6fWtwlO6xC4CG3bKajl/AzaMmNBvr5WPzJosb5Q9QyZAKNl1Z +KvIzwH7be1DnBgHD2e8TX2XQsOO4cg47x+47ocaICGartWOF/R+g== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedruddvvddgjeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgggfestdekredtre dttdenucfhrhhomheplfhoshhhucguvgcumfhotghkuceojhhoshhhsehithgrnhhimhhu lhdrlhhiqeenucggtffrrghtthgvrhhnpedufeehffehheeuhfdvueethfeuieeufffgie fgudetlefhgeethefgfefgtdehudenucfkphepkedurddutdegrdejkedrudehudenucev lhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehjohhshhesih htrghnihhmuhhlrdhlih X-ME-Proxy: Received: from localhost.localdomain (cpc107625-sotn16-2-0-cust150.15-1.cable.virginm.net [81.104.78.151]) by mail.messagingengine.com (Postfix) with ESMTPA id 9E5433280064 for ; Tue, 26 May 2020 10:13:53 -0400 (EDT) From: Josh de Kock To: ffmpeg-devel@ffmpeg.org Date: Tue, 26 May 2020 15:13:51 +0100 Message-Id: <20200526141351.14348-1-josh@itanimul.li> X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc/h264_cavlc: use inline function get_bits API 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" To prepare for using the cached bitstream reader, which only defines the inline functions rather than the macros, with CAVLC decoding. Signed-off-by: Josh de Kock --- libavcodec/h264_cavlc.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c index 6481992e58..c1ecaea1ba 100644 --- a/libavcodec/h264_cavlc.c +++ b/libavcodec/h264_cavlc.c @@ -414,19 +414,12 @@ av_cold void ff_h264_decode_init_vlc(void){ } static inline int get_level_prefix(GetBitContext *gb){ - unsigned int buf; int log; - OPEN_READER(re, gb); - UPDATE_CACHE(re, gb); - buf=GET_CACHE(re, gb); + log = 16 - av_log2_16bit(show_bits(gb, 16)); + skip_bits(gb, log); - log= 32 - av_log2(buf); - - LAST_SKIP_BITS(re, gb, log); - CLOSE_READER(re, gb); - - return log-1; + return log - 1; } /**