From patchwork Tue Jul 16 17:11:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 50569 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:40f5:b0:482:c625:d099 with SMTP id lb53csp436579vqb; Tue, 16 Jul 2024 10:17:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXd6g53Sl2ZaY3wTs4fWpHV0tGX4L2n46VVv26ZX6HUEZeAiUMJxv2kxkzgfVgiE6u5wf/td/Z8lJ11FMHi/okoG9+vbwsT+Y4wrA== X-Google-Smtp-Source: AGHT+IG7EPSVaWSG7ilhTUDX2y3mQuUF3YDkih8a6vKFQ6pn7NyKvViSMhoCxofUh3sGW5bCns6n X-Received: by 2002:a05:6402:26d4:b0:57d:692:92d9 with SMTP id 4fb4d7f45d1cf-59eee83233fmr2168519a12.4.1721150226220; Tue, 16 Jul 2024 10:17:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1721150226; cv=none; d=google.com; s=arc-20160816; b=TQSunNAay3r3Lb5OzNNvNWioaPyc/L8bF8T7MBsx2fAgFc0eaSunk6Djtcb9RQCbBo dw2rLNpX+zbYBoCU8bedaTAYC5QuHSbrJ3YvBJrPRfmsSJR4yI5rYGIYGOGWHBiKUoGS 8rLVa1EopAhR0z3DmuSVagK8rSMlE3ysfHQROJhvdOb+QMvv1UVupQfQrGYyqmREfnrm PdxKolxhNY29Iul1vcHXGnbzxbCWnJQuuq2o4fsYtiQA+pNIXEFNQ4naz53PNzP5MxPs xqkneXKWrCKynLiqByEENd9G0HWvhLul39n2T9dRCvlmWFi/+DR+02ARKcRntIWpDcKa Y+Qg== 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; bh=OnWfhEN9yob0Q5dCiZiwG8KuZVHnQlI3PVdmc8LlXV0=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=hlI2AvKe2OSonrxFh8EjFCT3TEhfhib42bOPKETjJaoigBQgVx7Vf8sgCSg9U9/enH V6QUM4azEQnbwwV0DocHMWR1k4+Y/JwOmF9EWeio8QrAFKWKVVciTi/qPQcOEw/spfS9 HITQXuxr+bVmBvEyJOhZE8Sg1Q0r04PJKtYR0HRCVPq+HnIA6iqGSjIARwGiVGlda4KL fQU8Qrqp6Rodhzr0gr+VDP+Up+lpw9f8xmTOTIKiNfQlmwfo+S2Z0Amkrh811I+5ZI+L 3Ir+Y3DslysSZUuIz2hWxO7Nlf/BobK4iiC/gAjq14BrkrUgAiceLgfHE1ehZTyQ79Aq 6s5A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=EQBt0KMi; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-59b26f657c9si4113081a12.352.2024.07.16.10.17.05; Tue, 16 Jul 2024 10:17:06 -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=@khirnov.net header.s=mail header.b=EQBt0KMi; 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 1CBAE68D918; Tue, 16 Jul 2024 20:16:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A01B468DA77 for ; Tue, 16 Jul 2024 20:16:31 +0300 (EEST) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=EQBt0KMi; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 3BCE14DBC for ; Tue, 16 Jul 2024 19:16:31 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id R_22z0raJ-Br for ; Tue, 16 Jul 2024 19:16:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1721150187; bh=ArabD8jIihR8W5JkI3NgsV0hy8xNrHWgiuZvGvTUsn4=; h=From:To:Subject:Date:In-Reply-To:References:From; b=EQBt0KMi2D7x5WCfcwR7L5kgTkqsaLY5vSUnESFsgiJua1wyvxC9zvTk13CgR3iZC cRYtePj3vyemvakIu5Z0jc+5iMhBpFKqPU+WwlyAFAPgrGNyFhut6uRJHdeXSSsjiv pxlGXZmH8b8ym89L3Hc479VGf1PbO2wbv144HWbHBa7a07vG+zKvxOBKjNu4nHLFyw 8Q/b3iOzaPGlZJjmzSfW/nhYGLAxlar9BdEGvrHf7bNDFp9OmDJ9C8Y+peVOhNhAsc wVPF4MzPIZvlkpOObj+7ku+Oxkbz0WU4L1csclICJeFT+GAM7739ME2mYhUn1LtJ0V 8Ou97edUzXC1A== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 23BD94DE2 for ; Tue, 16 Jul 2024 19:16:27 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 8385D3A1862 for ; Tue, 16 Jul 2024 19:16:20 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 16 Jul 2024 19:11:23 +0200 Message-ID: <20240716171155.31838-8-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240716171155.31838-1-anton@khirnov.net> References: <20240716171155.31838-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/39] lavc/ffv1: move sample_buffer to the per-slice context X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: EX5+F+iHgpsC --- libavcodec/ffv1.c | 35 ++++++++++++++++++++--------------- libavcodec/ffv1.h | 5 +++-- libavcodec/ffv1dec.c | 27 +++++++++++++-------------- libavcodec/ffv1dec_template.c | 9 +++++---- libavcodec/ffv1enc.c | 30 ++++++++++++++++-------------- libavcodec/ffv1enc_template.c | 9 +++++---- 6 files changed, 62 insertions(+), 53 deletions(-) diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c index 25f28287c0..a102425596 100644 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@ -112,6 +112,8 @@ av_cold int ff_ffv1_init_slice_contexts(FFV1Context *f) if (!f->slices) return AVERROR(ENOMEM); + f->max_slice_count = max_slice_count; + for (i = 0; i < max_slice_count;) { FFV1SliceContext *sc = &f->slices[i]; int sx = i % f->num_h_slices; @@ -123,7 +125,7 @@ av_cold int ff_ffv1_init_slice_contexts(FFV1Context *f) FFV1Context *fs = av_mallocz(sizeof(*fs)); if (!fs) - goto memfail; + return AVERROR(ENOMEM); f->slice_context[i++] = fs; memcpy(fs, f, sizeof(*fs)); @@ -134,19 +136,15 @@ av_cold int ff_ffv1_init_slice_contexts(FFV1Context *f) sc->slice_x = sxs; sc->slice_y = sys; - fs->sample_buffer = av_malloc_array((fs->width + 6), 3 * MAX_PLANES * - sizeof(*fs->sample_buffer)); - fs->sample_buffer32 = av_malloc_array((fs->width + 6), 3 * MAX_PLANES * - sizeof(*fs->sample_buffer32)); - if (!fs->sample_buffer || !fs->sample_buffer32) - goto memfail; + sc->sample_buffer = av_malloc_array((fs->width + 6), 3 * MAX_PLANES * + sizeof(*sc->sample_buffer)); + sc->sample_buffer32 = av_malloc_array((fs->width + 6), 3 * MAX_PLANES * + sizeof(*sc->sample_buffer32)); + if (!sc->sample_buffer || !sc->sample_buffer32) + return AVERROR(ENOMEM); } - f->max_slice_count = max_slice_count; - return 0; -memfail: - f->max_slice_count = i; - return AVERROR(ENOMEM); + return 0; } int ff_ffv1_allocate_initial_states(FFV1Context *f) @@ -199,14 +197,20 @@ av_cold int ff_ffv1_close(AVCodecContext *avctx) for (j = 0; j < s->max_slice_count; j++) { FFV1Context *fs = s->slice_context[j]; + FFV1SliceContext *sc = &s->slices[j]; + + av_freep(&sc->sample_buffer); + av_freep(&sc->sample_buffer32); + + if (!fs) + continue; + for (i = 0; i < s->plane_count; i++) { PlaneContext *p = &fs->plane[i]; av_freep(&p->state); av_freep(&p->vlc_state); } - av_freep(&fs->sample_buffer); - av_freep(&fs->sample_buffer32); } av_freep(&avctx->stats_out); @@ -214,7 +218,8 @@ av_cold int ff_ffv1_close(AVCodecContext *avctx) av_freep(&s->initial_states[j]); for (i = 0; i < s->max_slice_count; i++) { FFV1Context *sf = s->slice_context[i]; - av_freep(&sf->rc_stat2[j]); + if (sf) + av_freep(&sf->rc_stat2[j]); } av_freep(&s->rc_stat2[j]); } diff --git a/libavcodec/ffv1.h b/libavcodec/ffv1.h index 256904b283..ccb510a483 100644 --- a/libavcodec/ffv1.h +++ b/libavcodec/ffv1.h @@ -70,6 +70,9 @@ typedef struct PlaneContext { #define MAX_SLICES 1024 typedef struct FFV1SliceContext { + int16_t *sample_buffer; + int32_t *sample_buffer32; + int slice_width; int slice_height; int slice_x; @@ -108,8 +111,6 @@ typedef struct FFV1Context { uint8_t (*initial_states[MAX_QUANT_TABLES])[32]; int run_index; int colorspace; - int16_t *sample_buffer; - int32_t *sample_buffer32; int use32bit; diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 28e4a05b21..fcf8977a36 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -117,18 +117,18 @@ static int is_input_end(FFV1Context *s) #define RENAME(name) name ## 32 #include "ffv1dec_template.c" -static int decode_plane(FFV1Context *s, uint8_t *src, - int w, int h, int stride, int plane_index, +static int decode_plane(FFV1Context *s, FFV1SliceContext *sc, + uint8_t *src, int w, int h, int stride, int plane_index, int pixel_stride) { int x, y; int16_t *sample[2]; - sample[0] = s->sample_buffer + 3; - sample[1] = s->sample_buffer + w + 6 + 3; + sample[0] = sc->sample_buffer + 3; + sample[1] = sc->sample_buffer + w + 6 + 3; s->run_index = 0; - memset(s->sample_buffer, 0, 2 * (w + 6) * sizeof(*s->sample_buffer)); + memset(sc->sample_buffer, 0, 2 * (w + 6) * sizeof(*sc->sample_buffer)); for (y = 0; y < h; y++) { int16_t *temp = sample[0]; // FIXME: try a normal buffer @@ -333,29 +333,29 @@ static int decode_slice(AVCodecContext *c, void *arg) const int chroma_height = AV_CEIL_RSHIFT(height, f->chroma_v_shift); const int cx = x >> f->chroma_h_shift; const int cy = y >> f->chroma_v_shift; - decode_plane(fs, p->data[0] + ps*x + y*p->linesize[0], width, height, p->linesize[0], 0, 1); + decode_plane(fs, sc, p->data[0] + ps*x + y*p->linesize[0], width, height, p->linesize[0], 0, 1); if (f->chroma_planes) { - decode_plane(fs, p->data[1] + ps*cx+cy*p->linesize[1], chroma_width, chroma_height, p->linesize[1], 1, 1); - decode_plane(fs, p->data[2] + ps*cx+cy*p->linesize[2], chroma_width, chroma_height, p->linesize[2], 1, 1); + decode_plane(fs, sc, p->data[1] + ps*cx+cy*p->linesize[1], chroma_width, chroma_height, p->linesize[1], 1, 1); + decode_plane(fs, sc, p->data[2] + ps*cx+cy*p->linesize[2], chroma_width, chroma_height, p->linesize[2], 1, 1); } if (fs->transparency) - decode_plane(fs, p->data[3] + ps*x + y*p->linesize[3], width, height, p->linesize[3], (f->version >= 4 && !f->chroma_planes) ? 1 : 2, 1); + decode_plane(fs, sc, p->data[3] + ps*x + y*p->linesize[3], width, height, p->linesize[3], (f->version >= 4 && !f->chroma_planes) ? 1 : 2, 1); } else if (f->colorspace == 0) { - decode_plane(fs, p->data[0] + ps*x + y*p->linesize[0] , width, height, p->linesize[0], 0, 2); - decode_plane(fs, p->data[0] + ps*x + y*p->linesize[0] + 1, width, height, p->linesize[0], 1, 2); + decode_plane(fs, sc, p->data[0] + ps*x + y*p->linesize[0] , width, height, p->linesize[0], 0, 2); + decode_plane(fs, sc, p->data[0] + ps*x + y*p->linesize[0] + 1, width, height, p->linesize[0], 1, 2); } else if (f->use32bit) { uint8_t *planes[4] = { p->data[0] + ps * x + y * p->linesize[0], p->data[1] + ps * x + y * p->linesize[1], p->data[2] + ps * x + y * p->linesize[2], p->data[3] + ps * x + y * p->linesize[3] }; - decode_rgb_frame32(fs, planes, width, height, p->linesize); + decode_rgb_frame32(fs, sc, planes, width, height, p->linesize); } else { uint8_t *planes[4] = { p->data[0] + ps * x + y * p->linesize[0], p->data[1] + ps * x + y * p->linesize[1], p->data[2] + ps * x + y * p->linesize[2], p->data[3] + ps * x + y * p->linesize[3] }; - decode_rgb_frame(fs, planes, width, height, p->linesize); + decode_rgb_frame(fs, sc, planes, width, height, p->linesize); } if (fs->ac != AC_GOLOMB_RICE && f->version > 2) { int v; @@ -1084,7 +1084,6 @@ static int update_thread_context(AVCodecContext *dst, const AVCodecContext *src) } } av_assert0(!fdst->plane[0].state); - av_assert0(!fdst->sample_buffer); av_assert1(fdst->max_slice_count == fsrc->max_slice_count); diff --git a/libavcodec/ffv1dec_template.c b/libavcodec/ffv1dec_template.c index a90c28cd0e..b9316e04ca 100644 --- a/libavcodec/ffv1dec_template.c +++ b/libavcodec/ffv1dec_template.c @@ -127,7 +127,8 @@ static av_always_inline int RENAME(decode_line)(FFV1Context *s, int w, return 0; } -static int RENAME(decode_rgb_frame)(FFV1Context *s, uint8_t *src[4], int w, int h, int stride[4]) +static int RENAME(decode_rgb_frame)(FFV1Context *s, FFV1SliceContext *sc, + uint8_t *src[4], int w, int h, int stride[4]) { int x, y, p; TYPE *sample[4][2]; @@ -137,13 +138,13 @@ static int RENAME(decode_rgb_frame)(FFV1Context *s, uint8_t *src[4], int w, int int transparency = s->transparency; for (x = 0; x < 4; x++) { - sample[x][0] = RENAME(s->sample_buffer) + x * 2 * (w + 6) + 3; - sample[x][1] = RENAME(s->sample_buffer) + (x * 2 + 1) * (w + 6) + 3; + sample[x][0] = RENAME(sc->sample_buffer) + x * 2 * (w + 6) + 3; + sample[x][1] = RENAME(sc->sample_buffer) + (x * 2 + 1) * (w + 6) + 3; } s->run_index = 0; - memset(RENAME(s->sample_buffer), 0, 8 * (w + 6) * sizeof(*RENAME(s->sample_buffer))); + memset(RENAME(sc->sample_buffer), 0, 8 * (w + 6) * sizeof(*RENAME(sc->sample_buffer))); for (y = 0; y < h; y++) { for (p = 0; p < 3 + transparency; p++) { diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index c46df15b0c..f6b1919ee4 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -269,7 +269,8 @@ static inline void put_vlc_symbol(PutBitContext *pb, VlcState *const state, #define RENAME(name) name ## 32 #include "ffv1enc_template.c" -static int encode_plane(FFV1Context *s, const uint8_t *src, int w, int h, +static int encode_plane(FFV1Context *s, FFV1SliceContext *sc, + const uint8_t *src, int w, int h, int stride, int plane_index, int pixel_stride) { int x, y, i, ret; @@ -277,11 +278,11 @@ static int encode_plane(FFV1Context *s, const uint8_t *src, int w, int h, int16_t *sample[3]; s->run_index = 0; - memset(s->sample_buffer, 0, ring_size * (w + 6) * sizeof(*s->sample_buffer)); + memset(sc->sample_buffer, 0, ring_size * (w + 6) * sizeof(*sc->sample_buffer)); for (y = 0; y < h; y++) { for (i = 0; i < ring_size; i++) - sample[i] = s->sample_buffer + (w + 6) * ((h + i - y) % ring_size) + 3; + sample[i] = sc->sample_buffer + (w + 6) * ((h + i - y) % ring_size) + 3; sample[0][-1]= sample[1][0 ]; sample[1][ w]= sample[1][w-1]; @@ -938,7 +939,8 @@ static void encode_slice_header(FFV1Context *f, FFV1Context *fs, } } -static void choose_rct_params(FFV1Context *fs, const uint8_t *src[3], const int stride[3], int w, int h) +static void choose_rct_params(FFV1Context *fs, FFV1SliceContext *sc, + const uint8_t *src[3], const int stride[3], int w, int h) { #define NB_Y_COEFF 15 static const int rct_y_coeff[15][2] = { @@ -968,7 +970,7 @@ static void choose_rct_params(FFV1Context *fs, const uint8_t *src[3], const int for (y = 0; y < h; y++) { int lastr=0, lastg=0, lastb=0; for (p = 0; p < 3; p++) - sample[p] = fs->sample_buffer + p*w; + sample[p] = sc->sample_buffer + p*w; for (x = 0; x < w; x++) { int b, g, r; @@ -1041,7 +1043,7 @@ static int encode_slice(AVCodecContext *c, void *arg) fs->slice_coding_mode = 0; if (f->version > 3) { - choose_rct_params(fs, planes, p->linesize, width, height); + choose_rct_params(fs, sc, planes, p->linesize, width, height); } else { fs->slice_rct_by_coef = 1; fs->slice_rct_ry_coef = 1; @@ -1066,21 +1068,21 @@ retry: const int cx = x >> f->chroma_h_shift; const int cy = y >> f->chroma_v_shift; - ret = encode_plane(fs, p->data[0] + ps*x + y*p->linesize[0], width, height, p->linesize[0], 0, 1); + ret = encode_plane(fs, sc, p->data[0] + ps*x + y*p->linesize[0], width, height, p->linesize[0], 0, 1); if (f->chroma_planes) { - ret |= encode_plane(fs, p->data[1] + ps*cx+cy*p->linesize[1], chroma_width, chroma_height, p->linesize[1], 1, 1); - ret |= encode_plane(fs, p->data[2] + ps*cx+cy*p->linesize[2], chroma_width, chroma_height, p->linesize[2], 1, 1); + ret |= encode_plane(fs, sc, p->data[1] + ps*cx+cy*p->linesize[1], chroma_width, chroma_height, p->linesize[1], 1, 1); + ret |= encode_plane(fs, sc, p->data[2] + ps*cx+cy*p->linesize[2], chroma_width, chroma_height, p->linesize[2], 1, 1); } if (fs->transparency) - ret |= encode_plane(fs, p->data[3] + ps*x + y*p->linesize[3], width, height, p->linesize[3], 2, 1); + ret |= encode_plane(fs, sc, p->data[3] + ps*x + y*p->linesize[3], width, height, p->linesize[3], 2, 1); } else if (c->pix_fmt == AV_PIX_FMT_YA8) { - ret = encode_plane(fs, p->data[0] + ps*x + y*p->linesize[0], width, height, p->linesize[0], 0, 2); - ret |= encode_plane(fs, p->data[0] + 1 + ps*x + y*p->linesize[0], width, height, p->linesize[0], 1, 2); + ret = encode_plane(fs, sc, p->data[0] + ps*x + y*p->linesize[0], width, height, p->linesize[0], 0, 2); + ret |= encode_plane(fs, sc, p->data[0] + 1 + ps*x + y*p->linesize[0], width, height, p->linesize[0], 1, 2); } else if (f->use32bit) { - ret = encode_rgb_frame32(fs, planes, width, height, p->linesize); + ret = encode_rgb_frame32(fs, sc, planes, width, height, p->linesize); } else { - ret = encode_rgb_frame(fs, planes, width, height, p->linesize); + ret = encode_rgb_frame(fs, sc, planes, width, height, p->linesize); } if (ret < 0) { diff --git a/libavcodec/ffv1enc_template.c b/libavcodec/ffv1enc_template.c index 8953dbe07c..85fbac224b 100644 --- a/libavcodec/ffv1enc_template.c +++ b/libavcodec/ffv1enc_template.c @@ -124,7 +124,8 @@ static av_always_inline int RENAME(encode_line)(FFV1Context *s, int w, return 0; } -static int RENAME(encode_rgb_frame)(FFV1Context *s, const uint8_t *src[4], +static int RENAME(encode_rgb_frame)(FFV1Context *s, FFV1SliceContext *sc, + const uint8_t *src[4], int w, int h, const int stride[4]) { int x, y, p, i; @@ -139,13 +140,13 @@ static int RENAME(encode_rgb_frame)(FFV1Context *s, const uint8_t *src[4], s->run_index = 0; - memset(RENAME(s->sample_buffer), 0, ring_size * MAX_PLANES * - (w + 6) * sizeof(*RENAME(s->sample_buffer))); + memset(RENAME(sc->sample_buffer), 0, ring_size * MAX_PLANES * + (w + 6) * sizeof(*RENAME(sc->sample_buffer))); for (y = 0; y < h; y++) { for (i = 0; i < ring_size; i++) for (p = 0; p < MAX_PLANES; p++) - sample[p][i]= RENAME(s->sample_buffer) + p*ring_size*(w+6) + ((h+i-y)%ring_size)*(w+6) + 3; + sample[p][i]= RENAME(sc->sample_buffer) + p*ring_size*(w+6) + ((h+i-y)%ring_size)*(w+6) + 3; for (x = 0; x < w; x++) { int b, g, r, av_uninit(a);