From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id CD2384F1FF for ; Sun, 15 Jun 2025 17:03:27 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 1017B68DA0A; Sun, 15 Jun 2025 19:58:57 +0300 (EEST) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 829FC68D9FB for ; Sun, 15 Jun 2025 19:58:53 +0300 (EEST) Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-234d366e5f2so47387335ad.1 for ; Sun, 15 Jun 2025 09:58:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750006731; x=1750611531; 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=a/cGuD1n0wgp1okkTfcQrOIPnTcNorPmmNbeo/bTXHM=; b=XQ212wyYcKqi8nqlQAfWFNUGGZpqaK9uwuaqej2jkiYZtqUwZmyThkp35043rOj2wG NAaegB7B2a/mMgQPF1NoZuaNkIi0+W5LaP5MtdSGQnAXZofr3mIppIOEKR5pGyL7wwu1 abq3GUW1LLRQ/fTYBtRkw1Jzs70oqShUvr/Evz1WBSgioVJbM84bov7wmgAgWWNrlp9r ysFvLrmAigSoH9QoGxaqSUvK138C7UfXeTAcuK74+JAg+CAVN6zr9Zl+K+296umsuKn+ Uc8OYDlMYiLoFZWbdmJOfsED0yXulei+q3KP1zRjhNiUf1yTP3D/t8bHRAKleJsVvIKw gfeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750006731; x=1750611531; 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=a/cGuD1n0wgp1okkTfcQrOIPnTcNorPmmNbeo/bTXHM=; b=Y17sHkeRuYgr/XHJ/L8Wz77afxuV8o9+cfCIqDUcTXo+dZNrW87PHa3u7uYumXeTh6 jMTlhqIvaIk6Rg3O4fDT66AbvDyt0uC+mGQUKYHT83GGdlo3FgSlnleTg9Oh8iX3NFhK X9bk8XFBvm4GSB3O99M2VcZVsCWuI36zYAQveIVAVlPO4RhiZjzoPSgB502HY9rfSeXr +gdlYdI5VvrPpCn7aT+GH3QAFbLz3qlnGvdAhciuPH4DMBOYp23jirnBAWgo/7nfCNBM OSJtAFcxxNJ5/9iEIVFc5a49Ss2Gn7GbNiJeVZCc0wqm5yJTxmzNRKeMsQemKzXlmMZ8 lMwg== X-Gm-Message-State: AOJu0YxUBSPP21+FKE4S0w901/OL1pnmx3fpVBQHmzKmHXfFhQ73ZfjF tCd3CwkAGJBKfdNHfmVXL5rMK7ZYUAxoNFwJQeMVc0hDYjW+sRtRK9Xyqvqwog== X-Gm-Gg: ASbGncti0L7xHqXLe7yhv21gilgaioUK6EQi4WPxRVTuUkJ40jG2Xcc9S9LWO8Fqw2y TlJ11Y7KrTL9fhRnWv8Zufv5wSB4fx7RUtRPV4DpOGoeeLtvLUJVEQ3Y3SDZec46qldiIiuOjhn eMWQeiuczJ3Z+MlSoGwn6dPArN2YJCvMYLnnpWTo7Q0oqdEkbDAq/9OZtvZOi7mYDxKws8pu/yZ ShBXKBg6s9DO29b7XOlrsfyQ88g5Bevqhut2slz5tSxGwzMo6NB7/uT2NI9Jb8BL54KKiFL2pof pQsa1EI2g76pwnMTy2kbFq9Xl4WhOcfSjZV32iIZwHQRZD6TV6Uc9WRHD1IaexbRGoxp9UtS+Lw 5dOQtSG9TESu3RxdT X-Google-Smtp-Source: AGHT+IEObGVwe6r97lPAuzLYRhUpLX5OeHKehTiDaZjeSXJ5v8tR2ab1PEz44+u9uPehid4XJ8UH7Q== X-Received: by 2002:a17:903:8c8:b0:234:ed31:fca8 with SMTP id d9443c01a7336-2366b3ac384mr94635595ad.27.1750006731312; Sun, 15 Jun 2025 09:58:51 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2365d88c1f5sm46151035ad.25.2025.06.15.09.58.50 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Jun 2025 09:58:50 -0700 (PDT) From: Andreas Rheinhardt X-Google-Original-From: Andreas Rheinhardt Message-Id: <4370510ba22f7a3198adca2ec241041a4b6f0f9d.1750006480.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Sun, 15 Jun 2025 16:54:34 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 43/47] avcodec/{ituh263, mpeg4video}enc: Simplify out-of-slice DC prediction 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 Cc: Andreas Rheinhardt Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Andreas Rheinhardt Now that every slice (and therefore every thread) uses its own DC array, one can simply set the out-of-slice DC values to its expected values (this is not possible for the decoders due to error resilience). Signed-off-by: Andreas Rheinhardt --- libavcodec/h263enc.h | 1 + libavcodec/ituh263enc.c | 21 ++++++++++++++++----- libavcodec/mpeg4videoenc.c | 32 +++++++++++++++++++++++++++++++- libavcodec/mpegvideo_enc.c | 8 +++++++- 4 files changed, 55 insertions(+), 7 deletions(-) diff --git a/libavcodec/h263enc.h b/libavcodec/h263enc.h index 63af3a576f..20e0c57326 100644 --- a/libavcodec/h263enc.h +++ b/libavcodec/h263enc.h @@ -27,6 +27,7 @@ const uint8_t (*ff_h263_get_mv_penalty(void))[MAX_DMV*2+1]; void ff_h263_encode_init(MPVMainEncContext *m); +void ff_h263_mpeg4_reset_dc(MPVEncContext *s); void ff_h263_encode_gob_header(MPVEncContext *s, int mb_line); void ff_h263_encode_mba(MPVEncContext *s); diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c index 9a8671588c..d1d07bc5f8 100644 --- a/libavcodec/ituh263enc.c +++ b/libavcodec/ituh263enc.c @@ -361,6 +361,22 @@ static int h263_encode_picture_header(MPVMainEncContext *const m) return 0; } +void ff_h263_mpeg4_reset_dc(MPVEncContext *s) +{ + int16_t *dc = s->c.dc_val; + + // The "- 1" is for the top-left entry + const int l_xy = s->c.block_index[2]; + for (int i = l_xy - 2 * s->c.b8_stride - 1; i < l_xy; i += 2) + AV_WN32A(dc + i, 1024 << 16 | 1024); + + const int u_xy = s->c.block_index[4]; + const int v_xy = s->c.block_index[5]; + int16_t *dc2 = dc + v_xy - u_xy; + for (int i = u_xy - s->c.mb_stride - 1; i < u_xy; ++i) + dc[i] = dc2[i] = 1024; +} + /** * Encode a group of blocks header. */ @@ -606,11 +622,6 @@ static int h263_pred_dc(MPVEncContext *const s, int n, int16_t **dc_val_ptr) int a = dc_val[-1]; int c = dc_val[-wrap]; - /* No prediction outside GOB boundary */ - if (s->c.first_slice_line && n != 3) { - if (n != 2) c = 1024; - if (n != 1 && s->c.mb_x == s->c.resync_mb_x) a = 1024; - } /* just DC prediction */ if (a != 1024 && c != 1024) pred_dc = (a + c) >> 1; diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c index 27c0ee475f..1b8ccad380 100644 --- a/libavcodec/mpeg4videoenc.c +++ b/libavcodec/mpeg4videoenc.c @@ -145,6 +145,36 @@ static inline void restore_ac_coeffs(MPVEncContext *const s, int16_t block[6][64 } } +/** + * Predict the dc. + * @param n block index (0-3 are luma, 4-5 are chroma) + * @param dir_ptr pointer to an integer where the prediction direction will be stored + */ +static int mpeg4_pred_dc(MpegEncContext *s, int n, int *dir_ptr) +{ + const int16_t *const dc_val = s->dc_val + s->block_index[n]; + const int wrap = s->block_wrap[n]; + + /* B C + * A X + */ + const int a = dc_val[-1]; + const int b = dc_val[-1 - wrap]; + const int c = dc_val[-wrap]; + int pred; + + // There is no need for out-of-slice handling here, as all values are set + // appropriately when a new slice is opened. + if (abs(a - b) < abs(b - c)) { + pred = c; + *dir_ptr = 1; /* top */ + } else { + pred = a; + *dir_ptr = 0; /* left */ + } + return pred; +} + /** * Return the optimal value (0 or 1) for the ac_pred element for the given MB in MPEG-4. * This function will also update s->c.block_last_index and s->c.ac_val. @@ -737,7 +767,7 @@ static void mpeg4_encode_mb(MPVEncContext *const s, int16_t block[][64], int i; for (int i = 0; i < 6; i++) { - int pred = ff_mpeg4_pred_dc(&s->c, i, &dir[i]); + int pred = mpeg4_pred_dc(&s->c, i, &dir[i]); int scale = i < 4 ? s->c.y_dc_scale : s->c.c_dc_scale; pred = FASTDIV((pred + (scale >> 1)), scale); diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 1f581ec500..1f51f237fa 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -3140,6 +3140,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ if (CONFIG_MPEG4_ENCODER) { ff_mpeg4_encode_video_packet_header(s); ff_mpeg4_clean_buffers(&s->c); + ff_h263_mpeg4_reset_dc(s); } break; case AV_CODEC_ID_MPEG1VIDEO: @@ -3149,8 +3150,13 @@ static int encode_thread(AVCodecContext *c, void *arg){ ff_mpeg1_clean_buffers(&s->c); } break; - case AV_CODEC_ID_H263: +#if CONFIG_H263P_ENCODER case AV_CODEC_ID_H263P: + if (s->c.dc_val) + ff_h263_mpeg4_reset_dc(s); + // fallthrough +#endif + case AV_CODEC_ID_H263: if (CONFIG_H263_ENCODER) { update_mb_info(s, 1); ff_h263_encode_gob_header(s, mb_y); -- 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".