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 EA0E64B815
for <ffmpegdev@gitmailbox.com>; Fri, 14 Jun 2024 18:27:16 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5005E68D706;
Fri, 14 Jun 2024 21:26:39 +0300 (EEST)
Received: from EUR05-VI1-obe.outbound.protection.outlook.com
(mail-vi1eur05olkn2088.outbound.protection.outlook.com [40.92.90.88])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DFCE468D6C1
for <ffmpeg-devel@ffmpeg.org>; Fri, 14 Jun 2024 21:26:33 +0300 (EEST)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
b=B+FUbOR1i7mTVZdLT8al+nV3Th2raJlRGFwhZJg5qVth3qRqdib0DwfZbip7n9QRqq4WZxsLZQsbtJbK+v2kXdCJTScHLjd9zgANFc2Vms266G/unKVi7tu2B+vQzTUq/GHte24z9NvBDyIdzE8Lh3HQLlNFSz8HoGw9qMjsaQhZgLyal1JyMfLaKRwtTzTnvbr/ytTtu8otaX9iG1JcSQwedXK97zuB1cBCb0Z31tkv6ZhiC2iMBwezzhfR9AxybsklBk+bPCU/KU6kRMxwXVtzKZlLELgrXrJoNbJ3Bq0yJHR2VtWNqgXRS/fWtudVLKdD99y8DCIh0fERTVIJ1Q==
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=Mwkn71VLTmkBZ+b8wbJ3qyEgZHXekE6fw3kN+sEEjPw=;
b=lmIqguC265AcWDgaBuG9I6GI61TUQwgBCvqWVzZNRR9disyjgVrqZsg5dhkw6TB5YkTiZvBD1zjjkW/LtCfBgHySy0Y1TodXB8SW2DmYQ1UsE5Eo/ZRALOBpB2ByRwTJ5i0q0BC+YkbVs2aBZO/GguaEuWaSvC4SQdLRJ9gALSna+L/I1U91cZn2JCfYGDRp/h+u7nVo6FU94fyz/RnQGjNsluqZ//oQC5KL2Twzs/hkD7uGKy5wOvJCIgTq/CanMQLd5E5bYVI7JSprS3dJPpTeZXS2yXb9SlUUjvXds32w7Vv5IkTGZfp9NZEt/Iqr34NvuaEYjI5VFREJswf/1g==
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=Mwkn71VLTmkBZ+b8wbJ3qyEgZHXekE6fw3kN+sEEjPw=;
b=gE6jQfNuvv27slravDdQHbGPMKH1A/ZfXLrObCadkhQvk5Vz9h+P0cNwdQ9I4A3IMzENWXg4bNd0Cy8W9aQPp1Ht1zcdp1Gm6pFsTg6I1jIe1o8dc+PrSxM9lPo0QKoSV9ztmZPTCBF1xzvlAmqSnaOVZzCqyVC6cyxn0nlssEZcI75gAU/jFsy5d5FeVfqg02tIb9kL48mWjfUDKiM3f1Mw3Zm7sDsthZgz3Cug6jSS5mloIny9OHbOIiPSIsA8fVpyKCEkOZU/XJkbkkHfNgJHnVin6SO5pLG2arczkcNdqKOH8MgFcDLmv+2ohV+chzZ1wZbDR8mxDawQSId4Lw==
Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17)
by PRAP250MB0563.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:298::22) with
Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7677.22; Fri, 14 Jun
2024 18:26: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%4]) with mapi id 15.20.7677.026; Fri, 14 Jun 2024
18:26:31 +0000
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
To: ffmpeg-devel@ffmpeg.org
Date: Fri, 14 Jun 2024 20:25:55 +0200
Message-ID: <GV1P250MB0737A1FF5C4FC82B961CB80C8FC22@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: [EjfSi419cEezsRrV7xpGo7jiHdVsYHExJBOUtl1TZ0E=]
X-ClientProxiedBy: ZR0P278CA0072.CHEP278.PROD.OUTLOOK.COM
(2603:10a6:910:21::23) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM
(2603:10a6:150:8e::17)
X-Microsoft-Original-Message-ID: <20240614182558.3088802-7-andreas.rheinhardt@outlook.com>
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PRAP250MB0563:EE_
X-MS-Office365-Filtering-Correlation-Id: 7befe87a-ba8a-430b-088c-08dc8c9f83ac
X-Microsoft-Antispam: BCL:0;
ARA:14566002|461199025|3412199022|440099025|1710799023;
X-Microsoft-Antispam-Message-Info: TFJPkRYQ7wd/Tvqxbbf1rzkZz44LJGoe7Uwe4P1WHXDI3dLvjwyJkZzcxm/SxKawyZPhYbPDBJWbjMrH7MorAPL/6wP+8oFL8m5yr82Gqpp07Ynm/09mOEu111e4BZYqKIQ4FEHPW/SurBzR2GGQcSO7J4WaJeDd7Tf7Szjw4cgUr9I66wFDNb3E5U9/1HP6uHRw9RiN312mos4LQ46UrFh8mB2+QAPvKr29NAh8U2HXeVT5Sr8OHw4MwwbrbhUc7RQGaxyE3VNhu18cNW6fioHdGp3KTzQAX3SkXNfZ6wQnhilsgI6oWWRz4aj+9sjQrc9zlZqpeIg3WaUQQ0Vh8IHff1hKbhjict4rriALpdUudoWLTaaOi85ZFPsg6e4sBrBQ0rXy1oKM0TZLajUfMzJfzcb/hp3BBa0nHX7czPRPOetKUVTqrYSBxMLNXg8ElZwt4IWhKZfQ42J5+OEVt6zLVVGozzvUgfzJ4yrquqeEY2aPczHXqGO9JPJCEDxrDyL2O6kyCWEdZuOXItPz7TwGDI2+mklYtmpXhnSz4Fl9x08i68jq2tDSHJy2Le2kg4E9JbLN6ldaiqpEpwyaL4GIhewu31fLUDaAQJeC7VvAPgNE2mRFEOcpXaEz1lxV
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?EfGx4ZjtacCGKhvYnmbPbybPS5Bhi/kSkf9RTyUyioB54UvdXo61t3SzLitl?=
=?us-ascii?Q?2viS0iBsUAqx7aqGr2pbDUAxMIDa0d4LP7Wh6/6u3MDUR4MoCNDAn3VO4QGZ?=
=?us-ascii?Q?SJ0fRmWBx0mjTnChmu61FmJNnlwyGiLq1K/1e56dbxrm9t+dRearF7iRw0Gk?=
=?us-ascii?Q?jUqqQJ10Fg+2zLXbx6MdSrRZ+szBIDxNszvgmkeDkB9CPwbt8HWia/KD3YoX?=
=?us-ascii?Q?TlN/mTrR2/4DYZRLElSt1Kr0qqfCh4b0IPJ/Am+nV20sOshhnVUPIwYfe2vr?=
=?us-ascii?Q?07s8yh6LxjbO2Dw4WyJUiCjRFlYsbMlc5CAZE8ITjEY4XpYuB0fhPQjQX9Wv?=
=?us-ascii?Q?I7rBN/PIQsqUe5alExTPMPq29E5ttR3PXl2KyJ5JT5bL+L2gFEMEvTwrSyrg?=
=?us-ascii?Q?6Z4FCsVe7PR3w/TZ+TC2by1uWxd9UmQRKrXQkz2kiTVxoQyN5/IoXdN4PreI?=
=?us-ascii?Q?5lA9KbPEaLgv2OQ5G5BaK+svte02iyb7KmtrjJ+R3b962A8UJV4+Hdlzh2W+?=
=?us-ascii?Q?xa62Wz6hY251jJufMOzbbiQasSIj7H1/iAOY9kopIk1lUdOe7/953QYz9Owd?=
=?us-ascii?Q?61KiZX8esYuz3OPlN5wDcqTC6QiBsPqQVcyloKvMHG+9m+8dfCp4/B4FGXFF?=
=?us-ascii?Q?o6zFc9TaYCGKIODJ5urUWa9snV18KGLrR9EX7KZ09UvO7AtbiUjYrYam4uxv?=
=?us-ascii?Q?822fVSfcbqgzJGhNOElCjleeNu9X2bldAtazhD96QwDxKsjlYcr9H0HSUoa9?=
=?us-ascii?Q?b7L2/4mS0zraAC6jpHvLe2ZIKV7NksVImIRv/2Jz9YRoK6a2qUl8rJEHiGiP?=
=?us-ascii?Q?GntsNoDuA2ZOg66vVC30Hrx/jdXKhhaL/H6HFjhwaMXNPjg9hu2I7OI6JHnA?=
=?us-ascii?Q?3m4JgUy13tPxST8KyA5d279mE7ZswcwQ9dSfuPQvRBkD9BSo9M7O1JYafBOl?=
=?us-ascii?Q?RqhKsmUF/tZ7D8c2mvz1+AhPrHU3FMUyNI61uOyxdjwgCCFgENHbeNtsFWhL?=
=?us-ascii?Q?QPwBM4YYyLbbwCYRONctEIi2C2ywCLzvSqM17biTiUPB8S18Sczd4WRX/JAO?=
=?us-ascii?Q?HssYgrOjlt3zwvz+R2RihVb0otCFrxd6x9ls9nO+4YwO4q8HNjZh9NQmB5Cv?=
=?us-ascii?Q?z+l6xQLmGRz1DxNqGDKL4AbNyXGAO0wkIor7DC4CsuuK/0/rMNogmAuGUBj1?=
=?us-ascii?Q?p2QrYSReOcZdmjqCqalLRFXzToeK0qS40GD3hGxd8PD3fwKnXfdERQfiG7nT?=
=?us-ascii?Q?ZfQFemMegxnygoeZVQJarDd180pIBfinruRiypye2g=3D=3D?=
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7befe87a-ba8a-430b-088c-08dc8c9f83ac
X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2024 18:26:31.8343 (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: PRAP250MB0563
Subject: [FFmpeg-devel] [PATCH 64/67] avcodec/rv10: Use ff_h263_decode_init()
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/GV1P250MB0737A1FF5C4FC82B961CB80C8FC22@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
The RV10 and RV20 decoders use ff_h263_decode_mb() and also the
H.263 DSP and VLCs. Despite not calling ff_h263_decode_frame(),
it is nevertheless beneficial to call ff_h263_decode_init()
to reduce code duplication.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavcodec/h263dec.c | 2 ++
libavcodec/rv10.c | 19 +++----------------
2 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index 666675fcf1..19a57582ad 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -135,6 +135,8 @@ av_cold int ff_h263_decode_init(AVCodecContext *avctx)
s->msmpeg4_version = MSMP4_WMV2;
break;
case AV_CODEC_ID_H263I:
+ case AV_CODEC_ID_RV10:
+ case AV_CODEC_ID_RV20:
break;
case AV_CODEC_ID_FLV1:
s->h263_flv = 1;
diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c
index c6baaa0269..65060d4ece 100644
--- a/libavcodec/rv10.c
+++ b/libavcodec/rv10.c
@@ -346,7 +346,6 @@ static av_cold void rv10_init_static(void)
rv_dc_chrom.table[(0x1FE << (DC_VLC_BITS - 9)) + i].sym = 255;
rv_dc_chrom.table[(0x1FE << (DC_VLC_BITS - 9)) + i].len = 18;
}
- ff_h263_decode_init_vlc();
}
static av_cold int rv10_decode_init(AVCodecContext *avctx)
@@ -364,16 +363,12 @@ static av_cold int rv10_decode_init(AVCodecContext *avctx)
avctx->coded_height, 0, avctx)) < 0)
return ret;
- ret = ff_mpv_decode_init(s, avctx);
+ ret = ff_h263_decode_init(avctx);
if (ret < 0)
return ret;
- s->out_format = FMT_H263;
-
- rv->orig_width =
- s->width = avctx->coded_width;
- rv->orig_height =
- s->height = avctx->coded_height;
+ rv->orig_width = avctx->coded_width;
+ rv->orig_height = avctx->coded_height;
s->h263_long_vectors = ((uint8_t *) avctx->extradata)[3] & 1;
rv->sub_id = AV_RB32((uint8_t *) avctx->extradata + 4);
@@ -382,7 +377,6 @@ static av_cold int rv10_decode_init(AVCodecContext *avctx)
minor_ver = RV_GET_MINOR_VER(rv->sub_id);
micro_ver = RV_GET_MICRO_VER(rv->sub_id);
- s->low_delay = 1;
switch (major_ver) {
case 1:
s->rv10_version = micro_ver ? 3 : 1;
@@ -405,13 +399,6 @@ static av_cold int rv10_decode_init(AVCodecContext *avctx)
((uint32_t *) avctx->extradata)[0]);
}
- avctx->pix_fmt = AV_PIX_FMT_YUV420P;
-
- if ((ret = ff_mpv_common_init(s)) < 0)
- return ret;
-
- ff_h263dsp_init(&s->h263dsp);
-
/* init static VLCs */
ff_thread_once(&init_static_once, rv10_init_static);
--
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".