From patchwork Thu Nov 3 02:57:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 39121 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp249297pzb; Wed, 2 Nov 2022 19:58:16 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6W6UEGhtekBwV29kN8DduONvU5teMSAvY3fjdwuhISgA5eu3w8ALLQDsUxFf+HuDnj638D X-Received: by 2002:a17:907:2c72:b0:7a4:a4b4:9fcb with SMTP id ib18-20020a1709072c7200b007a4a4b49fcbmr26769333ejc.403.1667444296446; Wed, 02 Nov 2022 19:58:16 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ga28-20020a1709070c1c00b007ade20fc40csi12904255ejc.810.2022.11.02.19.58.15; Wed, 02 Nov 2022 19:58:16 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b="bGe/XshZ"; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A01B068BEE9; Thu, 3 Nov 2022 04:57:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074031.outbound.protection.outlook.com [40.92.74.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 12E9568BED3 for ; Thu, 3 Nov 2022 04:57:53 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HgnMoLKRYXzR7dJzOBCw3/iW60opVP0PCQXZJ1sOXjJOKIGD6HG20QHjjHECYZHWjzkOtJZl2q/n2WunvTTcN84jiCTiwVRQKkD30rrUUVhHJE1Zh7bNnevLYzG07zekW09wl/8Weeo2S8Lk1d1MofqgAuo03ZfEE4EiFYU4ovYFdeAeDmUwaeQUlpFhfy0GhKc+9pROvF/MV+5rSFOHwR9yeI1ikmg9HHSjWGoRk2fBJzgARAPWYp1cIz361+Zastsrseeq6BWDVPl/la6IyFf4kXq7AC7adK5to1jcqN6Lu6kX3Uy9Bsb2oB/EjlAo2TN64qDt1nneKeK9lBcx0A== 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=XMkFi05unHriMygcUmThAlwof0CqPrjiUMdsTMSziUg=; b=MAUuc5h9YvRVkvZsRw5Swxdxub9oMFXjeqgesgcSE5qglgiPRS9JPTqRxhdRklbYwFsgGdPHVQQLVk6WIAZ31rdII5cdM3Bd534LBHGnvvzIOzXYjAJ/ZSUAg3RzdO+32bmJ3CRRhD5Kl6cerC0IO9krZ1jiMu7udoRL0lm+Xv0igL/FvHidYJ8x97rpj2Jmq74xvnM505MyE7Nb5xTKPMajaMnXhCwvRFw4wwjrU0AmA3/twtYKTFHquYwfdi/lOllniTlGVsbycoXG2Sf0CBPOGcZTZSuZLtpvJR3uQgqyUnXJbZAKLL5MEgghqtwhy9bJS48oL49EpcXH5jYoYA== 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=XMkFi05unHriMygcUmThAlwof0CqPrjiUMdsTMSziUg=; b=bGe/XshZR3gljTip/SSgwX1FzfqE+nlByFHv0Wt02x8NXdtWp/Uvxnb0qkZmvUEMHGDzm5OcXA+hrdI5zvDczfJQXbPDbYh1vGHT1F9Ygyj7HOpowi+Hw8Qmum39gPbXGoNg7dqRItpq9V8Lk2v4tfdMO6XT9WaGQ3xYVr1Q24w4dlNFXj+sKFJts08InnQNAyMgwcBzOe+MBzgrtzE48AbogtO79a6xxUWBMyvnB271U0kHa3vNZzBo3Fruilr5gwFa7Z9mo9Sf03YCYKWNKdCkMwbtjj29233qNVFgbk0CKRiOib4dBWuCEwnheocw4sNAVRTnaaK/NxmOY1F4vA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0257.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.16; Thu, 3 Nov 2022 02:57:46 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::9587:72b8:e3ec:c4fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::9587:72b8:e3ec:c4fe%6]) with mapi id 15.20.5791.022; Thu, 3 Nov 2022 02:57:46 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 3 Nov 2022 03:57:39 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [dm9pkDmVDheTI/uLiuDFf7/AL5A1xj0DF8Rdhn/MeWk=] X-ClientProxiedBy: AS9PR04CA0125.eurprd04.prod.outlook.com (2603:10a6:20b:531::16) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221103025740.620315-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0257:EE_ X-MS-Office365-Filtering-Correlation-Id: f536467f-9c0e-4525-1755-08dabd472f96 X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3mWo+RneW5ABDpC3jepZYKONfKeFyCIhe6afPRS4gKOn42s0j2r3U2SZup/NwIItyoquaMAXygNcLYvQ0sH3MwDpNnSKFqHBEXXx0x2NnwtooMq2f6zfHUg36ZkgHftrFzuTo3Jvt/v+k+D2LyTql2qMIAYGyxMYs01YMoQwdIOvqlLCCtQqdggTzo1jbE92QDASreDyGhzXf9IfrLYHKk6wXNfWTZNR1kjXhSNrEYLXHEZOBW9oau4qsBx3HN7tPaAg6pnHRaAeC3o/kYgK5gMojyLM53iX0CUBGAjlqMmYEeEK7S+2Lm/9HUJVp0xT8AgkLOFjI/AKaEr1Or4hajvXlJj+yZlYEsCPhamMHKJ8X6jPb2K6r8DfWdQFU/FGtQvOIKK2CrSs+Wzm1toojFRTb1M1KsriF5t6kSwr34ideHjj5bBHZXDa75HHIWzYLGoevJQm3BBm6ZqxFlGky7+5x4BeFxraWdj2ih2DBN6r0yfPrmkla1qaVqThoOHQnqxibm9VVroI8I/Na5bN8e5IWM29tesw1xSHrql3xe564D6eOQV9Ty9PjCoSNaab7evnmnbhRp0lBr4tvh3RmNGCZitocNDCsNDGpk1VOGOWjhpVp+1ue+1+IdEmvpoBuaqjtsqxpgXbEttlvhimOgtpWu6W8LhuZvNtkIKd8yS3MUE8UWoB0Uy8rU3Xpc3abi5dn1E0GT1IJ63IWEeZ/6m/37a4D9l1PpUCo6qgX/G8CXXTspycR/JqSyfAo02u1ODoyAJSdE2WmhrWzE6GEaa X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /K56KC5/rf/6bQooxhWEv10Gd7/J1krzY/aRbQyTDQhYNdCZyLjQ/dq9pibE7V3fyAj7PVm7SLPwOB56E9WD0ULqj3P1GcGlMoo9zGgGChSjuBxJWq6IZawsGwYVOlzkj4PtO5BAuRHLQcDThPFCRLrA/FFJxJEBlblGhaWpshwO79qrz1NbTGzyzUq9DNowJwnF0GRywPg0NWZeSJOCycLXzXchsR2EqUDH2LxQh4x3YUp+0ZNe+k6oa3CsDuku/aKlVbvQRSw4+Eicht2WbE+5OnVOvWK9H2h7zhSRtMaXGMDsI1GA2eTUCcJj3saj+0UWnBX7Xx+DIIwsNcQFvhIA1fY35ZRAuePXSJXa66KlT2rlqYhesg/qbKQ6MdlQK0zHBWp6/xdjt57DqerBl5cfIEwRITj82AADrZV6a1cNfH2dqtztArDnz17m0MsEj6D/f1zCFksKM73jASEK7UQsF5OY6orRl7GKJcNWdQ9xnziLkkjtuqKfcwYiWIJVr9DYTanJfBHEuxjLzQsZM7db9uHxtbYg/IIItDJS1VpoCH6Cqfw5MZ8sBJHL3f7utkyKMcSilyN0iyybG7kS49ZiihUPPEjf1SxQPxaCFNPInel+Cod0GBqegKNCMK4YapVckw6MdQZ5u5YAtJlkTIUWXqUv8TgepZckUItbEGBioF2U/KeQkMFMdl4jqt/L X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: OpUuuF4/ww6kxuo1CcMf9boxONIAddqt2SbXNiALXSjGnx5RIEE+2TeABvI1AKq5xkMSeHf4v+NRkFMZUg9NKhYJb/dIgCbpJzvYL/UPPgw9zV1/ING8LvDzH8cJp8s67qjeUYqvZNbiT4i9rqzzvOrm+VfNHH8GplzWOIZCQaMPkiH07SJfP39xAwhiGpE4YPJfhsQv7IGfJwxsX+d5RrPiHwXZBBcxbLTYq6Zz6vwvjoY9C+HWJxUJ60G/uoWWpJrsav2VvdkR4WHEXwl09Zwwp2M7YPRBKHdGPk9dx4nlzRKaAIwQotlgXsiJWClMHnFEvYB3Mm74q9rimklChTgnD1rwhTToUIse9E8l3GA6djkFeZUppaXOuU0msYHSkO8zJjrbAq+q8RR1IgpoZkhidCztHDIvx2HKzG0G06ND9C4YqUu9N5/2Ag2TPaXmupFVPfT93TQ2Eco8HWQEAD9joxz2vMv/cjxvRNF+P7aQCm6D9SHU3wiejtyitMJj9aCfHvuWwF7y1kiddYCyWwNNYFy4s399f6qsHpGElFB5Kjj6G4NIFA48FAUHpd7AvcHnfOyGXpFcgqIrKRfJ4CPR8btRvnxfQn2+6almYVjKY2A4mZfcB3I8RhVKKsmTgsugUrebUp8cxs9oYe2VBdb1FimvXGrr4doxyCdNvQA877ZqhNethNDWAiBgx80Gdmq37wtBwU9St++kAcUTmQKXSbG6c0bMhPzz6jeGrD81s/vUXebpFIQ6Y0JX0akHXRXW6Plp07DOhA3Jk/Mu0AJflIMt4SqdkJG4hItj8u/t2gs1z2J9Vkr+xjvqIjugiGZpxk98Mcr08hmmtietM1aYv1E1M4EVfiQgEYk5JrrNENDXjkU3qh79DP1W/BNvSMCbQ1vhQS5kfGisJYaSmCb+SC7hRW5gUUlgdn0qtRhlRP1RkCTE72CQyPgW0vrDhm6VgApUkk6ukxHe1PrmCvsbILhAQKb8SmpjXqIZ/3pkDDzWHnfDCapDminK6alamPGQisCU5FBEX9aEYHxU54WCA2jG8Zi2iUFGpZterJNUzGW7lRuEjqPyuoZAw/QHfA1USbz6qBICTng0P/K+z5P85YkrHrddg7Ilif2FrHO5vUHBtOmiA6khC7IZm7UsRjsE2nAv1cXhXW/Sk7YhgQRABX6zPxa1kMByAZwO1P6y7e6uoMB49mW2bn2y6XP18+OtHqRjNo7FXz0+Gnltop9j7ILp4wj5M8oBY0qgmh+IQQ25b1ykiYk53tISaIYVIZ/VJzWPUJmSnwuym7K0oom5CU+JSDfkpd0GdHg7QakyAA07IIHCWMuuNv3gcsF8 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f536467f-9c0e-4525-1755-08dabd472f96 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Nov 2022 02:57:46.6758 (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: PR3P250MB0257 Subject: [FFmpeg-devel] [PATCH 23/24] avcodec/mpegvideo_enc: Move initializing QpelDSPCtx to mpeg4videoenc.c 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: mlCKfvcjWfUi It is the only encoder supporting quarter samples. This also allows to remove the qpeldsp dependency from mpegvideo_enc. Signed-off-by: Andreas Rheinhardt --- configure | 4 ++-- libavcodec/mpeg4videoenc.c | 1 + libavcodec/mpegvideo_enc.c | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index a59e9a898d..1127f49a62 100755 --- a/configure +++ b/configure @@ -2756,7 +2756,7 @@ mpegaudio_select="mpegaudiodsp mpegaudioheader" mpegaudiodsp_select="dct" mpegvideo_select="blockdsp hpeldsp idctdsp videodsp" mpegvideodec_select="h264chroma mpegvideo mpeg_er" -mpegvideoenc_select="aandcttables fdctdsp me_cmp mpegvideo pixblockdsp qpeldsp" +mpegvideoenc_select="aandcttables fdctdsp me_cmp mpegvideo pixblockdsp" msmpeg4dec_select="h263_decoder" msmpeg4enc_select="h263_encoder" vc1dsp_select="h264chroma qpeldsp startcode" @@ -2903,7 +2903,7 @@ mpeg1video_encoder_select="mpegvideoenc" mpeg2video_decoder_select="mpegvideodec" mpeg2video_encoder_select="mpegvideoenc" mpeg4_decoder_select="h263_decoder mpeg4video_parser" -mpeg4_encoder_select="h263_encoder" +mpeg4_encoder_select="h263_encoder qpeldsp" msa1_decoder_select="mss34dsp" mscc_decoder_select="inflate_wrapper" msmpeg4v1_decoder_select="msmpeg4dec" diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c index 77f960a262..a2a14afbd0 100644 --- a/libavcodec/mpeg4videoenc.c +++ b/libavcodec/mpeg4videoenc.c @@ -1287,6 +1287,7 @@ static av_cold int encode_init(AVCodecContext *avctx) return AVERROR(EINVAL); } + ff_qpeldsp_init(&s->qdsp); if ((ret = ff_mpv_encode_init(avctx)) < 0) return ret; diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 1bcc849782..9b11c5c05a 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -807,7 +807,6 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) ff_me_cmp_init(&s->mecc, avctx); ff_mpegvideoencdsp_init(&s->mpvencdsp, avctx); ff_pixblockdsp_init(&s->pdsp, avctx); - ff_qpeldsp_init(&s->qdsp); if (!(avctx->stats_out = av_mallocz(256)) || !FF_ALLOCZ_TYPED_ARRAY(s->q_intra_matrix, 32) ||