From patchwork Sun Jan 27 00:44:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 11868 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 A7AC444E3EA for ; Sun, 27 Jan 2019 02:45:23 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C31F968AEB7; Sun, 27 Jan 2019 02:45:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe02-2.mx.upcmail.net (vie01a-qmta-pe02-2.mx.upcmail.net [62.179.121.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A3A3E68AEAA for ; Sun, 27 Jan 2019 02:45:05 +0200 (EET) Received: from [172.31.218.54] (helo=vie01a-dmta-pe08-3.mx.upcmail.net) by vie01a-pqmta-pe02.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1gnYZg-0004h6-LJ for ffmpeg-devel@ffmpeg.org; Sun, 27 Jan 2019 01:45:24 +0100 Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe08.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1gnYZb-0001Vb-0x for ffmpeg-devel@ffmpeg.org; Sun, 27 Jan 2019 01:45:19 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id nYYdg2QRJ2WSsnYYdgeY8h; Sun, 27 Jan 2019 01:44:19 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.41.20 X-CNFS-Analysis: v=2.3 cv=E7kcWpVl c=1 sm=1 tr=0 a=I1eytVlZLDX1BM2VTtTtSw==:117 a=I1eytVlZLDX1BM2VTtTtSw==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=yC3dFxi08G2djq-gF7QA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 27 Jan 2019 01:44:14 +0100 Message-Id: <20190127004414.12662-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190127004414.12662-1-michael@niedermayer.cc> References: <20190127004414.12662-1-michael@niedermayer.cc> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfG/MYAjS3bCAR4E/fiGr2WZWotgfhzUH6+l1gcx58HkWx+1vQaAyzU5SmF9VV6NR8YqdU+egRpCnbiWigOaYj35/qeLruh27KlUKnwxEWoVgYNFWOFDN sVv6cMQYnVGY4IcT8HpJcO0CspT3JzSBsP/Xl10TmNZkt7lajxTUxf5/ Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/ffv1: Simplify update_vlc_state() 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" About 0.5% faster Signed-off-by: Michael Niedermayer --- libavcodec/ffv1.h | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/libavcodec/ffv1.h b/libavcodec/ffv1.h index 7c29d01f51..f0bb19350a 100644 --- a/libavcodec/ffv1.h +++ b/libavcodec/ffv1.h @@ -174,19 +174,13 @@ static inline void update_vlc_state(VlcState *const state, const int v) count++; if (drift <= -count) { - if (state->bias > -128) - state->bias--; + state->bias = FFMAX(state->bias - 1, -128); - drift += count; - if (drift <= -count) - drift = -count + 1; + drift = FFMAX(drift + count, -count + 1); } else if (drift > 0) { - if (state->bias < 127) - state->bias++; + state->bias = FFMIN(state->bias + 1, 127); - drift -= count; - if (drift > 0) - drift = 0; + drift = FFMIN(drift - count, 0); } state->drift = drift;