From patchwork Thu Jul 13 10:27:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 4316 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp2025993vsb; Thu, 13 Jul 2017 03:34:07 -0700 (PDT) X-Received: by 10.223.143.10 with SMTP id p10mr1158378wrb.120.1499942047145; Thu, 13 Jul 2017 03:34:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499942047; cv=none; d=google.com; s=arc-20160816; b=YhmEeL/51F9D/BQ2UHtFqgg4OgTqxUkTZcfku9rTO/qkl527QOeIGRQMVKfizJ80A2 iXbXOvAEVl7ox4+BUiNlkXkIThQzCPboDZOUPnDRLXUP0PANaDCOg+GABsDUSoSsn+dY KvcFdU6xsv/DDTJIltgQv4dO8lxlYATyX6PQRzEQ4KoG2fym0Jkaw2msXNpn8RDfMPnd MbnqPHmLm8IekwrT/wPnQ3pPWj3D/HfdwhQrYldnIgca8eVecbv5T3MkYGlVrsVfBfR1 tiD4IlQO57X0DBoWPL7lJPKOuaII4a1A8WXixuOwRei5yM4j9nYWCzNG8Wpus8E9JI7d sPWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to:arc-authentication-results; bh=dBxUAf3rJWWPHEgUc+PDi8bnH/+rKf0oBBAGnanX/vE=; b=smiB+HkDAoUtS6sOxnJTY1sKDDiIeQdI3iscqRrJxlWzE5enBNSZ+s7skCVRaX/UC/ 9CRskc0mDlPvwY9WCaQG2sjMfy+HLHhj3Dq5QmthTcR9aM1jsHiTH+vupxHtI52gLFOU sBVurHr3spIYg3ZbfJHZEX3mtzeRP0KyN9eppIimrQThQdowA0fWDzp8sy3QbCTd8lE8 vgcwsoca0vGzgaMrwgMRmyqnJ7KZNHwvmOugI2A5LzZ1J6+azZJk8jVLoITzrG9N/R2F 5gzZmt9Tspkl4h1kGVh+C+oNd6SAI6lcyBoLNscjbTB5GSl2B6ZdHU3eR0PBxPST/L1U tNXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=par/EFm7; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s11si3719987wrb.115.2017.07.13.03.34.06; Thu, 13 Jul 2017 03:34:07 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=par/EFm7; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A279D689BAC; Thu, 13 Jul 2017 13:33:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F0CD6898A8 for ; Thu, 13 Jul 2017 13:33:50 +0300 (EEST) Received: by mail-wr0-f195.google.com with SMTP id 77so8845184wrb.3 for ; Thu, 13 Jul 2017 03:33:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=u14RMBQT55Fy/1myMk86H8ecHS06l2IYAnJ3TDelYmk=; b=par/EFm7q1uanEVFxOVr9MyFQ6Wcku4brG+Y2eFD646CLMPOqIfuA71DUJg+93F+cf VZeDH93DxzExKqS83SEa7vI4T9Ypp+eUlZpQoEDdWB7OUPQaueGGQJLrlEcZKbBr6mWk g+MfmZWpfRRWg6F4hJWPEgGGu2zrz+s40Zds3Lb73grOlC/4UHsRk5LdSTuSF6IhCTm3 bCiz6WD3zdJTPzYY2hxxARIWcHSBz/QRRNriiATQarW/evcNG2+n7KrSfOeMeTWLeipo xVQYIQwecAu6A3E/0qgCoCugYRaFDI4l9MKMW9ahwdicmMKFRPxvdxOmnpFg3KerL6/r QMoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=u14RMBQT55Fy/1myMk86H8ecHS06l2IYAnJ3TDelYmk=; b=FvDP1UwvaE/f/tw/O15JlaSJKmCD4HWtAiZ2RUBnEq81u33XqGIoHikuX0EjMKbKJI xUrF5XwNOCjPbTwu8MjpjGSlWv82INw81F9vuGFLSA+lSMY2yCa7/0JF+kHlwoaomCyi SkbAnNRQSRrNLnBDBtoQd05ASYkDg3T7xGbPzXWabATJsOtMfJs+e4tzRtmX4eWbe1tJ a6HKo3POu+NciSmt48KAusON4olIojtYbJekmjHvr0U+VBhd+aPybU23aTLbhjkZp2+i T/60ARTYpOOVa2V03WcXiYNA4OdrhB/KqkE6v0R29hTmskqxi8BwdEhdNmxrPi3Y08jB eLXw== X-Gm-Message-State: AIVw111aPLpLjb+yTIsEjt3VjCx/n0weIujsPWP78+1tLaEABe87Ti+e TVsdfQcNKCl4mJyE X-Received: by 10.223.164.156 with SMTP id g28mr1137941wrb.105.1499941636588; Thu, 13 Jul 2017 03:27:16 -0700 (PDT) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id 35sm3086533wrp.63.2017.07.13.03.27.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jul 2017 03:27:15 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Jul 2017 12:27:03 +0200 Message-Id: <20170713102703.2354-1-onemda@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170711164016.26688-1-onemda@gmail.com> References: <20170711164016.26688-1-onemda@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/get_bits: add cached bitstream reader 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: Paul B Mahol --- libavcodec/get_bits.h | 263 +++++++++++++++++++++++++++++++++++++++++++++----- libavcodec/golomb.h | 151 +++++++++++++++++++++++++++++ 2 files changed, 388 insertions(+), 26 deletions(-) diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h index c530015..dbacdda 100644 --- a/libavcodec/get_bits.h +++ b/libavcodec/get_bits.h @@ -1,5 +1,6 @@ /* - * copyright (c) 2004 Michael Niedermayer + * Copyright (c) 2004 Michael Niedermayer + * Copyright (c) 2016 Alexandra Hájková * * This file is part of FFmpeg. * @@ -54,6 +55,10 @@ typedef struct GetBitContext { const uint8_t *buffer, *buffer_end; +#ifdef CACHED_BITSTREAM_READER + uint64_t cache; + unsigned bits_left; +#endif int index; int size_in_bits; int size_in_bits_plus8; @@ -106,12 +111,16 @@ typedef struct GetBitContext { * For examples see get_bits, show_bits, skip_bits, get_vlc. */ -#ifdef LONG_BITSTREAM_READER +#ifdef CACHED_BITSTREAM_READER +# define MIN_CACHE_BITS 64 +#elif defined LONG_BITSTREAM_READER # define MIN_CACHE_BITS 32 #else # define MIN_CACHE_BITS 25 #endif +#ifndef CACHED_BITSTREAM_READER + #define OPEN_READER_NOSIZE(name, gb) \ unsigned int name ## _index = (gb)->index; \ unsigned int av_unused name ## _cache @@ -196,20 +205,113 @@ typedef struct GetBitContext { #define GET_CACHE(name, gb) ((uint32_t) name ## _cache) +#endif + static inline int get_bits_count(const GetBitContext *s) { +#ifdef CACHED_BITSTREAM_READER + return s->index - s->bits_left; +#else return s->index; +#endif } -static inline void skip_bits_long(GetBitContext *s, int n) +static inline void refill_32(GetBitContext *s) { -#if UNCHECKED_BITSTREAM_READER - s->index += n; +#ifdef CACHED_BITSTREAM_READER +#if !UNCHECKED_BITSTREAM_READER + if (s->index >> 3 >= s->buffer_end - s->buffer) + return; +#endif + +#ifdef BITSTREAM_READER_LE + s->cache = (uint64_t)AV_RL32(s->buffer + (s->index >> 3)) << s->bits_left | s->cache; #else - s->index += av_clip(n, -s->index, s->size_in_bits_plus8 - s->index); + s->cache = s->cache | (uint64_t)AV_RB32(s->buffer + (s->index >> 3)) << (32 - s->bits_left); +#endif + s->index += 32; + s->bits_left += 32; +#endif +} + +static inline void refill_64(GetBitContext *s) +{ +#ifdef CACHED_BITSTREAM_READER +#if !UNCHECKED_BITSTREAM_READER + if (s->index >> 3 >= s->buffer_end - s->buffer) + return; +#endif + +#ifdef BITSTREAM_READER_LE + s->cache = AV_RL64(s->buffer + (s->index >> 3)); +#else + s->cache = AV_RB64(s->buffer + (s->index >> 3)); +#endif + s->index += 64; + s->bits_left = 64; +#endif +} + +#ifdef CACHED_BITSTREAM_READER +static inline uint64_t get_val(GetBitContext *s, unsigned n) +{ + uint64_t ret; + av_assert2(n>0 && n<=63); +#ifdef BITSTREAM_READER_LE + ret = s->cache & ((UINT64_C(1) << n) - 1); + s->cache >>= n; +#else + ret = s->cache >> (64 - n); + s->cache <<= n; +#endif + s->bits_left -= n; + return ret; +} +#endif + +#ifdef CACHED_BITSTREAM_READER +static inline unsigned show_val(const GetBitContext *s, unsigned n) +{ +#ifdef BITSTREAM_READER_LE + return s->cache & ((UINT64_C(1) << n) - 1); +#else + return s->cache >> (64 - n); +#endif +} +#endif + +/** + * Show 1-25 bits. + */ +static inline unsigned int show_bits(GetBitContext *s, int n) +{ + register int tmp; +#ifdef CACHED_BITSTREAM_READER + if (n > s->bits_left) + refill_32(s); + + tmp = show_val(s, n); +#else + OPEN_READER_NOSIZE(re, s); + av_assert2(n>0 && n<=25); + UPDATE_CACHE(re, s); + tmp = SHOW_UBITS(re, s, n); #endif + return tmp; } +#ifdef CACHED_BITSTREAM_READER +static inline void skip_remaining(GetBitContext *s, unsigned n) +{ +#ifdef BITSTREAM_READER_LE + s->cache >>= n; +#else + s->cache <<= n; +#endif + s->bits_left -= n; +} +#endif + /** * Read MPEG-1 dc-style VLC (sign bit + mantissa with no MSB). * if MSB not set it is negative @@ -217,6 +319,13 @@ static inline void skip_bits_long(GetBitContext *s, int n) */ static inline int get_xbits(GetBitContext *s, int n) { +#ifdef CACHED_BITSTREAM_READER + int32_t cache = show_bits(s, 32); + int sign = ~cache >> 31; + skip_remaining(s, n); + + return ((((uint32_t)(sign ^ cache)) >> (32 - n)) ^ sign) - sign; +#else register int sign; register int32_t cache; OPEN_READER(re, s); @@ -227,8 +336,10 @@ static inline int get_xbits(GetBitContext *s, int n) LAST_SKIP_BITS(re, s, n); CLOSE_READER(re, s); return (NEG_USR32(sign ^ cache, n) ^ sign) - sign; +#endif } +#ifndef CACHED_BITSTREAM_READER static inline int get_xbits_le(GetBitContext *s, int n) { register int sign; @@ -242,31 +353,61 @@ static inline int get_xbits_le(GetBitContext *s, int n) CLOSE_READER(re, s); return (zero_extend(sign ^ cache, n) ^ sign) - sign; } +#endif -static inline int get_sbits(GetBitContext *s, int n) +/** + * Read 1-25 bits. + */ +static inline unsigned int get_bits(GetBitContext *s, int n) { +#ifdef CACHED_BITSTREAM_READER + register int tmp = 0; +#ifdef BITSTREAM_READER_LE + uint64_t left = 0; +#endif + + av_assert2(n>0 && n<=32); + if (n > s->bits_left) { + n -= s->bits_left; +#ifdef BITSTREAM_READER_LE + left = s->bits_left; +#endif + tmp = get_val(s, s->bits_left); + refill_32(s); + } + +#ifdef BITSTREAM_READER_LE + tmp = get_val(s, n) << left | tmp; +#else + tmp = get_val(s, n) | tmp << n; +#endif + +#else register int tmp; OPEN_READER(re, s); av_assert2(n>0 && n<=25); UPDATE_CACHE(re, s); - tmp = SHOW_SBITS(re, s, n); + tmp = SHOW_UBITS(re, s, n); LAST_SKIP_BITS(re, s, n); CLOSE_READER(re, s); +#endif return tmp; } -/** - * Read 1-25 bits. - */ -static inline unsigned int get_bits(GetBitContext *s, int n) +static inline int get_sbits(GetBitContext *s, int n) { register int tmp; +#ifdef CACHED_BITSTREAM_READER + av_assert2(n>0 && n<=25); + tmp = sign_extend(get_bits(s, n), n); +#else OPEN_READER(re, s); av_assert2(n>0 && n<=25); UPDATE_CACHE(re, s); - tmp = SHOW_UBITS(re, s, n); + tmp = SHOW_SBITS(re, s, n); LAST_SKIP_BITS(re, s, n); CLOSE_READER(re, s); +#endif return tmp; } @@ -278,6 +419,7 @@ static av_always_inline int get_bitsz(GetBitContext *s, int n) return n ? get_bits(s, n) : 0; } +#ifndef CACHED_BITSTREAM_READER static inline unsigned int get_bits_le(GetBitContext *s, int n) { register int tmp; @@ -289,29 +431,56 @@ static inline unsigned int get_bits_le(GetBitContext *s, int n) CLOSE_READER(re, s); return tmp; } - -/** - * Show 1-25 bits. - */ -static inline unsigned int show_bits(GetBitContext *s, int n) -{ - register int tmp; - OPEN_READER_NOSIZE(re, s); - av_assert2(n>0 && n<=25); - UPDATE_CACHE(re, s); - tmp = SHOW_UBITS(re, s, n); - return tmp; -} +#endif static inline void skip_bits(GetBitContext *s, int n) { +#ifdef CACHED_BITSTREAM_READER + if (n < s->bits_left) + skip_remaining(s, n); + else { + n -= s->bits_left; + s->cache = 0; + s->bits_left = 0; + + if (n >= 64) { + unsigned skip = (n / 8) * 8; + + n -= skip; + s->index += skip; + } + refill_64(s); + if (n) + skip_remaining(s, n); + } +#else OPEN_READER(re, s); LAST_SKIP_BITS(re, s, n); CLOSE_READER(re, s); +#endif +} + +static inline void skip_bits_long(GetBitContext *s, int n) +{ +#ifdef CACHED_BITSTREAM_READER + skip_bits(s, n); +#else +#if UNCHECKED_BITSTREAM_READER + s->index += n; +#else + s->index += av_clip(n, -s->index, s->size_in_bits_plus8 - s->index); +#endif +#endif } static inline unsigned int get_bits1(GetBitContext *s) { +#ifdef CACHED_BITSTREAM_READER + if (!s->bits_left) + refill_64(s); + + return get_val(s, 1); +#else unsigned int index = s->index; uint8_t result = s->buffer[index >> 3]; #ifdef BITSTREAM_READER_LE @@ -328,6 +497,7 @@ static inline unsigned int get_bits1(GetBitContext *s) s->index = index; return result; +#endif } static inline unsigned int show_bits1(GetBitContext *s) @@ -348,6 +518,10 @@ static inline unsigned int get_bits_long(GetBitContext *s, int n) av_assert2(n>=0 && n<=32); if (!n) { return 0; +#ifdef CACHED_BITSTREAM_READER + } + return get_bits(s, n); +#else } else if (n <= MIN_CACHE_BITS) { return get_bits(s, n); } else { @@ -359,6 +533,7 @@ static inline unsigned int get_bits_long(GetBitContext *s, int n) return ret | get_bits(s, n - 16); #endif } +#endif } /** @@ -442,6 +617,10 @@ static inline int init_get_bits(GetBitContext *s, const uint8_t *buffer, s->buffer_end = buffer + buffer_size; s->index = 0; +#ifdef CACHED_BITSTREAM_READER + refill_64(s); +#endif + return ret; } @@ -543,6 +722,19 @@ static inline const uint8_t *align_get_bits(GetBitContext *s) SKIP_BITS(name, gb, n); \ } while (0) +/* Return the LUT element for the given bitstream configuration. */ +static inline int set_idx(GetBitContext *s, int code, int *n, int *nb_bits, + VLC_TYPE (*table)[2]) +{ + unsigned idx; + + *nb_bits = -*n; + idx = show_bits(s, *nb_bits) + code; + *n = table[idx][1]; + + return table[idx][0]; +} + /** * Parse a vlc code. * @param bits is the number of bits which will be read at once, must be @@ -554,6 +746,24 @@ static inline const uint8_t *align_get_bits(GetBitContext *s) static av_always_inline int get_vlc2(GetBitContext *s, VLC_TYPE (*table)[2], int bits, int max_depth) { +#ifdef CACHED_BITSTREAM_READER + int nb_bits; + unsigned idx = show_bits(s, bits); + int code = table[idx][0]; + int n = table[idx][1]; + + if (max_depth > 1 && n < 0) { + skip_remaining(s, bits); + code = set_idx(s, code, &n, &nb_bits, table); + if (max_depth > 2 && n < 0) { + skip_remaining(s, nb_bits); + code = set_idx(s, code, &n, &nb_bits, table); + } + } + skip_remaining(s, n); + + return code; +#else int code; OPEN_READER(re, s); @@ -564,6 +774,7 @@ static av_always_inline int get_vlc2(GetBitContext *s, VLC_TYPE (*table)[2], CLOSE_READER(re, s); return code; +#endif } static inline int decode012(GetBitContext *gb) diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h index efb1eff..e66675b 100644 --- a/libavcodec/golomb.h +++ b/libavcodec/golomb.h @@ -54,6 +54,23 @@ static inline int get_ue_golomb(GetBitContext *gb) { unsigned int buf; +#ifdef CACHED_BITSTREAM_READER + buf = show_bits_long(gb, 32); + + if (buf >= (1 << 27)) { + buf >>= 32 - 9; + skip_bits_long(gb, ff_golomb_vlc_len[buf]); + + return ff_ue_golomb_vlc_code[buf]; + } else { + int log = 2 * av_log2(buf) - 31; + buf >>= log; + buf--; + skip_bits_long(gb, 32 - log); + + return buf; + } +#else OPEN_READER(re, gb); UPDATE_CACHE(re, gb); buf = GET_CACHE(re, gb); @@ -77,6 +94,7 @@ static inline int get_ue_golomb(GetBitContext *gb) return buf; } +#endif } /** @@ -101,6 +119,13 @@ static inline int get_ue_golomb_31(GetBitContext *gb) { unsigned int buf; +#ifdef CACHED_BITSTREAM_READER + buf = show_bits_long(gb, 32); + + buf >>= 32 - 9; + skip_bits_long(gb, ff_golomb_vlc_len[buf]); +#else + OPEN_READER(re, gb); UPDATE_CACHE(re, gb); buf = GET_CACHE(re, gb); @@ -108,6 +133,7 @@ static inline int get_ue_golomb_31(GetBitContext *gb) buf >>= 32 - 9; LAST_SKIP_BITS(re, gb, ff_golomb_vlc_len[buf]); CLOSE_READER(re, gb); +#endif return ff_ue_golomb_vlc_code[buf]; } @@ -116,6 +142,33 @@ static inline unsigned get_interleaved_ue_golomb(GetBitContext *gb) { uint32_t buf; +#ifdef CACHED_BITSTREAM_READER + buf = show_bits_long(gb, 32); + + if (buf & 0xAA800000) { + buf >>= 32 - 8; + skip_bits_long(gb, ff_interleaved_golomb_vlc_len[buf]); + + return ff_interleaved_ue_golomb_vlc_code[buf]; + } else { + unsigned ret = 1; + + do { + buf >>= 32 - 8; + skip_bits_long(gb, FFMIN(ff_interleaved_golomb_vlc_len[buf], 8)); + + if (ff_interleaved_golomb_vlc_len[buf] != 9) { + ret <<= (ff_interleaved_golomb_vlc_len[buf] - 1) >> 1; + ret |= ff_interleaved_dirac_golomb_vlc_code[buf]; + break; + } + ret = (ret << 4) | ff_interleaved_dirac_golomb_vlc_code[buf]; + buf = show_bits_long(gb, 32); + } while (get_bits_left(gb) > 0); + + return ret - 1; + } +#else OPEN_READER(re, gb); UPDATE_CACHE(re, gb); buf = GET_CACHE(re, gb); @@ -147,6 +200,7 @@ static inline unsigned get_interleaved_ue_golomb(GetBitContext *gb) CLOSE_READER(re, gb); return ret - 1; } +#endif } /** @@ -184,6 +238,28 @@ static inline int get_se_golomb(GetBitContext *gb) { unsigned int buf; +#ifdef CACHED_BITSTREAM_READER + buf = show_bits_long(gb, 32); + + if (buf >= (1 << 27)) { + buf >>= 32 - 9; + skip_bits_long(gb, ff_golomb_vlc_len[buf]); + + return ff_se_golomb_vlc_code[buf]; + } else { + int log = 2 * av_log2(buf) - 31; + buf >>= log; + + skip_bits_long(gb, 32 - log); + + if (buf & 1) + buf = -(buf >> 1); + else + buf = (buf >> 1); + + return buf; + } +#else OPEN_READER(re, gb); UPDATE_CACHE(re, gb); buf = GET_CACHE(re, gb); @@ -210,6 +286,7 @@ static inline int get_se_golomb(GetBitContext *gb) return buf; } +#endif } static inline int get_se_golomb_long(GetBitContext *gb) @@ -223,6 +300,30 @@ static inline int get_interleaved_se_golomb(GetBitContext *gb) { unsigned int buf; +#ifdef CACHED_BITSTREAM_READER + buf = show_bits_long(gb, 32); + + if (buf & 0xAA800000) { + buf >>= 32 - 8; + skip_bits_long(gb, ff_interleaved_golomb_vlc_len[buf]); + + return ff_interleaved_se_golomb_vlc_code[buf]; + } else { + int log; + skip_bits(gb, 8); + buf |= 1 | show_bits_long(gb, 24); + + if ((buf & 0xAAAAAAAA) == 0) + return INVALID_VLC; + + for (log = 31; (buf & 0x80000000) == 0; log--) + buf = (buf << 2) - ((buf << log) >> (log - 1)) + (buf >> 30); + + skip_bits_long(gb, 63 - 2 * log - 8); + + return (signed) (((((buf << log) >> log) - 1) ^ -(buf & 0x1)) + 1) >> 1; + } +#else OPEN_READER(re, gb); UPDATE_CACHE(re, gb); buf = GET_CACHE(re, gb); @@ -250,6 +351,7 @@ static inline int get_interleaved_se_golomb(GetBitContext *gb) return (signed) (((((buf << log) >> log) - 1) ^ -(buf & 0x1)) + 1) >> 1; } +#endif } static inline int dirac_get_se_golomb(GetBitContext *gb) @@ -273,6 +375,24 @@ static inline int get_ur_golomb(GetBitContext *gb, int k, int limit, unsigned int buf; int log; +#ifdef CACHED_BITSTREAM_READER + buf = show_bits_long(gb, 32); + + log = av_log2(buf); + + if (log > 31 - limit) { + buf >>= log - k; + buf += (30 - log) << k; + skip_bits_long(gb, 32 + k - log); + + return buf; + } else { + skip_bits_long(gb, limit); + buf = get_bits_long(gb, esc_len); + + return buf + limit - 1; + } +#else OPEN_READER(re, gb); UPDATE_CACHE(re, gb); buf = GET_CACHE(re, gb); @@ -297,6 +417,7 @@ static inline int get_ur_golomb(GetBitContext *gb, int k, int limit, return buf + limit - 1; } +#endif } /** @@ -308,6 +429,35 @@ static inline int get_ur_golomb_jpegls(GetBitContext *gb, int k, int limit, unsigned int buf; int log; +#ifdef CACHED_BITSTREAM_READER + buf = show_bits_long(gb, 32); + + log = av_log2(buf); + + if (log - k >= 1 && 32 - log < limit) { + buf >>= log - k; + buf += (30 - log) << k; + skip_bits_long(gb, 32 + k - log); + + return buf; + } else { + int i; + for (i = 0; + i < limit && get_bits1(gb) == 0 && get_bits_left(gb) > 0; + i++); + + if (i < limit - 1) { + buf = get_bits_long(gb, k); + + return buf + (i << k); + } else if (i == limit - 1) { + buf = get_bits_long(gb, esc_len); + + return buf + 1; + } else + return -1; + } +#else OPEN_READER(re, gb); UPDATE_CACHE(re, gb); buf = GET_CACHE(re, gb); @@ -364,6 +514,7 @@ static inline int get_ur_golomb_jpegls(GetBitContext *gb, int k, int limit, CLOSE_READER(re, gb); return buf; } +#endif } /**