From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 956F04AB2D for ; Wed, 12 Jun 2024 13:52:33 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7356068D96E; Wed, 12 Jun 2024 16:51:52 +0300 (EEST) Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02olkn2020.outbound.protection.outlook.com [40.92.50.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 468AC68D989 for ; Wed, 12 Jun 2024 16:51:50 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JtiGzkkOYv/eGeIN4BkwYhXPhTOUzOPY0DEEqcWG+evBL1LxHCSXcVzwpbep2olnkbn+Cj7ROJIis0Nc+JcrST8WpOodiXEYHwkr199W5tf6qHSJDqhZN1RvDviB8tf7JHf0zNBrX5vlY989GdGAuefTLa2AxcMe4E4WaRWJwJzj58CtYo3jX8sbLvtS6hIHfRdEz6dLUCo+3CZ2uLwTjwtXgZn5SE3zSD05cnX4vkI6zn6MXkhhMUCZ/VvxjWBc9uBIRgaVHMrX0Nh5B4EeU1PhTUNxpUuYMzgDr/Kku0jnmP1Vjp+7/rogR0k6DSuRloR33XaChL3/DzRE+xbnBA== 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=7smupFfl8abAAfXT7Gbr9kE1oQf8rkHSgL72A2RVj0s=; b=Kk360HefP77xBedMl5F9u6v0Ru5PLNlLvPat/wiwOdcGxCqXSWtbmn7GeZmV2yXLfRmMmGow+GawUY+qukDCNsABJ4cjHWp4saxcGnYoWRJ/+8IeTm2/IiAcQ8jEb2+2Ke+nu89QO7035Yu6inS+o1oFJGZ/dmslzpvjc25wGRYT7Bu7+g8/zBVzEasSU/3SJKCUsNqXSdUrb1hop64C4vTpN6bjJbVdGf4Qu1jo1Nd5OYw9hmryQbzMuH1ZHfSYZZsbNE5OGondI9Og7rxi6/UMORRipgwxxaTJ7tvFNZE/4FT84dfEgKhjM8bAR90VF+ztfuPtPbzL0cMhmoBtmg== 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=7smupFfl8abAAfXT7Gbr9kE1oQf8rkHSgL72A2RVj0s=; b=EPCV9ztxg/DY3JSFvx///GNCZf6v5b2+O6hhoG+3eM91BaIUX5nqSqBTjw0V2g8thPgu0RE3CI2E8b7e0xBRGzpmsXKpx/Xw2Pvqh9Y9fnICce7bTZOlVqrFdedhCkO66/25lr/2n7Z/2J16pMRpv4YUhCEzFAYUpkbWIIElN/ayUixTH+9HCqFbKzdPxnWTTwMtwgn6SteuFjpmF5sxSUiW0vBO7wgkZS8Mz9/uqt1rg6/ez0TFcsZ80rBhfv81xoLVt3gs3KE0ugKY7U7EcJSNPzhLY3uP6aOz7H91QLTU0iPik2e22p01uF3OyhyQwV4wZD/eMbeCT+4IErw18Q== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS1P250MB0479.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4a4::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.36; Wed, 12 Jun 2024 13:51:48 +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:51:48 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jun 2024 15:48:15 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [WRCwqnUnEM21bC1YwdWsGdgVSGuqrNY+CKkv9H6YDDE=] 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-18-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS1P250MB0479:EE_ X-MS-Office365-Filtering-Correlation-Id: c6477dee-0230-4caf-91c9-08dc8ae6cdcf X-Microsoft-Antispam: BCL:0; ARA:14566002|461199020|440099020|3412199017|1710799020; X-Microsoft-Antispam-Message-Info: OXsVXKnVpFgMpI5OcrAiGl/DWMomNNxIix++AgFha6fTr782lj6oTdHEbIzSFWQFrMtRPtU9R8040+1G5sGam+h8IRgxw8q7vu3Wa46qHDFgqIhIDtGBB/CYOSeUzo0OEKKl8v/KBT/aig2kG7/J7wGfPxlgJYWSSuSPODBdpXSbXi5UpA6KiaKoUEx6ahFQmYob6VkC8D64zXVK62oKBOmVhg1Ar1cpn1d1K8xL0bgkkXBtHal4flVVyDgMoMAcvakH9qVaGsVKhrkWJCiypofdUFkN6LGevzpCzIboGaBba8AvWuF4rcscgAEtCWWVjtrb0z8qtCL86c8e59Qk4YMCum3OkZPyIJyUOGWtFm/0Uz2jfyoKpMoPODedXVHYfhdiomi6it8oF+13Nx4NIGhy7QbpVmTvKC95NXclJgnXWa5kw6AxoR3irIFbYSlSid5hLvRIgrmoKBischDCpPWXH80NT1PwEmDGWtgViOX0EoMdrokoWciNFhrUcYohFmQ9a0EqVcjTHIJrUcOpvU9gkW4LsL+HzMnRb3xstPB3NX9zoUvPvq4cb+gKuqPkRz+0BbKrmZ+VMG/W0EWjSlY7ZYRBvzD3wqShUkFq7i04TW5dOitwvQEqf/k4jbQN X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?308Ui+BMpdY+hrOqEzBgmzTuReVmPUD5ngqvWnQV2xS7P7YiS0cq/0OAYX14?= =?us-ascii?Q?x97nJGiHteTPdwu/yUn6u0N/KMGRE4LWmhar11xELGg5c3O+zLPoW8gQXsch?= =?us-ascii?Q?rLE4kGXmRKOo3Bes9HPb+2i1T4p5mHAdQrOGb7XXFTcW8FEOyJcRorgCITiL?= =?us-ascii?Q?i+JcEemnFsjVuEvkD7IMVymGmSeibUu3EOTQAavi+3KDwxjQQSy+Rho0+Euw?= =?us-ascii?Q?kcoMg0HZGcOpt7kBxAFdR7A+C218am1tY/t32FruWD+hDgIMtQ7ppAozOpIz?= =?us-ascii?Q?p/TLe6dNqL2iajSUGtOedLw1gY1hS8qU7qZKOfEEPRO9FjR0/e5xTWEQXXFB?= =?us-ascii?Q?Z2JTjNTROmGbwmy9cnVwZ+1uW3cZs2AdC0Oo6FZEQZxZVR+yyhfxHTtqINIy?= =?us-ascii?Q?Vl6r2OE06ZzvP5coikBqozNyvVM+JMl57skkesvmsarLMsngpzDVzNRkQSD4?= =?us-ascii?Q?l1hntHZDJkRQLU1fZocfhqSm0YcbUgjF41OOLQV6rHc5NWAWl4uZzqODZOei?= =?us-ascii?Q?jkdhIkgISKX2tQ5fDrBWL7ET0GlxyAsg3QMhMwIxe7CDq9bVXIity+MsbfNt?= =?us-ascii?Q?VRPV4lJWRTzf5cxEbM6G/Nxtpm07EcIoQCEYwqKwUzn6Re4JN+JvoAQ/vX0T?= =?us-ascii?Q?wezNUKIs0PbQaWmzE8ZzBkcdzmSizu9/BcFWmXSsaOHAeGeHHic6ZeCcQ7NQ?= =?us-ascii?Q?j8WrpQgdV63XEzeRs8wKHzGiq/hgPSpIH9GBMDS5KgFaRZ+aJSn4tah2bdGy?= =?us-ascii?Q?HkvnDPUNmycRs1pJtXte94c+O637AnHZgOT306BY/3PYUiRMHfLgFZuC6Upu?= =?us-ascii?Q?EYb40P2PDm4aBHpRxJKiqY/iPj17XG20kYJGlNIA93qY8z6ceJqjuB8lhUo0?= =?us-ascii?Q?0qLnrLCipCyf0zWMLIBJGoOk3SLGUzoXlr/qarJGaZ7Ad2Suaudh/WBEzLr4?= =?us-ascii?Q?IfckGGelxBxEnZ1cFFQ+2IO61OAalegU5otdz++4fuP+2Uw5WgaOpNxYxuUQ?= =?us-ascii?Q?V5p00G8Oc+Ru9gxaoMgSQub3Kery2C12oXjCcV0WPps61ad0ov9avqOO0nG1?= =?us-ascii?Q?XFfIIgNOa6VMN7FgPDKW2k1qwheEFI+dfNFslMZloZRvG6iIet/fsiljbZ8n?= =?us-ascii?Q?qNp/ssBE7bcXMCXCnBzRYmWjJhNbfC50P5FzVVLDY7Y1C/MRUGGA20wEfQX/?= =?us-ascii?Q?G4REBkMONAsqbsTVw2ro/DU0PHar6+eqGBbdLWBJdozpIizpzcBsTvtAbRpI?= =?us-ascii?Q?w46ErVb5tSFBedShH4614qRQcQTUxwIHDlF5Kk8LiQ=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c6477dee-0230-4caf-91c9-08dc8ae6cdcf 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:51:48.1421 (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: AS1P250MB0479 Subject: [FFmpeg-devel] [PATCH 19/57] avcodec/dvenc: Check for availability of interlaced dct cmp func 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: Not every type of comparison function implements every function. Signed-off-by: Andreas Rheinhardt --- libavcodec/dvenc.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/libavcodec/dvenc.c b/libavcodec/dvenc.c index 3afeedbb87..08ed53d823 100644 --- a/libavcodec/dvenc.c +++ b/libavcodec/dvenc.c @@ -70,7 +70,6 @@ static av_cold int dvvideo_encode_init(AVCodecContext *avctx) { DVEncContext *s = avctx->priv_data; FDCTDSPContext fdsp; - MECmpContext mecc; PixblockDSPContext pdsp; int ret; @@ -95,19 +94,24 @@ static av_cold int dvvideo_encode_init(AVCodecContext *avctx) ff_dv_init_dynamic_tables(s->work_chunks, s->sys); + if (avctx->flags & AV_CODEC_FLAG_INTERLACED_DCT) { + MECmpContext mecc; + + memset(&mecc,0, sizeof(mecc)); + ff_me_cmp_init(&mecc, avctx); + ret = ff_set_cmp(&mecc, mecc.ildct_cmp, avctx->ildct_cmp); + if (ret < 0) + return ret; + if (!mecc.ildct_cmp[5]) + return AVERROR(EINVAL); + s->ildct_cmp = mecc.ildct_cmp[5]; + } + memset(&fdsp,0, sizeof(fdsp)); - memset(&mecc,0, sizeof(mecc)); memset(&pdsp,0, sizeof(pdsp)); ff_fdctdsp_init(&fdsp, avctx); - ff_me_cmp_init(&mecc, avctx); ff_pixblockdsp_init(&pdsp, avctx); - ret = ff_set_cmp(&mecc, mecc.ildct_cmp, avctx->ildct_cmp); - if (ret < 0) - return AVERROR(EINVAL); - s->get_pixels = pdsp.get_pixels; - s->ildct_cmp = mecc.ildct_cmp[5]; - s->fdct[0] = fdsp.fdct; s->fdct[1] = fdsp.fdct248; -- 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".