From patchwork Sat Oct 10 04:57:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22827 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 4DFB44494F4 for ; Sat, 10 Oct 2020 07:57:20 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2953A68BA32; Sat, 10 Oct 2020 07:57:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f66.google.com (mail-ej1-f66.google.com [209.85.218.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D915F68BA07 for ; Sat, 10 Oct 2020 07:57:13 +0300 (EEST) Received: by mail-ej1-f66.google.com with SMTP id x7so5873922eje.8 for ; Fri, 09 Oct 2020 21:57:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=9PFpIw7mbjSNzLKIDTey9E9HCcLjDQooGX8QKzviKGo=; b=iXJzRY369hT0F1v+EGVp0RB7TrxSxH+Lzc+61U/k0iqEW/Kq+h9s4GXbdVD079gv/r C0/QTqOu49lLBuuOgbZMNqqh/AOJoNJRTYh7JuHzOuRDkEhzFC+q9w3uxyQSWOzAXsro YTDotaps7YT+FSHycfh/R+L6XZXj7NyHyuU8r8Aeh5zrRPBKD/AP8pU6Rhyx0okI/u9q Xu4XsQGGDbG7fl22ZIFpVu4lse1fD3cX3sPhFXIs5hoxGDJ7yWk+M2BFxPcX7Vd4+Kj5 uWUktW8SMTerWRPCoTZBGceQvwV0px7PsnsKYsY0eNq6dJMGyoZ4yejMIHfI6JH4aoKs SgjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=9PFpIw7mbjSNzLKIDTey9E9HCcLjDQooGX8QKzviKGo=; b=jQn+PZIbWtk73WTy3y69tbT/KVrJAWQvkZYm/OJulqTVDSpI7V+R+phpwiXSq1HDV9 GvKKaInvenC/Xe/H7DqXbhUd09hIjzggbxNOTdtDckunXYZGU9/l2Ttz6dgB+hI59inT T22XYQkpedI7OuRmIt5awWt7BqUeUSmwLOQkoBFgQKCeLllaOs1Lpwd1bEaKr6KfWS1N BdE+vVG8Lqn9WBHYhxsbW4+Jyo2xTXSXk7+qqP5zKx+vGmVdkr2S2ZtY2QOo3nF+VPFF jW1JuO7E1Omb14y78y1e8IbD+jFDjCOEAfymYed6pe1ucUSG7sEa8Wd7KmkkGtOXhCxw wXzw== X-Gm-Message-State: AOAM530idrzIqw3WlHVt0KEa4catfaIEb2Y6nCLsqDadJLMOSjgvMHZY ncMAoftYCwf4lLDC5cwEDYeT9QbUDsY= X-Google-Smtp-Source: ABdhPJxG1MR1t1qDSfsJAKPiC+Cmilc7DeuVeEJYtg5k7jT61IVsSbDoJdek3XoaNj1BrwXFXhHvtg== X-Received: by 2002:a17:906:e116:: with SMTP id gj22mr18488708ejb.313.1602305832938; Fri, 09 Oct 2020 21:57:12 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id t7sm1121339edj.45.2020.10.09.21.57.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Oct 2020 21:57:12 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 10 Oct 2020 06:57:03 +0200 Message-Id: <20201010045704.759353-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/sheervideo: Improve creating VLC tables 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Don't needlessly copy an array around; don't create a table with default symbols; and use smaller types to save stack space: The longest code here is 16 bits, so one can store the codes in this type. Signed-off-by: Andreas Rheinhardt --- libavcodec/sheervideo.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/libavcodec/sheervideo.c b/libavcodec/sheervideo.c index ba9aecbb11..3f9b299a1e 100644 --- a/libavcodec/sheervideo.c +++ b/libavcodec/sheervideo.c @@ -1782,25 +1782,20 @@ static void decode_rgb(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) static int build_vlc(VLC *vlc, const uint8_t *len, int count) { - uint32_t codes[1024]; - uint8_t bits[1024]; - uint16_t syms[1024]; - uint64_t index; + uint16_t codes[1024]; + unsigned index; int i; index = 0; for (i = 0; i < count; i++) { - codes[i] = index >> (32 - len[i]); - bits[i] = len[i]; - syms[i] = i; - index += 1ULL << (32 - len[i]); + codes[i] = index >> (32 - len[i]); + index += 1U << (32 - len[i]); } ff_free_vlc(vlc); - return ff_init_vlc_sparse(vlc, 12, count, - bits, sizeof(*bits), sizeof(*bits), - codes, sizeof(*codes), sizeof(*codes), - syms, sizeof(*syms), sizeof(*syms), 0); + return init_vlc(vlc, 12, count, + len, sizeof(*len), sizeof(*len), + codes, sizeof(*codes), sizeof(*codes), 0); } static int decode_frame(AVCodecContext *avctx, From patchwork Sat Oct 10 04:57:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22828 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 4A4F54494F4 for ; Sat, 10 Oct 2020 07:57:41 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3740068BA47; Sat, 10 Oct 2020 07:57:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f68.google.com (mail-ej1-f68.google.com [209.85.218.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 61C2068BA20 for ; Sat, 10 Oct 2020 07:57:34 +0300 (EEST) Received: by mail-ej1-f68.google.com with SMTP id h24so15992095ejg.9 for ; Fri, 09 Oct 2020 21:57:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=seuPXYcmxV7Pf++snHNNxTseHJUbsLf57ksGWGISfgc=; b=DRPQM7jQCSGVObB08hUjGs2tsKzG8Kf+pegVs3qRpI2P5R6VfTUw4cJ00jD6X/iTec KxtHjSy+0xkMIexHYCIvv7N+EFUijKYwdwwC17/CbuZUUBUXOL5RkNyxLnGY6hBdnH3Q ktIEl4xc8V6HSE5dJYvqaNYPTBj3hklkubQnarcKhnN62q0KcOYecVaXRzeYjZTg2cMG g2mhTuJwAaO6/hctfZ+wvEJnF/pEziEabtUVCLoHsqcmEmWZURTROiVDuumI6+uxNcNr xUjtyOaQCyDUckYePAmFMRDeGRtBEkwuWmqC7/3DlCihJT/8cb+OAT4lVNUi5P/PIc8F 004Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=seuPXYcmxV7Pf++snHNNxTseHJUbsLf57ksGWGISfgc=; b=ihmnIS5fFc3/WU/C+FEs/UoxNiWvQo+S655NOWiwEVCb0l5l1GhDkyw4OFraaqMEsf +0kk6rEe4CY1mFeeAFXm7N5Pq++aLx2Fjxa36rr2yAXdGSdp6JE6hVLZWzIjBVNcxqis UgAnw3u9XiUXKqk+1/rcfJwmmYR9HliqP7PniDNch1GUIg9bSTmrk7XKhQOGn2g73fRg pkMI6PxRXIqdzlhF+J1g3goxJ6xGgiXp8YRvaQkH9bVxNh+6rkx/w0RdmiVT+VA4jqR4 YMHXvFxrBzi0FmasGoEv29SW8J4kZ96ksmES7Epi2Ffdt02EHWxTpgPq05CUOWu9gK9Z 8P1A== X-Gm-Message-State: AOAM533zM+BYL6pHFKQvWx0050EpuIKNLDojskj5vCBFMXhDxNnZx6Mp CPm6FU5WOqMFQR+RK/6BbTesmLbyIDg= X-Google-Smtp-Source: ABdhPJz3w7IS7UaN/b4i7OxgKDz9oMNEadJTqh5YxBetWnw5AUlm0Ze/Oi/9Ma2aelRhRa6huYqFmQ== X-Received: by 2002:a17:906:86c3:: with SMTP id j3mr18245386ejy.493.1602305852797; Fri, 09 Oct 2020 21:57:32 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id t7sm1121339edj.45.2020.10.09.21.57.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Oct 2020 21:57:32 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 10 Oct 2020 06:57:04 +0200 Message-Id: <20201010045704.759353-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201010045704.759353-1-andreas.rheinhardt@gmail.com> References: <20201010045704.759353-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/sheervideo: Inline compile-time constants 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavcodec/sheervideo.c | 343 ++++++++++++++++++++-------------------- 1 file changed, 172 insertions(+), 171 deletions(-) diff --git a/libavcodec/sheervideo.c b/libavcodec/sheervideo.c index 3f9b299a1e..e1a203d361 100644 --- a/libavcodec/sheervideo.c +++ b/libavcodec/sheervideo.c @@ -24,6 +24,7 @@ #include #define CACHED_BITSTREAM_READER !ARCH_X86_32 +#define SHEER_VLC_BITS 12 #include "libavutil/intreadwrite.h" #include "avcodec.h" @@ -64,10 +65,10 @@ static void decode_ca4i(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) for (x = 0; x < avctx->width; x++) { int y, u, v, a; - a = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - y = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - u = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - v = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + a = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + y = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + u = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + v = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst_a[x] = pred[3] = (a + pred[3]) & 0x3ff; dst_y[x] = pred[0] = (y + pred[0]) & 0x3ff; @@ -107,10 +108,10 @@ static void decode_ca4p(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) for (x = 0; x < avctx->width; x++) { int y, u, v, a; - a = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - y = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - u = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - v = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + a = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + y = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + u = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + v = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst_a[x] = pred[3] = (a + pred[3]) & 0x3ff; dst_y[x] = pred[0] = (y + pred[0]) & 0x3ff; @@ -147,10 +148,10 @@ static void decode_ca4p(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) pred_T[2] = dst_v[-p->linesize[2] / 2 + x]; pred_T[3] = dst_a[-p->linesize[3] / 2 + x]; - a = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - y = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - u = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - v = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + a = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + y = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + u = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + v = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst_a[x] = pred_L[3] = (a + ((3 * (pred_T[3] + pred_L[3]) - 2 * pred_TL[3]) >> 2)) & 0x3ff; dst_y[x] = pred_L[0] = (y + ((3 * (pred_T[0] + pred_L[0]) - 2 * pred_TL[0]) >> 2)) & 0x3ff; @@ -194,9 +195,9 @@ static void decode_ybr10i(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) for (x = 0; x < avctx->width; x++) { int y, u, v; - y = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - u = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - v = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + y = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + u = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + v = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst_y[x] = pred[0] = (y + pred[0]) & 0x3ff; dst_u[x] = pred[1] = (u + pred[1]) & 0x3ff; @@ -232,9 +233,9 @@ static void decode_ybr10(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) for (x = 0; x < avctx->width; x++) { int y, u, v; - y = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - u = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - v = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + y = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + u = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + v = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst_y[x] = pred[0] = (y + pred[0]) & 0x3ff; dst_u[x] = pred[1] = (u + pred[1]) & 0x3ff; @@ -266,9 +267,9 @@ static void decode_ybr10(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) pred_T[1] = dst_u[-p->linesize[1] / 2 + x]; pred_T[2] = dst_v[-p->linesize[2] / 2 + x]; - y = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - u = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - v = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + y = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + u = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + v = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst_y[x] = pred_L[0] = (y + ((3 * (pred_T[0] + pred_L[0]) - 2 * pred_TL[0]) >> 2)) & 0x3ff; dst_u[x] = pred_L[1] = (u + ((3 * (pred_T[1] + pred_L[1]) - 2 * pred_TL[1]) >> 2)) & 0x3ff; @@ -310,10 +311,10 @@ static void decode_yry10i(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) for (x = 0; x < avctx->width; x += 2) { int y1, y2, u, v; - y1 = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - u = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - y2 = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - v = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + y1 = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + u = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + y2 = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + v = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst_y[x ] = pred[0] = (y1 + pred[0]) & 0x3ff; dst_u[x / 2] = pred[1] = (u + pred[1]) & 0x3ff; @@ -351,10 +352,10 @@ static void decode_yry10(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) for (x = 0; x < avctx->width; x += 2) { int y1, y2, u, v; - y1 = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - u = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - y2 = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - v = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + y1 = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + u = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + y2 = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + v = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst_y[x ] = pred[0] = (y1 + pred[0]) & 0x3ff; dst_u[x / 2] = pred[1] = (u + pred[1]) & 0x3ff; @@ -389,10 +390,10 @@ static void decode_yry10(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) pred_T[1] = dst_u[-p->linesize[1] / 2 + x / 2]; pred_T[2] = dst_v[-p->linesize[2] / 2 + x / 2]; - y1 = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - u = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - y2 = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - v = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + y1 = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + u = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + y2 = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + v = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst_y[x ] = pred_L[0] = (y1 + ((3 * (pred_T[0] + pred_L[0]) - 2 * pred_TL[0]) >> 2)) & 0x3ff; dst_u[x / 2] = pred_L[1] = (u + (((pred_L[1] - pred_TL[1]) >> 1) + pred_T[1])) & 0x3ff; @@ -438,12 +439,12 @@ static void decode_ca2i(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) for (x = 0; x < avctx->width; x += 2) { int y1, y2, u, v, a1, a2; - a1 = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - y1 = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - u = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - a2 = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - y2 = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - v = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + a1 = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + y1 = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + u = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + a2 = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + y2 = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + v = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst_y[x ] = pred[0] = (y1 + pred[0]) & 0x3ff; dst_u[x / 2] = pred[1] = (u + pred[1]) & 0x3ff; @@ -487,12 +488,12 @@ static void decode_ca2p(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) for (x = 0; x < avctx->width; x += 2) { int y1, y2, u, v, a1, a2; - a1 = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - y1 = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - u = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - a2 = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - y2 = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - v = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + a1 = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + y1 = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + u = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + a2 = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + y2 = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + v = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst_y[x ] = pred[0] = (y1 + pred[0]) & 0x3ff; dst_u[x / 2] = pred[1] = (u + pred[1]) & 0x3ff; @@ -535,12 +536,12 @@ static void decode_ca2p(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) pred_T[4] = dst_a[-p->linesize[3] / 2 + x]; pred_T[5] = dst_a[-p->linesize[3] / 2 + x + 1]; - a1 = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - y1 = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - u = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - a2 = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - y2 = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - v = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + a1 = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + y1 = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + u = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + a2 = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + y2 = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + v = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst_y[x ] = pred_L[0] = (y1 + ((3 * (pred_T[0] + pred_L[0]) - 2 * pred_TL[0]) >> 2)) & 0x3ff; dst_u[x / 2] = pred_L[1] = (u + (((pred_L[1] - pred_TL[1]) >> 1) + pred_T[1])) & 0x3ff; @@ -590,12 +591,12 @@ static void decode_c82i(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) for (x = 0; x < avctx->width; x += 2) { int y1, y2, u, v, a1, a2; - a1 = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - y1 = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - u = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - a2 = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - y2 = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - v = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + a1 = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + y1 = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + u = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + a2 = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + y2 = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + v = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst_y[x ] = pred[0] = (y1 + pred[0]) & 0xff; dst_y[x + 1] = pred[0] = (y2 + pred[0]) & 0xff; @@ -639,12 +640,12 @@ static void decode_c82p(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) for (x = 0; x < avctx->width; x += 2) { int y1, y2, u, v, a1, a2; - a1 = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - y1 = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - u = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - a2 = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - y2 = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - v = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + a1 = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + y1 = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + u = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + a2 = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + y2 = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + v = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst_y[x ] = pred[0] = (y1 + pred[0]) & 0xff; dst_u[x / 2] = pred[1] = (u + pred[1]) & 0xff; @@ -687,12 +688,12 @@ static void decode_c82p(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) pred_T[4] = dst_a[-p->linesize[3] + x]; pred_T[5] = dst_a[-p->linesize[3] + x + 1]; - a1 = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - y1 = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - u = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - a2 = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - y2 = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - v = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + a1 = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + y1 = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + u = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + a2 = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + y2 = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + v = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst_y[x ] = pred_L[0] = (y1 + ((3 * (pred_T[0] + pred_L[0]) - 2 * pred_TL[0]) >> 2)) & 0xff; dst_u[x / 2] = pred_L[1] = (u + (((pred_L[1] - pred_TL[1]) >> 1) + pred_T[1])) & 0xff; @@ -738,10 +739,10 @@ static void decode_ybyr(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) for (x = 0; x < avctx->width; x += 2) { int y1, y2, u, v; - y1 = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - u = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - y2 = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - v = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + y1 = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + u = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + y2 = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + v = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst_y[x ] = pred[0] = (y1 + pred[0]) & 0xff; dst_u[x / 2] = pred[1] = (u + pred[1]) & 0xff; @@ -776,10 +777,10 @@ static void decode_ybyr(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) pred_T[1] = dst_u[-p->linesize[1] + x / 2]; pred_T[2] = dst_v[-p->linesize[2] + x / 2]; - y1 = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - u = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - y2 = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - v = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + y1 = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + u = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + y2 = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + v = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst_y[x ] = pred_L[0] = (y1 + ((3 * (pred_T[0] + pred_L[0]) - 2 * pred_TL[0]) >> 2)) & 0xff; dst_u[x / 2] = pred_L[1] = (u + (((pred_L[1] - pred_TL[1]) >> 1) + pred_T[1])) & 0xff; @@ -821,10 +822,10 @@ static void decode_byryi(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) for (x = 0; x < avctx->width; x += 2) { int y1, y2, u, v; - y1 = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - u = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - y2 = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - v = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + y1 = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + u = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + y2 = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + v = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst_y[x ] = pred[0] = (y1 + pred[0]) & 0xff; dst_u[x / 2] = pred[1] = (u + pred[1]) & 0xff; @@ -854,10 +855,10 @@ static void decode_byryi(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) pred_L[2] = dst_v[-p->linesize[2]]; for (x = 0; x < avctx->width; x += 2) { - y1 = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - u = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - y2 = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - v = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + y1 = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + u = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + y2 = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + v = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst_y[x ] = pred_L[0] = (y1 + pred_L[0]) & 0xff; dst_u[x / 2] = pred_L[1] = (u + pred_L[1]) & 0xff; @@ -895,10 +896,10 @@ static void decode_byry(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) for (x = 0; x < avctx->width; x += 2) { int y1, y2, u, v; - y1 = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - u = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - y2 = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - v = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + y1 = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + u = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + y2 = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + v = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst_y[x ] = pred[0] = (y1 + pred[0]) & 0xff; dst_u[x / 2] = pred[1] = (u + pred[1]) & 0xff; @@ -933,10 +934,10 @@ static void decode_byry(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) pred_T[1] = dst_u[-p->linesize[1] + x / 2]; pred_T[2] = dst_v[-p->linesize[2] + x / 2]; - y1 = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - u = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - y2 = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - v = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + y1 = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + u = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + y2 = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + v = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst_y[x ] = pred_L[0] = (y1 + ((3 * (pred_T[0] + pred_L[0]) - 2 * pred_TL[0]) >> 2)) & 0xff; dst_u[x / 2] = pred_L[1] = (u + (((pred_L[1] - pred_TL[1]) >> 1) + pred_T[1])) & 0xff; @@ -977,9 +978,9 @@ static void decode_ybri(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) for (x = 0; x < avctx->width; x++) { int y, u, v; - y = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - u = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - v = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + y = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + u = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + v = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst_y[x] = pred[0] = (y + pred[0]) & 0xff; dst_u[x] = pred[1] = (u + pred[1]) & 0xff; @@ -1007,9 +1008,9 @@ static void decode_ybri(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) pred_L[2] = dst_v[-p->linesize[2]]; for (x = 0; x < avctx->width; x++) { - y = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - u = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - v = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + y = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + u = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + v = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst_y[x] = pred_L[0] = (y + pred_L[0]) & 0xff; dst_u[x] = pred_L[1] = (u + pred_L[1]) & 0xff; @@ -1045,9 +1046,9 @@ static void decode_ybr(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) for (x = 0; x < avctx->width; x++) { int y, u, v; - y = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - u = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - v = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + y = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + u = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + v = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst_y[x] = pred[0] = (y + pred[0]) & 0xff; dst_u[x] = pred[1] = (u + pred[1]) & 0xff; @@ -1079,9 +1080,9 @@ static void decode_ybr(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) pred_T[1] = dst_u[-p->linesize[1] + x]; pred_T[2] = dst_v[-p->linesize[2] + x]; - y = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - u = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - v = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + y = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + u = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + v = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst_y[x] = pred_L[0] = (y + ((3 * (pred_T[0] + pred_L[0]) - 2 * pred_TL[0]) >> 2)) & 0xff; dst_u[x] = pred_L[1] = (u + ((3 * (pred_T[1] + pred_L[1]) - 2 * pred_TL[1]) >> 2)) & 0xff; @@ -1123,10 +1124,10 @@ static void decode_aybri(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) for (x = 0; x < avctx->width; x++) { int a, y, u, v; - a = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - y = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - u = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - v = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + a = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + y = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + u = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + v = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst_a[x] = pred[0] = (a + pred[0]) & 0xff; dst_y[x] = pred[1] = (y + pred[1]) & 0xff; @@ -1158,10 +1159,10 @@ static void decode_aybri(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) pred_L[3] = dst_v[-p->linesize[2]]; for (x = 0; x < avctx->width; x++) { - a = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - y = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - u = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - v = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + a = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + y = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + u = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + v = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst_a[x] = pred_L[0] = (a + pred_L[0]) & 0xff; dst_y[x] = pred_L[1] = (y + pred_L[1]) & 0xff; @@ -1201,10 +1202,10 @@ static void decode_aybr(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) for (x = 0; x < avctx->width; x++) { int a, y, u, v; - a = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - y = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - u = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - v = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + a = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + y = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + u = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + v = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst_a[x] = pred[0] = (a + pred[0]) & 0xff; dst_y[x] = pred[1] = (y + pred[1]) & 0xff; @@ -1241,10 +1242,10 @@ static void decode_aybr(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) pred_T[2] = dst_u[-p->linesize[1] + x]; pred_T[3] = dst_v[-p->linesize[2] + x]; - a = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - y = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - u = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - v = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + a = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + y = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + u = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + v = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst_a[x] = pred_L[0] = (a + ((3 * (pred_T[0] + pred_L[0]) - 2 * pred_TL[0]) >> 2)) & 0xff; dst_y[x] = pred_L[1] = (y + ((3 * (pred_T[1] + pred_L[1]) - 2 * pred_TL[1]) >> 2)) & 0xff; @@ -1290,10 +1291,10 @@ static void decode_argxi(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) for (x = 0; x < avctx->width; x++) { int r, g, b, a; - a = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - r = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - g = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - b = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + a = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + r = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + g = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + b = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst_a[x] = pred[3] = (a + pred[3]) & 0x3ff; dst_r[x] = pred[0] = (r + pred[0]) & 0x3ff; @@ -1333,10 +1334,10 @@ static void decode_argx(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) for (x = 0; x < avctx->width; x++) { int r, g, b, a; - a = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - r = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - g = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - b = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + a = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + r = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + g = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + b = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst_a[x] = pred[3] = (a + pred[3]) & 0x3ff; dst_r[x] = pred[0] = (r + pred[0]) & 0x3ff; @@ -1373,10 +1374,10 @@ static void decode_argx(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) pred_T[2] = dst_b[-p->linesize[1] / 2 + x]; pred_T[3] = dst_a[-p->linesize[3] / 2 + x]; - a = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - r = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - g = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - b = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + a = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + r = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + g = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + b = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst_a[x] = pred_L[3] = (a + ((3 * (pred_T[3] + pred_L[3]) - 2 * pred_TL[3]) >> 2)) & 0x3ff; dst_r[x] = pred_L[0] = (r + ((3 * (pred_T[0] + pred_L[0]) - 2 * pred_TL[0]) >> 2)) & 0x3ff; @@ -1420,9 +1421,9 @@ static void decode_rgbxi(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) for (x = 0; x < avctx->width; x++) { int r, g, b; - r = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - g = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - b = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + r = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + g = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + b = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst_r[x] = pred[0] = (r + pred[0]) & 0x3ff; dst_g[x] = pred[1] = (r + g + pred[1]) & 0x3ff; @@ -1458,9 +1459,9 @@ static void decode_rgbx(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) for (x = 0; x < avctx->width; x++) { int r, g, b; - r = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - g = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - b = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + r = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + g = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + b = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst_r[x] = pred[0] = (r + pred[0]) & 0x3ff; dst_g[x] = pred[1] = (r + g + pred[1]) & 0x3ff; @@ -1492,9 +1493,9 @@ static void decode_rgbx(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) pred_T[1] = dst_g[-p->linesize[0] / 2 + x]; pred_T[2] = dst_b[-p->linesize[1] / 2 + x]; - r = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - g = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - b = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + r = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + g = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + b = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst_r[x] = pred_L[0] = (r + ((3 * (pred_T[0] + pred_L[0]) - 2 * pred_TL[0]) >> 2)) & 0x3ff; dst_g[x] = pred_L[1] = (r + g + ((3 * (pred_T[1] + pred_L[1]) - 2 * pred_TL[1]) >> 2)) & 0x3ff; @@ -1532,10 +1533,10 @@ static void decode_argbi(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) for (x = 0; x < avctx->width; x++) { int a, r, g, b; - a = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - r = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - g = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - b = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + a = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + r = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + g = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + b = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst[4 * x + 0] = pred[0] = (a + pred[0]) & 0xff; dst[4 * x + 1] = pred[1] = (r + pred[1]) & 0xff; @@ -1563,10 +1564,10 @@ static void decode_argbi(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) pred_L[3] = dst[-p->linesize[0] + 3]; for (x = 0; x < avctx->width; x++) { - a = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - r = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - g = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - b = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + a = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + r = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + g = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + b = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst[4 * x + 0] = pred_L[0] = (a + pred_L[0]) & 0xff; dst[4 * x + 1] = pred_L[1] = (r + pred_L[1]) & 0xff; @@ -1598,10 +1599,10 @@ static void decode_argb(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) for (x = 0; x < avctx->width; x++) { int a, r, g, b; - a = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - r = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - g = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - b = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + a = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + r = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + g = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + b = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst[4 * x + 0] = pred[0] = (a + pred[0]) & 0xff; dst[4 * x + 1] = pred[1] = (r + pred[1]) & 0xff; @@ -1634,10 +1635,10 @@ static void decode_argb(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) pred_T[2] = dst[-p->linesize[0] + 4 * x + 2]; pred_T[3] = dst[-p->linesize[0] + 4 * x + 3]; - a = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - r = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - g = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - b = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + a = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + r = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + g = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + b = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst[4 * x + 0] = pred_L[0] = (a + ((3 * (pred_T[0] + pred_L[0]) - 2 * pred_TL[0]) >> 2)) & 0xff; dst[4 * x + 1] = pred_L[1] = (r + ((3 * (pred_T[1] + pred_L[1]) - 2 * pred_TL[1]) >> 2)) & 0xff; @@ -1673,9 +1674,9 @@ static void decode_rgbi(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) for (x = 0; x < avctx->width; x++) { int r, g, b; - r = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - g = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - b = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + r = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + g = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + b = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst[4 * x + 0] = pred[0] = (r + pred[0]) & 0xff; dst[4 * x + 1] = pred[1] = (r + g + pred[1]) & 0xff; @@ -1700,9 +1701,9 @@ static void decode_rgbi(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) pred_L[2] = dst[-p->linesize[0] + 2]; for (x = 0; x < avctx->width; x++) { - r = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - g = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - b = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + r = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + g = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + b = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst[4 * x + 0] = pred_L[0] = (r + pred_L[0]) & 0xff; dst[4 * x + 1] = pred_L[1] = (r + g + pred_L[1]) & 0xff; @@ -1732,9 +1733,9 @@ static void decode_rgb(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) for (x = 0; x < avctx->width; x++) { int r, g, b; - r = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - g = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - b = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + r = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + g = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + b = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst[4 * x + 0] = pred[0] = (r + pred[0]) & 0xff; dst[4 * x + 1] = pred[1] = (r + g + pred[1]) & 0xff; @@ -1763,9 +1764,9 @@ static void decode_rgb(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) pred_T[1] = dst[-p->linesize[0] + 4 * x + 1]; pred_T[2] = dst[-p->linesize[0] + 4 * x + 2]; - r = get_vlc2(gb, s->vlc[0].table, s->vlc[0].bits, 2); - g = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); - b = get_vlc2(gb, s->vlc[1].table, s->vlc[1].bits, 2); + r = get_vlc2(gb, s->vlc[0].table, SHEER_VLC_BITS, 2); + g = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); + b = get_vlc2(gb, s->vlc[1].table, SHEER_VLC_BITS, 2); dst[4 * x + 0] = pred_L[0] = (r + ((3 * (pred_T[0] + pred_L[0]) - 2 * pred_TL[0]) >> 2)) & 0xff; dst[4 * x + 1] = pred_L[1] = (r + g + ((3 * (pred_T[1] + pred_L[1]) - 2 * pred_TL[1]) >> 2)) & 0xff; @@ -1793,7 +1794,7 @@ static int build_vlc(VLC *vlc, const uint8_t *len, int count) } ff_free_vlc(vlc); - return init_vlc(vlc, 12, count, + return init_vlc(vlc, SHEER_VLC_BITS, count, len, sizeof(*len), sizeof(*len), codes, sizeof(*codes), sizeof(*codes), 0); }