From patchwork Fri Jul 7 18:48:46 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: 4260 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp543892vsb; Fri, 7 Jul 2017 11:49:24 -0700 (PDT) X-Received: by 10.223.135.210 with SMTP id c18mr1598465wrc.109.1499453364890; Fri, 07 Jul 2017 11:49:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499453364; cv=none; d=google.com; s=arc-20160816; b=fRR+IgTUy55EL9OPepSeLEMj3MeoCPOclOhyN8HghGwdMR1k/1W4fekEb+1PQKqShB 91IjgWX8zAT3LUEaMUIstPp4oWUeigWQpC7vXoVE9ir840JFUctmyVSPWeqSzAtWzMHy OxgFmRrjOKVEPCdjemfLQPVXmh6i1D8tUhfcZWRTVGyoztJrD+tRqI55YbeuXAMY3QZV AWBS0VsNjbkQvstIkCxzmLXRjvLfC22qGQLMTVo1yuG5eV4mjX3F5pteZ9KzB7jRut50 /801KRLLE5Giw9jpUAA7P/gofxi9najEDEPRENlkaYYJr+IDO12siOk/YtBilyCBflOw JZBw== 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:message-id:date:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=rYXp2hhXXqfyBlyrkuqoqigvwVKbaPsFTFDXziQlmLg=; b=zhJ/sofZCHAo+X7/S3zRjCtMKPwf2GOkMjpVgDX2mr8cUk+5OPfHwe8EwEAXkMV2J4 gQqwMuP5h3xeW+aN2TkywD/I8aqnJ8S5m/zI1W7HIyuO4OiRJImnNx43NkmfpYGl3vIh bbVcq2NzveBCwcNegeSnydQ1No1FjoSv11FCPdQNYQ0unU47fVitCh2/4RAn+IZ9KW6L VPVK1BqngRJsXI+0AvLdqx4PyjC+4J812qCiKRFSjBNQokkwJ13Jn3HzrwcjogfLvuI1 CcaN/LxcKB3zQ4xuwbEXEOiU6K5uFDzj8jzk66c3kZsanWBqF+nzqYxJ4WVIiUncc4Ty ZIDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=cm8Q/8Xz; 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 d3si135660wmc.114.2017.07.07.11.49.12; Fri, 07 Jul 2017 11:49:24 -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=cm8Q/8Xz; 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 087D2689AD6; Fri, 7 Jul 2017 21:49:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DB138689A87 for ; Fri, 7 Jul 2017 21:48:59 +0300 (EEST) Received: by mail-wr0-f193.google.com with SMTP id x23so9531506wrb.0 for ; Fri, 07 Jul 2017 11:49:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=dSXna5gjf4xTtTQCJKGPudEFKqdf7P9z3PcnGMFUykQ=; b=cm8Q/8XzOVhiqOy/w+fYGkZ9GLUaBpWfx6A5/Jbt1+P0oWC26M+ez5Qm5tCVkFhtlG LPQzxeJjKgZDOsbCX8lVVDG43xrlqFrkv64g/6n/tnEjwA8+Zix7xQ9K+2CT0TsezxkN eegy0dXOxwxV28DDfVHBtL0Ra3iqO4gVWnfPZ5tuTul4n+FtAKo7dJB9rfZ5T73oX6AI dx+xD/wgkZW2D0/55SS5YxWZvcrIsdXJz5aOaPOxuP5s9Htktmky/hmXc23GbyvYZ462 q5apuEc60EuijwfK4LOLywxHnZcWKXERVfXksdQsRKEglpKRbW6/SCJmkW8G1KfgSNUx HZYQ== 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:mime-version :content-transfer-encoding; bh=dSXna5gjf4xTtTQCJKGPudEFKqdf7P9z3PcnGMFUykQ=; b=HWg9yNP69hUe9vzwGSmTpd5aJ5zqbESppY3n7YndRnASHDieVadk86ui4b0S8OOUAS jj3ma//ULXhzH8AMeqyChVmjAAqihRCNoAyDydqIbcQn7WXwcTjqFVMWrI74ORloouo0 XWOISNpqaud1o0fbVcw8XX/ZCo72+DHJx8QK5NmM76n4LnLjC5VOfKhBkMze8oXzt5Lz m8GcKc1ZWuGwKmJuemQQ+Pn6V68NReZgxG+C2ivrwvDAJ/mH4oUC4NLfkwp5i6Jit1NH C375gXmhQjLUnvJ17tCTmlnzAeJ+K3Fjd9PQGIrDFg3R47UakQ9JmKAQ2V619qf25xXx tz1w== X-Gm-Message-State: AIVw113d76fSD48OC344r7EPv3LZTIJ3oJ7aphCQjHJhAERdo7DxAaOG bcGw09CW9oAR34g5 X-Received: by 10.28.180.70 with SMTP id d67mr155672wmf.121.1499453342308; Fri, 07 Jul 2017 11:49:02 -0700 (PDT) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id i67sm2869790wri.61.2017.07.07.11.49.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Jul 2017 11:49:01 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 Jul 2017 20:48:46 +0200 Message-Id: <20170707184848.20864-1-onemda@gmail.com> X-Mailer: git-send-email 2.9.3 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 | 205 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 196 insertions(+), 9 deletions(-) diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h index c530015..8a9021a 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,7 +111,9 @@ 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 @@ -198,7 +205,11 @@ typedef struct GetBitContext { 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) @@ -210,6 +221,68 @@ static inline void skip_bits_long(GetBitContext *s, int n) #endif } +static inline void refill_32(GetBitContext *s) +{ +#ifdef CACHED_BITSTREAM_READER + if (s->buffer + (s->index >> 3) >= s->buffer_end) + return; + +#ifdef BITSTREAM_READER_LE + s->cache = (uint64_t)AV_RL32(s->buffer + (s->index >> 3)) << s->cache | s->cache; +#else + 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->buffer + (s->index >> 3) >= s->buffer_end) + 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 + /** * Read MPEG-1 dc-style VLC (sign bit + mantissa with no MSB). * if MSB not set it is negative @@ -243,30 +316,59 @@ static inline int get_xbits_le(GetBitContext *s, int n) return (zero_extend(sign ^ cache, n) ^ sign) - sign; } -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; } @@ -296,22 +398,65 @@ static inline unsigned int get_bits_le(GetBitContext *s, int n) 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 + 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; + skip_remaining(s, s->bits_left); + if (n >= 64) { + unsigned skip = n; + + n -= skip; + s->index += skip; + } + refill_32(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 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 +473,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 +494,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 +509,7 @@ static inline unsigned int get_bits_long(GetBitContext *s, int n) return ret | get_bits(s, n - 16); #endif } +#endif } /** @@ -442,6 +593,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 +698,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 +722,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 +750,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)