From patchwork Sat Aug 29 17:56:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 21997 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 8EE9A44AD75 for ; Sat, 29 Aug 2020 20:57:23 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7C58068AEEC; Sat, 29 Aug 2020 20:57:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 993DC68AA9B for ; Sat, 29 Aug 2020 20:57:12 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id a65so1917207wme.5 for ; Sat, 29 Aug 2020 10:57:12 -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=TuT3xhM2Ba/6TvpVYiLp/S4aYwZf+H5BpcXcrYGEhWs=; b=PAYXyJG3/fMVZUMakdB5SWMHgYSLgzi7+AQv636UtqWPfaYI2VP6TUMKFvOMXYsfBb 5K7TNInBtQdkBmBtPjWNf+9NxpyPLW4cukfFAn/1QeKqtaePvCpheWXRNAJCTTBTgDQB DA/mnUrwSUDR+q5Yw4CawmY+p2c/Guh/W47Ber09HFRBV5GkrgBifg8BCcajwTAfFV0i Adxjnq7czimGyaLutTwSAzMh1aFsCOF3P3/jXs+0R7UphAZM0L1Vpx0etAxwxNJS2wSG Bjk+4DzdTBzRMpMmUrMJzEgXhkXQAxnv2TvxMut5nZ5AoKXu8i37cips7hjD971c7LQi er9A== 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=TuT3xhM2Ba/6TvpVYiLp/S4aYwZf+H5BpcXcrYGEhWs=; b=P7D+RkDzSHFVh2a3HozOVdyOTITGWFDqI12BENLoWZWIb/hvTZSIYmkYtTV1ulxUPd lOzYHEX+LUYXpkYlsTNAaVlQ0+xpl90bO/lJmwBqV4YmFtK1zpXjQbWDXBNR/tVKbEGJ dRqwsVE5nKw41Rsx3xW37U3deBp6RU3j+f8CWlU9RzqBO7GvimeW5uorbOq4v+iT/y5G hqah5tiimJI5yHRrIzED8NrOhS08p1rjQrrYL6gKzLr5vPJio3aH2PFPmYOGPUwjRktH uZg8ytULqhHn85GRxKkgg1HkwOutUhuqlFG72SVr4AV3TWn/hAdtmNqBsHY2afas6qWV JgrQ== X-Gm-Message-State: AOAM531fnRrbd1WAYjc9aaYozxVYAvEdymcPazoE2RqqJG7IwYgjC7CR ThMNKgdZgPLjRVLDF1uMk4qPwR+dUn8= X-Google-Smtp-Source: ABdhPJyDGvxQaJwMc68yHz4dTcAJ/gpOraqgVsUbXd6gsChqJgwU+Iq2rVbwtrbcNNlmAphikhlmKw== X-Received: by 2002:a05:600c:202:: with SMTP id 2mr3727588wmi.147.1598723831723; Sat, 29 Aug 2020 10:57:11 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id z8sm4016734wmf.10.2020.08.29.10.57.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Aug 2020 10:57:11 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 29 Aug 2020 19:56:22 +0200 Message-Id: <20200829175626.11682-9-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200829175626.11682-1-andreas.rheinhardt@gmail.com> References: <20200829175626.11682-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/13] avcodec/wnv1: Move temporary variables from context to stack 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" Here it even leads to the complete removal of the context. Signed-off-by: Andreas Rheinhardt --- libavcodec/wnv1.c | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/libavcodec/wnv1.c b/libavcodec/wnv1.c index 857807a951..b5cd0f0f0c 100644 --- a/libavcodec/wnv1.c +++ b/libavcodec/wnv1.c @@ -30,11 +30,6 @@ #include "internal.h" -typedef struct WNV1Context { - int shift; - GetBitContext gb; -} WNV1Context; - static const uint16_t code_tab[16][2] = { { 0x17F, 9 }, { 0xBF, 8 }, { 0x5F, 7 }, { 0x2F, 6 }, { 0x17, 5 }, { 0x0B, 4 }, { 0x005, 3 }, { 0x000, 1 }, @@ -45,26 +40,26 @@ static const uint16_t code_tab[16][2] = { static VLC code_vlc; /* returns modified base_value */ -static inline int wnv1_get_code(WNV1Context *w, int base_value) +static inline int wnv1_get_code(GetBitContext *gb, int shift, int base_value) { - int v = get_vlc2(&w->gb, code_vlc.table, CODE_VLC_BITS, 1); + int v = get_vlc2(gb, code_vlc.table, CODE_VLC_BITS, 1); if (v == 15) - return get_bits(&w->gb, 8 - w->shift) << w->shift; + return get_bits(gb, 8 - shift) << shift; else - return base_value + ((v - 7U) << w->shift); + return base_value + ((v - 7U) << shift); } static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *avpkt) { - WNV1Context * const l = avctx->priv_data; const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; AVFrame * const p = data; + GetBitContext gb; unsigned char *Y,*U,*V; - int i, j, ret; + int i, j, ret, shift; int prev_y = 0, prev_u = 0, prev_v = 0; if (buf_size < 8 + avctx->height * (avctx->width/2)/8) { @@ -76,24 +71,24 @@ static int decode_frame(AVCodecContext *avctx, return ret; p->key_frame = 1; - if ((ret = init_get_bits8(&l->gb, buf + 8, buf_size - 8)) < 0) + if ((ret = init_get_bits8(&gb, buf + 8, buf_size - 8)) < 0) return ret; if (buf[2] >> 4 == 6) - l->shift = 2; + shift = 2; else { - l->shift = 8 - (buf[2] >> 4); - if (l->shift > 4) { + shift = 8 - (buf[2] >> 4); + if (shift > 4) { avpriv_request_sample(avctx, "Unknown WNV1 frame header value %i", buf[2] >> 4); - l->shift = 4; + shift = 4; } - if (l->shift < 1) { + if (shift < 1) { avpriv_request_sample(avctx, "Unknown WNV1 frame header value %i", buf[2] >> 4); - l->shift = 1; + shift = 1; } } @@ -102,10 +97,10 @@ static int decode_frame(AVCodecContext *avctx, V = p->data[2]; for (j = 0; j < avctx->height; j++) { for (i = 0; i < avctx->width / 2; i++) { - Y[i * 2] = wnv1_get_code(l, prev_y); - prev_u = U[i] = wnv1_get_code(l, prev_u); - prev_y = Y[(i * 2) + 1] = wnv1_get_code(l, Y[i * 2]); - prev_v = V[i] = wnv1_get_code(l, prev_v); + Y[i * 2] = wnv1_get_code(&gb, shift, prev_y); + prev_u = U[i] = wnv1_get_code(&gb, shift, prev_u); + prev_y = Y[(i * 2) + 1] = wnv1_get_code(&gb, shift, Y[i * 2]); + prev_v = V[i] = wnv1_get_code(&gb, shift, prev_v); } Y += p->linesize[0]; U += p->linesize[1]; @@ -138,7 +133,6 @@ AVCodec ff_wnv1_decoder = { .long_name = NULL_IF_CONFIG_SMALL("Winnov WNV1"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_WNV1, - .priv_data_size = sizeof(WNV1Context), .init = decode_init, .decode = decode_frame, .capabilities = AV_CODEC_CAP_DR1,