From patchwork Sun Jan 8 13:14:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Steinar H. Gunderson" X-Patchwork-Id: 2100 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp6675454vsb; Sun, 8 Jan 2017 05:34:48 -0800 (PST) X-Received: by 10.194.31.227 with SMTP id d3mr2477348wji.203.1483882488162; Sun, 08 Jan 2017 05:34:48 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id j133si7680677wma.62.2017.01.08.05.34.47; Sun, 08 Jan 2017 05:34:48 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2ED8268A4E7; Sun, 8 Jan 2017 15:34:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from cassarossa.samfundet.no (cassarossa.samfundet.no [193.35.52.29]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A25F6689E51 for ; Sun, 8 Jan 2017 15:34:32 +0200 (EET) Received: from pannekake.samfundet.no ([2001:67c:29f4::50] ident=unknown) by cassarossa.samfundet.no with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <33cd6a5e89d83a5ddd3829674a155030f82b2b3d@pannekake.samfundet.no>) id 1cQDcM-0000DL-Cv for ffmpeg-devel@ffmpeg.org; Sun, 08 Jan 2017 14:34:38 +0100 Received: from sesse by pannekake.samfundet.no with local (Exim 4.84_2) (envelope-from <33cd6a5e89d83a5ddd3829674a155030f82b2b3d@pannekake.samfundet.no>) id 1cQDcM-0007Mm-8N for ffmpeg-devel@ffmpeg.org; Sun, 08 Jan 2017 14:34:38 +0100 From: "Steinar H. Gunderson" Date: Sun, 8 Jan 2017 14:14:54 +0100 To: ffmpeg-devel@ffmpeg.org Message-Id: Subject: [FFmpeg-devel] [PATCH v2 1/2] Move bitswap_32() into a header file. 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Allows more codecs than mpeg12video to make use of it. Rename to av_bitswap_32() because it's a public symbol now. --- libavcodec/bitstream.c | 14 +++----------- libavcodec/mathops.h | 8 ++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c index 6c8dca1d85..5d37430540 100644 --- a/libavcodec/bitstream.c +++ b/libavcodec/bitstream.c @@ -128,14 +128,6 @@ static int alloc_table(VLC *vlc, int size, int use_static) return index; } -static av_always_inline uint32_t bitswap_32(uint32_t x) -{ - return (uint32_t)ff_reverse[ x & 0xFF] << 24 | - (uint32_t)ff_reverse[(x >> 8) & 0xFF] << 16 | - (uint32_t)ff_reverse[(x >> 16) & 0xFF] << 8 | - (uint32_t)ff_reverse[ x >> 24]; -} - typedef struct VLCcode { uint8_t bits; uint16_t symbol; @@ -192,7 +184,7 @@ static int build_table(VLC *vlc, int table_nb_bits, int nb_codes, nb = 1 << (table_nb_bits - n); inc = 1; if (flags & INIT_VLC_LE) { - j = bitswap_32(code); + j = av_bitswap_32(code); inc = 1 << n; } for (k = 0; k < nb; k++) { @@ -225,7 +217,7 @@ static int build_table(VLC *vlc, int table_nb_bits, int nb_codes, subtable_bits = FFMAX(subtable_bits, n); } subtable_bits = FFMIN(subtable_bits, table_nb_bits); - j = (flags & INIT_VLC_LE) ? bitswap_32(code_prefix) >> (32 - table_nb_bits) : code_prefix; + j = (flags & INIT_VLC_LE) ? av_bitswap_32(code_prefix) >> (32 - table_nb_bits) : code_prefix; table[j][1] = -subtable_bits; ff_dlog(NULL, "%4x: n=%d (subtable)\n", j, codes[i].bits + table_nb_bits); @@ -325,7 +317,7 @@ int ff_init_vlc_sparse(VLC *vlc_arg, int nb_bits, int nb_codes, return -1; \ } \ if (flags & INIT_VLC_LE) \ - buf[j].code = bitswap_32(buf[j].code); \ + buf[j].code = av_bitswap_32(buf[j].code); \ else \ buf[j].code <<= 32 - buf[j].bits; \ if (symbols) \ diff --git a/libavcodec/mathops.h b/libavcodec/mathops.h index 5168dc2ce0..65dc8f21f1 100644 --- a/libavcodec/mathops.h +++ b/libavcodec/mathops.h @@ -249,4 +249,12 @@ static inline int8_t ff_u8_to_s8(uint8_t a) return b.s8; } +static av_always_inline uint32_t av_bitswap_32(uint32_t x) +{ + return (uint32_t)ff_reverse[ x & 0xFF] << 24 | + (uint32_t)ff_reverse[(x >> 8) & 0xFF] << 16 | + (uint32_t)ff_reverse[(x >> 16) & 0xFF] << 8 | + (uint32_t)ff_reverse[ x >> 24]; +} + #endif /* AVCODEC_MATHOPS_H */