From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTP id AC8034AB2D
for <ffmpegdev@gitmailbox.com>; Wed, 12 Jun 2024 13:54:15 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DC3FA68D9EE;
Wed, 12 Jun 2024 16:53:38 +0300 (EEST)
Received: from EUR04-DB3-obe.outbound.protection.outlook.com
(mail-db3eur04olkn2020.outbound.protection.outlook.com [40.92.74.20])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0FBF268D9DA
for <ffmpeg-devel@ffmpeg.org>; Wed, 12 Jun 2024 16:53:33 +0300 (EEST)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
b=T7FLSAaCdtk9A0+ujvEcEif1PDoBVoa84lpDMABOvQ3qF7GIUyTwSapm+N7mEDn7bOv31X2kF69rmw0NwOy1VW6779QqV4z3Ir3+R02rQpnhThz3itMyVmmQtzlCWYHcmoplgiAH1cpJjmsEzusYEekE0C6Aq+qynNg9xGvC2Il13pAdCtQEiKe4qBzr/upZ1ZkNnK0C6ZM+Vjhh0mcFH40bB04P30eA3vgKMVXugT7+jLxfG4yHTPCFNofYLQiCx8xOiOBvnLpqh75/m+CB4b5OMWpeooqvwRrLB5JgxNP9Tv+vl715iR0P3GIpjAALlEyIQEa6jrgjxugR9UKJYA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;
s=arcselector9901;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;
bh=ys9BwGSnCi7OUMXa57N19bV5suqNCbS98HeVVM97Vfw=;
b=JtqEeLlIUWSptOdPWaiVln/l4aGUj0BjaraWvdg5HGAoGEAPyaJlq5oCgj74+SiObnCT9egFvRXINSOuNlNB1i2ZrkQlcyLVZOZFLSa4DYIjehfCw6NPCK7ayJj2i+G0kfX1bR8LuDFBoVyn/e0U1Vl++gXDR/uxCE6TTDC3nEmYqW8Ut0a9CJdc87PVbIwyx1IKXBB2ccX5bm1CaPZ01Up2DfJqV0nDFS/Z+ZQEYBaNC60qLzlJV7VxTLcoRo3PpkU4tP4lo2zEp/BTajSmtfsy1vnIbHgfeCJF2sYebcfffoP7BWzIJgU3aa7Hv6hG+rv2kRqIhtwrvbRwrvIw+A==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none;
dkim=none; arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com;
s=selector1;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
bh=ys9BwGSnCi7OUMXa57N19bV5suqNCbS98HeVVM97Vfw=;
b=AOKQu/05bYRugy/Hxe77srS+q2A2K4EE5eNZMwjDEk6e+bw1voJdx7guOvOtZ9sdksiUxc3NZMApMyQ2oAGfGISXCFyYr/YmvvvD+1/S1ss1g8Nw2n8G9zVuHpEZLtBTlf3cnQMzYAKoBrXAAT0MJeoW8JNLARDL/lAKcu7B5zcqb32vq/LGEUAwqH0GU0NJeTng2sV2t8z/eA9KFT3MXHQgmDRXoKsazKrqYFvwJmhKnVWKlYZDTyjO9OprEGS5/GwYxFmJPrs/wxF9jwlxaomFo7TOMWGOhydaD6U99aDV4gqjcSD24Hllh9Brm6HYLMEabytmA6n8OEzr0jqsSw==
Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17)
by AS8P250MB0204.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37b::9) with
Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.37; Wed, 12 Jun
2024 13:53:31 +0000
Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM
([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM
([fe80::d6a1:e3af:a5f1:b614%3]) with mapi id 15.20.7633.036; Wed, 12 Jun 2024
13:53:31 +0000
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
To: ffmpeg-devel@ffmpeg.org
Date: Wed, 12 Jun 2024 15:48:26 +0200
Message-ID: <GV1P250MB0737009ACE1E12912C2971E58FC02@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM>
X-Mailer: git-send-email 2.40.1
In-Reply-To: <GV1P250MB073785E3B3B4EEEE52B2FC1E8FC02@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM>
References: <GV1P250MB073785E3B3B4EEEE52B2FC1E8FC02@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM>
X-TMN: [oGWoDeRzjiA8omZqZYvLba2HBzcOV++O+/mhDqLQM9w=]
X-ClientProxiedBy: ZR0P278CA0189.CHEP278.PROD.OUTLOOK.COM
(2603:10a6:910:44::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM
(2603:10a6:150:8e::17)
X-Microsoft-Original-Message-ID: <20240612134853.2102377-29-andreas.rheinhardt@outlook.com>
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0204:EE_
X-MS-Office365-Filtering-Correlation-Id: 132f558b-37b5-4834-3d6b-08dc8ae70b6c
X-Microsoft-Antispam: BCL:0;
ARA:14566002|461199020|440099020|3412199017|1710799020;
X-Microsoft-Antispam-Message-Info: Lkoft+blJjlELIexR685UP5gEx/s5Eb1haWY++sdHTwWBDUbXGIHtY4hK6/L44EuDPdsk/avzWS3uj3PSceTDzDTsA+y3TWNxnWclMiEQ+2Ek4drpi2p6m4AQFCSWMmtx3cXMcLghO7M+/MUgNoXwrpLYk7hzOUt/PaWDEr+VdejwUAqV3YCBdibYyEc/x/pdCMw9o7w1exIFIeRPDy+SRdxLWnnw/eyIFWN5ZQqWQDudXaNyV7CmczACzyaVG5HDMS4JXroNsvDxoJX41zdIiTuosRelBtUVJ49nYjA5qNvuNwU7c+yd09dfrOVy6SxFW0jbLBCOFyybta6kGapqVXDG2/qsiJp4ZCtryWnwYyDPZhgOgyevNT5QKohZE+Wau/haXSFFbLAbpmUuo1fnAEKy7NkX2i5C16jNTrcVJvMyOVE9Bw4G02XgBENASA4cnOcxjj/CYLXv9KAs/77hmBN7YkKoIwdxUWLJDmYMvFYH9tDb44P8hOgyJu3a05rJKxSOeykgwXDhhJl+2YDRWnhunZ2LO/Tkl+RJGIJUKuQuWkqfOeDa+k5Gf81Qc2meIpyaM1HpACuYUFx8g2aZV+qgPQe2QQmciYtcxapBUl/w+iavOYTcP97tPKNc3Ak
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Pgf9V/0S5XD868ivwyVBGUPdDfnSZWiWrPOe8gqpX3oyL9WpLia1VGrUE7wl?=
=?us-ascii?Q?XG+SXa4RCwi5e1gx+t5uDD/rvc0zX+QIj3fluPAZfwQ+uMk9yWYG8C38W5gi?=
=?us-ascii?Q?ERh8UvLbiwR2nDOT4nHG3rDVO0P/xw86jU7eG7ecXqtKDlnGUJB/VG2Sk+F0?=
=?us-ascii?Q?tsA8xtph5n98zs+ERgAEEzH3751H1ncV5L3auwYs7rlxXhyQdlYg1AjMo94g?=
=?us-ascii?Q?0g8rcyuqZVqt9Sj5HYtz4aon2SV3zvIRABauluWPBhXGtTDFU93tCReCCFVs?=
=?us-ascii?Q?ULNsQMcgZskvmw3oed0/Yb93hJNqOsrYGNtaRZdgy4iwWUCaBmjh3krUv/ap?=
=?us-ascii?Q?/Iw5K/rEEi2m3kG/UlaKWGJ3KN6vLbh10bDfsmkJSQNbYFW7ca00PDuTmul7?=
=?us-ascii?Q?Z4FbRADuDGzJcC0LzQx4q56PbTS+1/pc6L8NJvKRL/pNpzcHWJVlbBe1kzzF?=
=?us-ascii?Q?t41ZGQIbpkWiofc8Tsug2MVCH5TgjJkVPs6S/EpkkrDI6HvcuteFbK/o4WAx?=
=?us-ascii?Q?7bAyre8OtctVPMWV8qQflFlcBM9owWbM1iqTxf1+IzhrTX7dpz7yFTTfpFhU?=
=?us-ascii?Q?wF5PNNeqDVFupNqvGXxeo04iEx9HRPEcVQxiGtFAVyBtTv0ZLxvRhHdGGLqW?=
=?us-ascii?Q?APe53daCaA/EJT/YLrCE5oSpDeY66z/hK8eApguPjt8euZ9dPxD0fUwNYLNs?=
=?us-ascii?Q?1CSiXNNDFTCWvBWx+Wi4I6LGooP9mUH0EFDnLclMn/vqnVJ4pbLwBVe2p6mR?=
=?us-ascii?Q?dFlCHasu9vt7MIBVpe2J4kAv4LyMcuI3C2fzW2R4CYEZEV/hiO3ykiBzl7FK?=
=?us-ascii?Q?rdFZrZcGggn2XxsjtujPheXd0V8C0Ikmk3K3odm89jk33xn4AFzfu2/LnHSa?=
=?us-ascii?Q?jKQZeLhMqt2fSzl390djlyAAcH5OsVoNxZqD7ygS/dMT2XZrwy15erzQ183g?=
=?us-ascii?Q?3Oaur6j+bGMaJibhSQfEgQf1ZjvqMN2J7IwkMivyMkxtmzW2gqB1NUisFaZ2?=
=?us-ascii?Q?sgy46ELGGy4mtoS7Tp0iXRyH9xfvtk4HDyiyzBk8sv37+PBCb5cOsp0IeJuK?=
=?us-ascii?Q?m2N85cF+IWZeOZPNpqi+rfYwr+rwa9PoF5prAwFCj4PfnEJkmidXshMfnSBE?=
=?us-ascii?Q?zm5HXb5ZTOm4oGofbUqUvv+zBbFjUfPxb6x+TQ/UVkQgnJt1wk5Hd2DXjau8?=
=?us-ascii?Q?RQWXYr7ckZILlmfW9xPzNI/CBVRgZZame3wIf26R8Ci8GZnRXNxMjnuWD7zc?=
=?us-ascii?Q?LVs7B5KMQbyGJoIl+uZxC+KalLxBvrWtiwSvfSDibg=3D=3D?=
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 132f558b-37b5-4834-3d6b-08dc8ae70b6c
X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jun 2024 13:53:31.5793 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa
X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8P250MB0204
Subject: [FFmpeg-devel] [PATCH 30/57] avcodec/mpegvideo_enc: Initialize
qscale tab for all codecs
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/GV1P250MB0737009ACE1E12912C2971E58FC02@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
Calling it is the first thing ff_clean_h263_qscales() and
ff_clean_mpeg4_qscales() do anyway.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavcodec/h263enc.h | 1 -
libavcodec/ituh263enc.c | 2 --
libavcodec/mpegvideo_enc.c | 6 +++---
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/libavcodec/h263enc.h b/libavcodec/h263enc.h
index cd5ded1593..6e07440b30 100644
--- a/libavcodec/h263enc.h
+++ b/libavcodec/h263enc.h
@@ -32,7 +32,6 @@ void ff_h263_encode_mb(MpegEncContext *s,
int motion_x, int motion_y);
void ff_h263_encode_mba(MpegEncContext *s);
-void ff_init_qscale_tab(MpegEncContext *s);
void ff_clean_h263_qscales(MpegEncContext *s);
void ff_h263_encode_motion(PutBitContext *pb, int val, int f_code);
diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c
index 8d0c4147bf..b1fe4e241e 100644
--- a/libavcodec/ituh263enc.c
+++ b/libavcodec/ituh263enc.c
@@ -274,8 +274,6 @@ void ff_clean_h263_qscales(MpegEncContext *s){
int i;
int8_t * const qscale_table = s->cur_pic.qscale_table;
- ff_init_qscale_tab(s);
-
for(i=1; i<s->mb_num; i++){
if(qscale_table[ s->mb_index2xy[i] ] - qscale_table[ s->mb_index2xy[i-1] ] >2)
qscale_table[ s->mb_index2xy[i] ]= qscale_table[ s->mb_index2xy[i-1] ]+2;
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 73e1a69490..6d26b2d619 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -237,7 +237,7 @@ void ff_write_quant_matrix(PutBitContext *pb, uint16_t *matrix)
/**
* init s->cur_pic.qscale_table from s->lambda_table
*/
-void ff_init_qscale_tab(MpegEncContext *s)
+static void init_qscale_tab(MpegEncContext *s)
{
int8_t * const qscale_table = s->cur_pic.qscale_table;
int i;
@@ -3542,6 +3542,8 @@ static int estimate_qp(MpegEncContext *s, int dry_run){
}
if(s->adaptive_quant){
+ init_qscale_tab(s);
+
switch(s->codec_id){
case AV_CODEC_ID_MPEG4:
if (CONFIG_MPEG4_ENCODER)
@@ -3553,8 +3555,6 @@ static int estimate_qp(MpegEncContext *s, int dry_run){
if (CONFIG_H263_ENCODER)
ff_clean_h263_qscales(s);
break;
- default:
- ff_init_qscale_tab(s);
}
s->lambda= s->lambda_table[0];
--
2.40.1
_______________________________________________
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".