From patchwork Thu Nov 3 02:57:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 39120 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp249261pzb; Wed, 2 Nov 2022 19:58:07 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6rqAIe9XRcUUGLpUmxyEy11yYDogeGSaDq7ahkMNtO7wv4Q+kVxmxAWZr2ORKoG8t88Gf0 X-Received: by 2002:a17:907:8b18:b0:7ad:d1f5:2f80 with SMTP id sz24-20020a1709078b1800b007add1f52f80mr19361557ejc.661.1667444287187; Wed, 02 Nov 2022 19:58:07 -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 hd9-20020a170907968900b00741c0bd7061si21110089ejc.644.2022.11.02.19.58.06; Wed, 02 Nov 2022 19:58:07 -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=GSbM1kZg; 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 9D64068BED8; Thu, 3 Nov 2022 04:57:54 +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 E118D68BECE for ; Thu, 3 Nov 2022 04:57:47 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Crox2JlBPbRVYE32bMU0DqkVMBpp9fPKSp+qCc4REbb6WTINuZ0duyFWsZ/I9Rzlf2CkQXYsGYP1vaXCdXcCsu1llfmqRVPAyFTbaU0Lntt33e4Nzo2Yjsf6x8kl8kvF2EnIe9QgLQ0PpooFsF62IvmA16VfD+lKx5oFyX5kqPwsTH4dp8uAxBsE7VVwU2AZi5fa+l8lc2tPKXeNncd1vEJm7XGveGrnSySG4MRsPiBAxYfYSfv3tuKWY5VVpdlVcDat/MC3qxD3yVO6F8WnSaiyniIhe3jlggEouA2olZJJGAT4bqVLW0aRUB71h6YAZYmIxqDDwYxeGq5LKjwhMA== 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=QrZ4IgUkHYP041dMYg/7mBbiu4h8gZstbxTy4oeEc3Q=; b=Kb5fMeuX2qeLtjsAH1k8XssHpvm6glmDh1Nr/FFSz+D9VXf8IgA/S+bUBLw38pV5OGQ1wYmw+4mwZ6b8PGMpTUYmkhbwnl59wGAajQDDM3DEfT1gUwNl4cugs9iYH1H27TXy+0o0dlyU0cmv7QacLWnYavBD/p6ZKCNRrVv8WT9XsHhbUCjsoiV4DhPSxVds9hM9UFk87oMh/h4wBza308LUo+7M5GVbLBzDVlX0T4G274wKyVWgPja5Rd7UelrlYozNagb85zBg3k67Myu7n3TAu4UewdHiUEUVDPzoY+ifGN9Z+E8cFLKMyk4iciODBi/DnE2iKlzKG9Gp4O4UXA== 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=QrZ4IgUkHYP041dMYg/7mBbiu4h8gZstbxTy4oeEc3Q=; b=GSbM1kZgGWOTJPe222p4c0/0QxugAHJwic+3FklKRkCkNKAHFz3YzOrRpiMl7RHW+JIj3E7iPjKTf1aRSSUCULYUm+S+J5LliXh+OzeG+m+ZySeUW4xfab4cOeuLOGC0bU2OB+JDu4XDVPOPJaQgod4FuaY3cWJXNKmpGO0zqR8zK3bnf9e2mAkBWWTbJJcuxTvmHpKS++1MFwbnIxYU/Y31YrhGpHRRMoxQCuRDgIUgDQnF8i01CpTjIgfAkwCYjlQpxlpm+9IDEOG1l2LHOqpTztaUoHpd8EZlxZ3+xLbDWenqd1JA2QmvyG7e/miv7C6OamSjlqsx7px3YhYVTQ== 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:45 +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:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 3 Nov 2022 03:57:38 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [33WRzjcXAqIBjWvU0VEqjXmsbeHD9MLqsoE55q+kS/I=] 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-3-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: bf1cb019-fe8f-4fa3-2e6a-08dabd472f15 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKz4zPL+otEBjMFVOb2OlFlbzLXUspUNWPa8SyzyupsN/Fqi36nrTRRU0R9N+A8q7ljXtcpUKcOnujw4Cep8GVAc5exN9LW7T8+mn9NTqwVKNrhK4XNYJLBSZkSUimEhovc664Q0T/eMLrdhuZIdcrJJ0zXZCIuQHkEWJAqndsHJTkfk2iH06XjodgR0FtDRsxeK3WZJ68KyiQTRWG0CTXs5ukBV2vMnv3Ibo9jWdyJGbyIhSnh8VESn9/j8+Y9sidUaEL+HuI/6FkffSsY1nkA2H0ICbC4jSFhaNsjxFugp0+xgchtHhey9RVmLqfT02AQLBlZZS5dUut61nXZS9saREuIsoqNF15huy9Ye0Rmr+6DzaFLFvIh53ovykmVVG4i/9uZ4yM1Lwn6/v5nkejj2WGekeu2eUo3LIAGUoAdACnGVotKRUazWu8qB+iCfPaVBj+Q6l1wQKHmqfJYW6I1DpGUnkntw/LYBPVez0C4CvY0UjHCslJADkuGTchHA8RUk8R90izw4s0OJm4y9CrMAGMxCrzfH8UfgKRYUvQNcSZlC1embmvFYfiWIf46pclI+qJjLyZJuC0GrOJK7I7z/k/sLd5lcJNa7oYHuTRfazwhjbK6o3gMCwAlKKQ7YN9XjK1JUbu1kr26AlDZUrSaPdNSgQpXEeUAEWBNivlXbZWFCtdpHKkhcqcyRyUBLuumxIMm4X32X0Op2Th2WTgxc422zuPkQKbo= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cnkMKQKK0+zwT/ags8k9ziGrBRtJ9+z8j3tHAOz9MOIPs/amh6zSfcyopLjI6oZtFTPrvkjbNBtOe3KD90Pnspkmgjq8ukkcb6E2z4INiseXX9VQ0sQdfzK8Mx+OAh53+i0LMGEK0YeRyCYANWTxhPgXmTuC2A6YJf1NwNr3xgr56HCtO+COAnFCKrg2hS4w1YjrFhnwSKs2aGT+Lh+CLwRIhbFcA1wdHYYAv7Ri2ocYJ9FLqUUzvlgK2kbHLi5H6Vt2cQmnBD3rMkiirzCprumd8qP+USQkrVvXj8dn8MxrMycFSnT1Znv/it4cYURstkfKMwfomy7h1eh2ZKqu2bBQjt39YNF4XbND1U1ApXUwM3ZbZKgdvjmSVBE1LUEmbzvnmiWwPbMXlRbDikflVEjisIsQDLxT6jLjF8SgHIw743W2/WRip1bbZuN4gmvgSENhet0gOw9sKWai0wCJinVg2d7t18KwaDFFcEJ962Ixnm0haoLR7ULFgjdgD+R/camuD3bPa/6MqDVlmaXochmY3ok1T3kKKSkGmWUwN8tOeviA2E2rotDaDQhGZbe1bVK5RtYY30OpGPcTgbcRD8LWq63hahMzBfX+jlR+7IAA9BrgOCjzt7vl8nbBUYiET6ERxbfA8BCEPR8bZo0UMrUz5CO6QSPozaHDl7lZ0/VN8KLNwY6c5QNfNzREWfV9 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4maCy0jH837QSYw5MmX+HPMZTuhHLsDZ7jsgRz8MTQSWLWnQNpLoZAG5V0OI3P8mAZUzO1u5G0QNSDvWw5Ut+OjaDJ31DO+pP2+Ub3zyCbi73Uf3tV6zndes14nJQ4WOWmt7YHgnBRHarLTStBSwrLK5mhp0IEsqd+8dp8xCOcSvguPf0q3qzladyA4tQ3+kHiPFziHiNHaIFzuYGiJ/zuw1qHGacTs5gpVUMYkLfDxzVJZzSM5EwZDf95yUASNW+i6EMRkg9lD3LhOPoUKFCWBpekDV6nBThGx2dqqjUnWRvVLIMaWGkzPc/0o99ljxYEY0yaMr47f90WGcOTG05pL+UTAbfCUUoD3yQcK6IWQZSvxP+McqfnQz8YfRgRfQUYeDGGuxKNXgo0eFP4hEinAOIn/ZIlR4+b2KlxLh1c04YDLz0j/uvEnJRKO2RAnxsgYIc3UYHY+QRoxsrCxJwFXcGmMJ7Brb+O9g3hC2IDLy8PZcTvF7ZNPtHMC7eQlnw+48TRqP7AUy5Ja3jiCkzj/OhI7V6DXYVrc4JhyUoocV53wtBTzw8u1RWQxR1ys5uK9htNHdkYEChlbY65EFVa6UGy1khHeVl5mVoJ83avWCs8KgpBFJ+2mbPVS0/0GMu9EfQQHYaqaPL6MDfKjH0qYlXoOBWoKELwU05ihb1RaizMvqaE0Z0+PglPHmMrybN9YhFoXHKEWwgXW6t48QkfwTPgqMbs3GGaGCY2+ID6CrmXvlG5RaRYMnoowpOa6gRj/Gwjg4sTjl7kpDOniqTUbmz/xMXm6LbXEcT6CN5/GyoAZQXa6490C6mJHdbQjAEbWSOR2W37NG2TTbvyg3lF03xDVl2CNpMY9OHobuWpQjYLgmsV06iwUmrMQ5df5jkIMlnBubo699kl4m4iNvDOUpGi0NQBYReFm4pIpbLUO5YB7ntS0GBXT1uAsVBROHlHHHszK+8eGBVdJ/yeHBRxnkDq22PbJd4Ilv6xPgYY3wMSwrZ+IKemN3casUYRMDVzrIfvAn9q5Wb0oBz8M7JgxFaTKKG5W117ZJDQaFt9QhG7Yy9899kyJoKKli5pJ3+84zKBDssjb3w59KqcS9M03GL/zZVJV2t1BM5wSFu6iCWAeRH7UyAT7EHT5litU/HOuwJOOZeE0pC8oant70v6SH5v4wDQ3y4xFYyjR0Z/wbFBYxG68YISBe9pPQaDOPQXGULNUfGsV7K1GJKO+ie/bnijMgRZTTpuX6SOqFO15BI2EIYZXR+GtM0GU0JEExDZPP+yVWbUAKAJGq64vyzIu2xUmSOsb9yeo3JCTce4gGQDLmc5ZfkasxrYpd9hCq X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bf1cb019-fe8f-4fa3-2e6a-08dabd472f15 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:45.8478 (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 22/24] avcodec/h263dec: Move initializing qpel DSP context to mpeg4videodec.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: nJcHU6sRfOmN The MPEG-4 decoder is the only decoder based upon H.263 that supports quarterpel motion vectors. Signed-off-by: Andreas Rheinhardt --- libavcodec/h263dec.c | 2 -- libavcodec/mpeg4videodec.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index da3c9899e3..71b846ba74 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -51,7 +51,6 @@ #include "mpegvideo.h" #include "mpegvideodec.h" #include "msmpeg4dec.h" -#include "qpeldsp.h" #include "thread.h" #include "wmv2dec.h" @@ -140,7 +139,6 @@ av_cold int ff_h263_decode_init(AVCodecContext *avctx) } ff_h263dsp_init(&s->h263dsp); - ff_qpeldsp_init(&s->qdsp); ff_h263_decode_init_vlc(); return 0; diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 4ab558b46f..f91d2753f9 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -43,6 +43,7 @@ #include "h263data.h" #include "h263dec.h" #include "profiles.h" +#include "qpeldsp.h" #include "threadframe.h" #include "xvididct.h" #include "unary.h" @@ -3824,6 +3825,7 @@ static av_cold int decode_init(AVCodecContext *avctx) avctx->chroma_sample_location = AVCHROMA_LOC_LEFT; + ff_qpeldsp_init(&s->qdsp); ff_mpeg4videodsp_init(&ctx->mdsp); ff_thread_once(&init_static_once, mpeg4_init_static);