From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTPS id EF43B4F173
for <ffmpegdev@gitmailbox.com>; Sun, 15 Jun 2025 17:00:03 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 18DFC68CD66;
Sun, 15 Jun 2025 19:57:17 +0300 (EEST)
Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com
[209.85.210.176])
by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id ADEF568D7DE
for <ffmpeg-devel@ffmpeg.org>; Sun, 15 Jun 2025 19:57:15 +0300 (EEST)
Received: by mail-pf1-f176.google.com with SMTP id
d2e1a72fcca58-7481600130eso4118616b3a.3
for <ffmpeg-devel@ffmpeg.org>; Sun, 15 Jun 2025 09:57:15 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1750006634; x=1750611434; darn=ffmpeg.org;
h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date
:references:in-reply-to:message-id:from:from:to:cc:subject:date
:message-id:reply-to;
bh=wU882jMx3eOI4PNIVCNTEZ/2cbLccjRTnT5QCIq4974=;
b=RV+sPRksmaNNstMqExFbOzdGORJ7Aog/E67BjcZBSb6iBEk+h/n+UA2UHhYb8HFU27
/QCpl4IZjjAQNb2k+0BA8Rr7OeWprhhst4l4lYHvF8zFLkDyy9zUIXx9d1m8AVeUgWS6
H58nX6JvcVpANqeI2kJpluU5ZetC79UIkj22dPL+He2sapAP6zXY4U6BBl5HnjUIKvAI
deaCIfQH0hH9gEzJiimAVU7k6DMLd1v6BhyW6V1OCG4XeGcZXKYZpxEWMuZJYnzTMF4G
algs4ozF4XLRl7qX1zvLoX1Mf8LH33UFFxuzcjKzSRfO6Zrijamr/bcxzEJWXrHI+tCf
ve/g==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1750006634; x=1750611434;
h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date
:references:in-reply-to:message-id:from:x-gm-message-state:from:to
:cc:subject:date:message-id:reply-to;
bh=wU882jMx3eOI4PNIVCNTEZ/2cbLccjRTnT5QCIq4974=;
b=p0G6YDw8sBfbO4CeieA2sF4gDRPPi2lKnKcJwm25mB6YPT1yaJ1jQ2LNAmuLRgW0Lo
MlS9ePCw5Rhl3i1ThlKXduw4pb4acwh1br4LGfrMFuQaEN6AR2viupHCMDVNrfOYX6zQ
/MegOO34mbcRCwVAM2GDew/G/QsYNLC508J4HKxcSgkd0TS6hBMHaY0WsNEO17CjdUua
c3tKkbxyOHs9WwNLZ2fsIsg7ZLD1MhtHTkhW/+CdUuJ44ltdHmVvEyWBAkZvqJhRaHyv
+XauvyINyBhU5unfgfPXKETuxhoguSooCSyQKyNwy5X8TgbOHD7MmowNE0Z9Ah7sDtrY
3cNg==
X-Gm-Message-State: AOJu0YzpAI+lIg1l4syP+d0Bo9m1xWPtHzgnxngujcs9GLqurrTMdtqT
e+C/7fisPWfYVc0DA+gIiky33LZHed6SC0l30Uv89LM39fRyS2wOuOAVC3ZnaQ==
X-Gm-Gg: ASbGncsy81kBFunfDMkJb1HDG1lXaWFio6k1E4pBb6jsaIs6rbTJoCigti9EHiurGpp
7F1niaOOuAldqQf+RrQz8nGT6jFgUQ+DBkUilg/NYdwAlQKGUTLdty0RIM0ftYxlFHeiXHH7w6h
PWa2zYm0ACPyMTE2e/BjLTAhmyP8zEUd7Yfcc9XPRNPRDDTXAnE6XRCt1HaA6U6HM+aGoIQWJTK
td+pwQNYR+UEZ/jA5+Dety0MpC5lXxtzdq8YSRUGODUoSTP/5GbYeN3BNKf6BRQdVg+XX6WaNWv
DXyXGQyNexCjlifwWZXVOK5Z6hBlmnLZfnGXbcPrtX37BgaOaDh+Ea4njveusg5is6s/GUuZ+ZC
HPW6hEcr8S5K3+rzU
X-Google-Smtp-Source: AGHT+IHIXvxQuX+QE8q+FNGsPpd0wqXLuGsHVF52eczPDLIJnsRQ/v9tUsT30ACpTytOFIS7Kcy6qA==
X-Received: by 2002:a05:6a00:1746:b0:736:53f2:87bc with SMTP id
d2e1a72fcca58-7489d06241dmr7901886b3a.13.1750006633764;
Sun, 15 Jun 2025 09:57:13 -0700 (PDT)
Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50])
by smtp.gmail.com with ESMTPSA id
d2e1a72fcca58-74890005f8asm5086559b3a.49.2025.06.15.09.57.13
(version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);
Sun, 15 Jun 2025 09:57:13 -0700 (PDT)
From: Andreas Rheinhardt <ffmpegagent-at-gmail.com@ffmpeg.org>
X-Google-Original-From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Message-Id: <28a872c5c2ee09d81d3115e9d4d54b16daa49803.1750006479.git.ffmpegagent@gmail.com>
In-Reply-To: <pull.98.ffstaging.FFmpeg.1750006478.ffmpegagent@gmail.com>
References: <pull.98.ffstaging.FFmpeg.1750006478.ffmpegagent@gmail.com>
Date: Sun, 15 Jun 2025 16:54:17 +0000
Fcc: Sent
MIME-Version: 1.0
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH 26/47] avcodec/mpegvideo_enc: Simplify
allocating non-slice buffers
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/28a872c5c2ee09d81d3115e9d4d54b16daa49803.1750006479.git.ffmpegagent@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Allocate them before the slice contexts, so that they are automatically
copied to the slice contexts. This avoids having to set them in a loop.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavcodec/mpegvideo_enc.c | 148 ++++++++++++++++++-------------------
1 file changed, 73 insertions(+), 75 deletions(-)
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 1fae5fbeb0..60abe08d7a 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -444,50 +444,33 @@ static av_cold int init_matrices(MPVMainEncContext *const m, AVCodecContext *avc
return 0;
}
-static av_cold int init_buffers(MPVMainEncContext *const m, AVCodecContext *avctx)
+static av_cold int init_buffers(MPVMainEncContext *const m)
{
MPVEncContext *const s = &m->s;
- // Align the following per-thread buffers to avoid false sharing.
- enum {
-#ifndef _MSC_VER
- /// The number is supposed to match/exceed the cache-line size.
- ALIGN = FFMAX(128, _Alignof(max_align_t)),
-#else
- ALIGN = 128,
-#endif
- DCT_ERROR_SIZE = FFALIGN(2 * sizeof(*s->dct_error_sum), ALIGN),
- };
- static_assert(DCT_ERROR_SIZE * MAX_THREADS + ALIGN - 1 <= SIZE_MAX,
- "Need checks for potential overflow.");
- unsigned nb_slices = s->c.slice_context_count, mv_table_size, mb_array_size;
- char *dct_error = NULL;
- int has_b_frames = !!m->max_b_frames, nb_mv_tables = 1 + 5 * has_b_frames;
+ int has_b_frames = !!m->max_b_frames;
int16_t (*mv_table)[2];
- if (m->noise_reduction) {
- if (!FF_ALLOCZ_TYPED_ARRAY(s->dct_offset, 2))
- return AVERROR(ENOMEM);
- dct_error = av_mallocz(ALIGN - 1 + nb_slices * DCT_ERROR_SIZE);
- if (!dct_error)
- return AVERROR(ENOMEM);
- m->dct_error_sum_base = dct_error;
- dct_error += FFALIGN((uintptr_t)dct_error, ALIGN) - (uintptr_t)dct_error;
- }
-
/* Allocate MB type table */
- mb_array_size = s->c.mb_stride * s->c.mb_height;
+ unsigned mb_array_size = s->c.mb_stride * s->c.mb_height;
s->mb_type = av_calloc(mb_array_size, 3 * sizeof(*s->mb_type) + sizeof(*s->mb_mean));
if (!s->mb_type)
return AVERROR(ENOMEM);
+ s->mc_mb_var = s->mb_type + mb_array_size;
+ s->mb_var = s->mc_mb_var + mb_array_size;
+ s->mb_mean = (uint8_t*)(s->mb_var + mb_array_size);
+
if (!FF_ALLOCZ_TYPED_ARRAY(s->lambda_table, mb_array_size))
return AVERROR(ENOMEM);
- mv_table_size = (s->c.mb_height + 2) * s->c.mb_stride + 1;
+ unsigned mv_table_size = (s->c.mb_height + 2) * s->c.mb_stride + 1;
+ unsigned nb_mv_tables = 1 + 5 * has_b_frames;
if (s->c.codec_id == AV_CODEC_ID_MPEG4 ||
(s->c.avctx->flags & AV_CODEC_FLAG_INTERLACED_ME)) {
nb_mv_tables += 8 * has_b_frames;
- if (!ALLOCZ_ARRAYS(s->p_field_select_table[0], 2 * (2 + 4 * has_b_frames), mv_table_size))
+ s->p_field_select_table[0] = av_calloc(mv_table_size, 2 * (2 + 4 * has_b_frames));
+ if (!s->p_field_select_table[0])
return AVERROR(ENOMEM);
+ s->p_field_select_table[1] = s->p_field_select_table[0] + 2 * mv_table_size;
}
mv_table = av_calloc(mv_table_size, nb_mv_tables * sizeof(*mv_table));
@@ -496,43 +479,21 @@ static av_cold int init_buffers(MPVMainEncContext *const m, AVCodecContext *avct
m->mv_table_base = mv_table;
mv_table += s->c.mb_stride + 1;
- for (unsigned i = 0; i < nb_slices; ++i) {
- MPVEncContext *const s2 = s->c.enc_contexts[i];
- int16_t (*tmp_mv_table)[2] = mv_table;
-
- if (dct_error) {
- s2->dct_offset = s->dct_offset;
- s2->dct_error_sum = (void*)dct_error;
- dct_error += DCT_ERROR_SIZE;
- }
-
- s2->mb_type = s->mb_type;
- s2->mc_mb_var = s2->mb_type + mb_array_size;
- s2->mb_var = s2->mc_mb_var + mb_array_size;
- s2->mb_mean = (uint8_t*)(s2->mb_var + mb_array_size);
- s2->lambda_table = s->lambda_table;
-
- s2->p_mv_table = tmp_mv_table;
- if (has_b_frames) {
- s2->b_forw_mv_table = tmp_mv_table += mv_table_size;
- s2->b_back_mv_table = tmp_mv_table += mv_table_size;
- s2->b_bidir_forw_mv_table = tmp_mv_table += mv_table_size;
- s2->b_bidir_back_mv_table = tmp_mv_table += mv_table_size;
- s2->b_direct_mv_table = tmp_mv_table += mv_table_size;
- }
-
- if (s->p_field_select_table[0]) { // MPEG-4 or INTERLACED_ME above
- uint8_t *field_select = s->p_field_select_table[0];
- s2->p_field_select_table[0] = field_select;
- s2->p_field_select_table[1] = field_select += 2 * mv_table_size;
-
- if (has_b_frames) {
- for (int j = 0; j < 2; j++) {
- for (int k = 0; k < 2; k++) {
- for (int l = 0; l < 2; l++)
- s2->b_field_mv_table[j][k][l] = tmp_mv_table += mv_table_size;
- s2->b_field_select_table[j][k] = field_select += 2 * mv_table_size;
- }
+ s->p_mv_table = mv_table;
+ if (has_b_frames) {
+ s->b_forw_mv_table = mv_table += mv_table_size;
+ s->b_back_mv_table = mv_table += mv_table_size;
+ s->b_bidir_forw_mv_table = mv_table += mv_table_size;
+ s->b_bidir_back_mv_table = mv_table += mv_table_size;
+ s->b_direct_mv_table = mv_table += mv_table_size;
+
+ if (s->p_field_select_table[1]) { // MPEG-4 or INTERLACED_ME above
+ uint8_t *field_select = s->p_field_select_table[1];
+ for (int j = 0; j < 2; j++) {
+ for (int k = 0; k < 2; k++) {
+ for (int l = 0; l < 2; l++)
+ s->b_field_mv_table[j][k][l] = mv_table += mv_table_size;
+ s->b_field_select_table[j][k] = field_select += 2 * mv_table_size;
}
}
}
@@ -541,6 +502,44 @@ static av_cold int init_buffers(MPVMainEncContext *const m, AVCodecContext *avct
return 0;
}
+static av_cold int init_slice_buffers(MPVMainEncContext *const m)
+{
+ MPVEncContext *const s = &m->s;
+ // Align the following per-thread buffers to avoid false sharing.
+ enum {
+#ifndef _MSC_VER
+ /// The number is supposed to match/exceed the cache-line size.
+ ALIGN = FFMAX(128, _Alignof(max_align_t)),
+#else
+ ALIGN = 128,
+#endif
+ DCT_ERROR_SIZE = FFALIGN(2 * sizeof(*s->dct_error_sum), ALIGN),
+ };
+ static_assert(DCT_ERROR_SIZE * MAX_THREADS + ALIGN - 1 <= SIZE_MAX,
+ "Need checks for potential overflow.");
+ unsigned nb_slices = s->c.slice_context_count;
+
+ if (!m->noise_reduction)
+ return 0;
+
+ if (!FF_ALLOCZ_TYPED_ARRAY(s->dct_offset, 2))
+ return AVERROR(ENOMEM);
+ char *dct_error = av_mallocz(ALIGN - 1 + nb_slices * DCT_ERROR_SIZE);
+ if (!dct_error)
+ return AVERROR(ENOMEM);
+ m->dct_error_sum_base = dct_error;
+ dct_error += FFALIGN((uintptr_t)dct_error, ALIGN) - (uintptr_t)dct_error;
+
+ for (unsigned i = 0; i < nb_slices; ++i) {
+ MPVEncContext *const s2 = s->c.enc_contexts[i];
+
+ s2->dct_offset = s->dct_offset;
+ s2->dct_error_sum = (void*)dct_error;
+ dct_error += DCT_ERROR_SIZE;
+ }
+ return 0;
+}
+
/* init video encoder */
av_cold int ff_mpv_encode_init(AVCodecContext *avctx)
{
@@ -1059,20 +1058,19 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx)
ret = ff_mpv_common_init(&s->c);
if (ret < 0)
return ret;
- ret = ff_mpv_init_duplicate_contexts(&s->c);
+ ret = init_buffers(m);
if (ret < 0)
return ret;
-
if (s->c.slice_context_count > 1) {
- for (int i = 0; i < s->c.slice_context_count; ++i) {
- s->c.enc_contexts[i]->rtp_mode = 1;
-
- if (avctx->codec_id == AV_CODEC_ID_H263P)
- s->c.enc_contexts[i]->c.h263_slice_structured = 1;
- }
+ s->rtp_mode = 1;
+ if (avctx->codec_id == AV_CODEC_ID_H263P)
+ s->c.h263_slice_structured = 1;
}
+ ret = ff_mpv_init_duplicate_contexts(&s->c);
+ if (ret < 0)
+ return ret;
- ret = init_buffers(m, avctx);
+ ret = init_slice_buffers(m);
if (ret < 0)
return ret;
--
ffmpeg-codebot
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".