From patchwork Sun Nov 24 15:45:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 16401 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 5419944A2AE for ; Sun, 24 Nov 2019 17:53:18 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2524568AA3A; Sun, 24 Nov 2019 17:53:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-1.mx.upcmail.net (vie01a-dmta-pe02-1.mx.upcmail.net [62.179.121.157]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 599A168A148 for ; Sun, 24 Nov 2019 17:53:12 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1iYu72-0008Fg-04 for ffmpeg-devel@ffmpeg.org; Sun, 24 Nov 2019 16:47:48 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id Yu63imPiywlysYu64if1pG; Sun, 24 Nov 2019 16:46:48 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=E5OzWpVl c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=WlAEXzm-X-zw6IYKhHIA:9 a=pHzHmUro8NiASowvMSCR:22 a=Ew2E2A-JSTLzCXPT_086:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 24 Nov 2019 16:45:02 +0100 Message-Id: <20191124154506.6257-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 X-CMAE-Envelope: MS4wfEsL0/NRzVfRmG2WyNvIAxXzjz8zgieB62bsSQL1Ml4kZsb5LEodXS7hadIwMVZuBG9rv/DlVWyY8OiaIme0LWBfoEwOH1Y34fAHKi64FLKKNkbqj95x DRxb7PRuK9C3XrBxesTeqIcdZYqxouQ5/kYD+Exa4xPWN1DsurMNjOzj Subject: [FFmpeg-devel] [PATCH 1/5] avcodec: Replace show_bits_long() by show_bits() where possible 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" Signed-off-by: Michael Niedermayer --- libavcodec/golomb.h | 2 +- libavcodec/ivi.c | 2 +- libavcodec/mpeg4audio.c | 2 +- libavcodec/mpeg4videodec.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h index 5cdfa0945d..7fd46a91bd 100644 --- a/libavcodec/golomb.h +++ b/libavcodec/golomb.h @@ -313,7 +313,7 @@ static inline int get_interleaved_se_golomb(GetBitContext *gb) } else { int log; skip_bits(gb, 8); - buf |= 1 | show_bits_long(gb, 24); + buf |= 1 | show_bits(gb, 24); if ((buf & 0xAAAAAAAA) == 0) return INVALID_VLC; diff --git a/libavcodec/ivi.c b/libavcodec/ivi.c index 18192cbf23..93afabeb15 100644 --- a/libavcodec/ivi.c +++ b/libavcodec/ivi.c @@ -1193,7 +1193,7 @@ int ff_ivi_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, left = get_bits_count(&ctx->gb) & 0x18; skip_bits_long(&ctx->gb, 64 - left); if (get_bits_left(&ctx->gb) > 18 && - show_bits_long(&ctx->gb, 21) == 0xBFFF8) { // syncheader + inter type + show_bits(&ctx->gb, 21) == 0xBFFF8) { // syncheader + inter type AVPacket pkt; pkt.data = avpkt->data + (get_bits_count(&ctx->gb) >> 3); pkt.size = get_bits_left(&ctx->gb) >> 3; diff --git a/libavcodec/mpeg4audio.c b/libavcodec/mpeg4audio.c index e4d6716f7f..2d9fe35f69 100644 --- a/libavcodec/mpeg4audio.c +++ b/libavcodec/mpeg4audio.c @@ -118,7 +118,7 @@ int ff_mpeg4audio_get_config_gb(MPEG4AudioConfig *c, GetBitContext *gb, if (c->object_type == AOT_ALS) { skip_bits(gb, 5); - if (show_bits_long(gb, 24) != MKBETAG('\0','A','L','S')) + if (show_bits(gb, 24) != MKBETAG('\0','A','L','S')) skip_bits_long(gb, 24); specific_config_bitindex = get_bits_count(gb); diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 055afabc7e..bf74bd7f09 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -711,7 +711,7 @@ static int mpeg4_decode_partition_a(Mpeg4DecContext *ctx) int i; do { - if (show_bits_long(&s->gb, 19) == DC_MARKER) + if (show_bits(&s->gb, 19) == DC_MARKER) return mb_num - 1; cbpc = get_vlc2(&s->gb, ff_h263_intra_MCBPC_vlc.table, INTRA_MCBPC_VLC_BITS, 2); @@ -1782,7 +1782,7 @@ static void next_start_code_studio(GetBitContext *gb) { align_get_bits(gb); - while (get_bits_left(gb) >= 24 && show_bits_long(gb, 24) != 0x1) { + while (get_bits_left(gb) >= 24 && show_bits(gb, 24) != 0x1) { get_bits(gb, 8); } }