From patchwork Thu Dec 23 09:13:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32861 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp7106129iog; Thu, 23 Dec 2021 01:15:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJzGiKfZASfc6o3JM4sEx4pcB75L+y8N/ci7BtSJre2asfFt+QaF+26vzGfWQRl4nW+islmq X-Received: by 2002:a17:906:730d:: with SMTP id di13mr1183795ejc.349.1640250914137; Thu, 23 Dec 2021 01:15:14 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ne18si2250888ejc.943.2021.12.23.01.15.13; Thu, 23 Dec 2021 01:15:14 -0800 (PST) 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=Kak2nYO8; 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 9D0EE68B188; Thu, 23 Dec 2021 11:14:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2083.outbound.protection.outlook.com [40.92.90.83]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8A69768B165 for ; Thu, 23 Dec 2021 11:14:12 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FvuIGac7GY5NHWPYj4lAO/jtfvIJPVdB9v3kyrOfDkz3OyMULnFWtElJAAdsEQZLxi9kKi7UdvzIeVWhWSh22dGrwzTlmmPMoTS++CWIS5qI4ga2wawGt7WYlD5Gg5t30bdRbC8uoLiO5SOtKwg8acGRjbfBxkczf3GjVwWoZEo4Lds+Xsjk7DEyXk5LG6OirnNBDj+5CJf4ev+aZbV7STnX/2cEerAI1xJ/G36dOjlHfDfk0CuROqJF5OhFxAW6e+KUMtYV8ItG5ve7hmKScFVxZAXfLpJzT2BYGxa8jDSK/vUZWJ8Ju0K5vDpDy+PNOtPgx0uJ+TBbus+M7uAEyg== 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=E4iABqKtM0cC8fsLZ+zqNFuE0e1UwhlgqmtWyz7gXVc=; b=LBS/F+x8G0X2owI7PNRlOQi0xrZMMIvVOPd6Qf3UKZEiQq9cJCv3WU/SbmyDLYUHb/BTwId3v+WKTxVozBoULXKXd0EI/QJIukdaT/IbgPWtnPNpqZFfcdAsGplwVOx6KePiiNZrbyxyX6LLKtTcBU6Zvi9FNNNu50eHD97kKFNruLUqhVmIX1mKFaep/veAbyKqqyJHnD3Pu+hh6cagvldEsoonjiRHUGwnV7vZ+4NM2va6PlPYhBHyeLfZopDF7AeEvdDd5kfKZ+H2XFwRqA/GVnShcxDBINK2CtlUzlk709epNIii96VufcRmoSl6CLsIzPfAn9WPLpy3quxxlA== 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=E4iABqKtM0cC8fsLZ+zqNFuE0e1UwhlgqmtWyz7gXVc=; b=Kak2nYO8olbk4EZBEKLFpV1yyoG/yY5pkh9chKMfIQoHJPnWQrIBnvmk14vlTf+x7GQLo5U/97TnFxYYbNJ7BUqbkCoMe4NlhnFVuJm8Pj7V9nDrYvXqaUOEwn8ZUAh8BavhJSFnhCngadBerx/t2Fi7sroTaq0Fi7gJbT0ajWO5w+YpHCT3JZQJ3bGuytVMdqxTvASXJnYSoS3UvnwByDR1qp9qLmZMhttw4BEWpR3Ih/mzQWNKoXI/0mJL+9/KFduxIblxLuodDvhzhf8+V5FkOi4DSbVpi4qTb6bneimcm4gK3fePFfaEYx/q5thy0jEbGAVK4SO8Z7A62yM2sg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5607.eurprd03.prod.outlook.com (2603:10a6:20b:fe::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4823.18; Thu, 23 Dec 2021 09:14:10 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%5]) with mapi id 15.20.4823.019; Thu, 23 Dec 2021 09:14:10 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Dec 2021 10:13:32 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [QOklrpDEdCjaHbmE4Wgu1MLuGlJroFpV] X-ClientProxiedBy: AM4P190CA0016.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::26) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211223091340.1450013-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d893e6be-272f-4238-bc7e-08d9c5f4942a X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR3EehW4kxQzdNcP2D/mG1JrzBuQwAbiLqSibOXQaF9EKNOkiS4OratQoUYIgfWKA4nuytOGjP4/5d+OWR+Xi2k0wq76J/NDlKFBDmD9lnMHXsHYCIWT1dI+tQUG9Ih6lsjOBoXioMJhZNiOJwsP2j3/TDkMuZlj94I0fsxmk+gqXbs4LGm0ebsTI9iLfxsufWBX2rf5IilxeabD1ej3+uYoI0TCV7bwIGvdfVG8mjVUCZ8nKKYjP/ypnS214zN91d7o7bA5quRLTsjDimtjUo/bC2ciVGsTb3tTIDxv+KSHViK0sVYsan9yFv1+0o5bEfn/z49mgwV0RHcen3j1ax9/X7EjbmT6vG2VvsG05vlRLI9vdhmcnbEk+OFLfjIZ9mr/6Wz1YtH4H6O8+Vbtc1YRJtBHa2FeprnOMet1JeU8iqfmLeDBu71/qqoh4MhyAg8GjkSChF7Gx4FZ2eJt6nyjLUd80HAatVy7YcHJ5eB7begVO2VCMhab698io+flpPWlc6eCSt4dmBldwpAS1V12ddD63SxuKrnq+8xeDjjrxC7py+Rifd4x1Q9oxNaHsmSmhTrpjFBD33Vav8dMgJwQNHCVYHp4DEFFLfK6t6QifzjI3rCpEEg5n8LGZR+ySUOwKpcbQ8jkBJV7Ati8sIM5J728lsmJtlX0ZoSxZaCCVUPfjsLf1Z3zk/bMlDzE64izJq5GPIR1C921DWk6QH0LELynq7ZJiv3+26IK4gI1NAz1PthbTnPKlOtL20L+0U= X-MS-TrafficTypeDiagnostic: AM6PR03MB5607:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sNSWCoRihR4pIkKSZ7kCW7UwDAUNHYlHC842BZF4DK8BnmlnFWJJ+SV8Q5x0uR6wajIkZwGsaUZemLyNBgUI30LABxu0tqJNM37iDvH168lgmh0N0V6F9GCmgfrF8BVGOR7iDeCIAVuK+9XT6woe7JvDQqTMP/vcZWhsqXoRp8tPS1SFsM7UnxrVnugTqjV+w4XlbCl3oePttOz7qf58hzoOP+FBt5moy17BPJYGeb1hmCWIn4mAYO/CI6VzP385CeSrMOtbvF9PexzPRF+HF2SUARRXs3O/QEjHKOVfMrb+3ITMNlwOJmhsw47BrS902DN4/rgrCyovQKBJNCQwIRBbHd6nAJwEaRzj460vYbX6Du+u8lXLBSqs7FqIQVZHIcE4L2ieGF8AnTRVmtQLYhRv5qRGxfrpZVlnsfwrNvP+OQ3mTI3rwDuU4ffc3x/n8ZYUrQENfHTYupo1MaQ5Q0QYXn+gU4VCJJWc2EK2H6i+ccsUFK+eE98A+6qb8n6kDQ+St/Cgqbevjnuw4tyErBV1mXSf2sYfd4Ef7Zmj5ojx+BgS5wLfsGe+EBVpnF3UOMPSPbDCF+oc6vHRm109mA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +LbOhfGAsZHEej0IhF7U1uEpMraNy9OI2lI6Vqwwy07fBeVYk+WVyWET+JX4aziXZiT0RBHr27rNAPHfWyjRfVdIhvMTeQsmAMFq+KS0+zq9pj04rT7nzdxPuSgbTeR4yp9AKdOf36YeKAe1Q5HbXgHS2MPa44ZnQJI7SmlH3g29YyeFVSHOcdfssFM/J1xvUGfmuPOcQNy5HHK1hCbx5+Hqdqb2Sx0D1++yQNGtwULYpJqlm+wPMgWoUsyN32/yLBvz1/vJ5VCGcmErqjFe3mMypXaFs/QLFFuTgp4+9Hv8XbiU9qcPHqrfATiMyMrRbVnzjcE10kk50t6IOwGVXWxToLNwWLsIhKomKckB79n2Ge42UCrLsr5HETN45VQyoIh4HfbenpAGpuW6dlfJlf4Zm8ZXOXN3lydStl98XyGn6zixwhXasDyIZEfJl3AvklY/VRyT2GAktytVeNFFCXJBK9W2eIfOtQaDvAjrHWQNDF992u9QrtacfDNfBhzHNEwpX+yJsh2JoeRQKrRS+hZmkiTtwjau2D6FSe0pwXeGhyykqBXrGBpTRmGy1/hyLYMNZJ/W/+zko2vrPKbhZMhqdTndlI4T1WrCs2I9LR7wl715+B9c/ZYwNrFmpOVFKsV10m1Ist7kPW23ncjlXkXN2rignlVX7C/RoYSphwXtyxGq8AmplbDrTqAo+EFpfjglLrXx/oMU3hq/hyaKrjFwxbn4rPpILPi3MhVP3OAHwXaLSNwkpx1HJ2wo6HYhW0bVJ36+RPoYqkOIKfmfsuSuuh1VBelAh/924a0cn2OZD7zZUS1Vs62QfEg5jAUUX7jI5iJqPLFSM8yqOaald0dm3zJDEsnkqSGWMigb12rnAvYgCeiLsybxMBNE2arabzwqAMixOvOr0vYvDDvYHHRpLESUqEgttqpRU/stPvQXkEkkBD/1UJ0d8gHW3ImVuM00NESVF9KZFtKi29ksXg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d893e6be-272f-4238-bc7e-08d9c5f4942a X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Dec 2021 09:14:10.0178 (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: AM6PR03MB5607 Subject: [FFmpeg-devel] [PATCH 22/30] avcodec/mpegvideo: Don't duplicate identical code 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: WTAKmI7BG+km Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo.c | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 43f27514b0..4c3e0fa8bf 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1963,25 +1963,6 @@ void mpv_reconstruct_mb_internal(MpegEncContext *s, int16_t block[12][64], { const int mb_xy = s->mb_y * s->mb_stride + s->mb_x; - if (CONFIG_XVMC && - s->avctx->hwaccel && s->avctx->hwaccel->decode_mb) { - s->avctx->hwaccel->decode_mb(s);//xvmc uses pblocks - return; - } - - if(s->avctx->debug&FF_DEBUG_DCT_COEFF) { - /* print DCT coefficients */ - int i,j; - av_log(s->avctx, AV_LOG_DEBUG, "DCT coeffs of MB at %dx%d:\n", s->mb_x, s->mb_y); - for(i=0; i<6; i++){ - for(j=0; j<64; j++){ - av_log(s->avctx, AV_LOG_DEBUG, "%5d", - block[i][s->idsp.idct_permutation[j]]); - } - av_log(s->avctx, AV_LOG_DEBUG, "\n"); - } - } - s->current_picture.qscale_table[mb_xy] = s->qscale; /* update DC predictors for P macroblocks */ @@ -2263,6 +2244,24 @@ skip_idct: void ff_mpv_reconstruct_mb(MpegEncContext *s, int16_t block[12][64]) { + if (CONFIG_XVMC && + s->avctx->hwaccel && s->avctx->hwaccel->decode_mb) { + s->avctx->hwaccel->decode_mb(s); //xvmc uses pblocks + return; + } + + if (s->avctx->debug & FF_DEBUG_DCT_COEFF) { + /* print DCT coefficients */ + av_log(s->avctx, AV_LOG_DEBUG, "DCT coeffs of MB at %dx%d:\n", s->mb_x, s->mb_y); + for (int i = 0; i < 6; i++) { + for (int j = 0; j < 64; j++) { + av_log(s->avctx, AV_LOG_DEBUG, "%5d", + block[i][s->idsp.idct_permutation[j]]); + } + av_log(s->avctx, AV_LOG_DEBUG, "\n"); + } + } + #if !CONFIG_SMALL if(s->out_format == FMT_MPEG1) { if(s->avctx->lowres) mpv_reconstruct_mb_internal(s, block, 1, 1);