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 242514A9A5
for <ffmpegdev@gitmailbox.com>; Mon, 6 May 2024 21:53:06 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7BA5768D70A;
Tue, 7 May 2024 00:53:04 +0300 (EEST)
Received: from EUR04-DB3-obe.outbound.protection.outlook.com
(mail-db3eur04olkn2052.outbound.protection.outlook.com [40.92.74.52])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4044968D708
for <ffmpeg-devel@ffmpeg.org>; Tue, 7 May 2024 00:52:57 +0300 (EEST)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
b=Wlj+a0sL1VNMRyQRstluCfdvd6qbwt7DKh+Zv1nSzHZLkjkAb5MJ+v5JHTvgsOYJWAZWjeV2UxYp1pGNDhMr3k5wuvxaqKT+dUepqrqGyD2RkFN/8/O0eK4fQmrzEjom8V2c4kgP2024TAY7Ih6R/pifdVmUjocwW7OfdqCCy5SijsCgbf0ir4IavT/ua3++cvQ5jb1AwP7qXHeymfUXn2f3am0DvlT4XmkF0Psbz9+l6UM7V/7Wr5+ndB0nnZV6ARzJIx6eU0CHzuOBfRwGQ2pY1O/B5T98XrRX3Y7xbTqOl5e2edCva/4TvbJs3hwMqwqIArhbdzXthHXkzZyGcQ==
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=a2gRt/mXQxmPrG4U/cJmk9dkhh8r558BPphK4TVUjBk=;
b=cGLpS7jStxyhxapdElY9ibxTPjC15Oah4cBXsLkstIey0yJRLiHDCX0a/aSXcLooqMkKJ6NNaD7mTzXF2fi9G/UkOmB0wKxy2H7gAWySGGcCghbmkTEAaEunsS1pOAZdFI+PVrGvHYC4pHfjcLKdQEgAXkdVY8RhIfTM435vvJThuhghi+rkkLQE8wFAZJMbOIw9tRCxYtW8hHrMV9MMIJpakCSrcp7LxNNShMo4fN0vXjCTR403UKeu7c0WJQFiXsWPwkTLTenO3DcVq6/mnRmCAr3ejcSfN8XIyCT7WY8iUMF0mK3E6Dm0NIEtbmF5TP85uq0yryGfQiA/n+NC6g==
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=a2gRt/mXQxmPrG4U/cJmk9dkhh8r558BPphK4TVUjBk=;
b=jJLOFVICd1nmEI5u00wpxwFAztNdgErbbDqvpNgSZnkjpJ9ye607zqlpB1t0d25KQ74mQ+BvuAoWcyqgzEoWqFcEfXdL3FDsh6dgQ5jThTRlK8FzsHMHJ8Qv5HRMhJON6uSWg1uDrGOLMe14xZXi40tn3jg5He5/JMHI/7IJZk9OfypjjOMZmrnpM7bq8W8JvvuEth4Gjn5WtuNchWsyHIVNFvCEIQaEJr+xoeAeoSpfa9AC2vS3wswsneJv28fHQCjA/89j68bR7WUoxgEeBVUBZQy9lYDTmj21huWWkg0+MVHCtcKHCRKNITjgZUUdtSkKNVdtARrndDnO9FGvqw==
Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17)
by PRAP250MB0592.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:29f::5) with
Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.41; Mon, 6 May
2024 21:52:55 +0000
Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM
([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM
([fe80::d6a1:e3af:a5f1:b614%7]) with mapi id 15.20.7544.041; Mon, 6 May 2024
21:52:55 +0000
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
To: ffmpeg-devel@ffmpeg.org
Date: Mon, 6 May 2024 23:52:26 +0200
Message-ID: <GV1P250MB07375EC49AC86F83FD1ACBDD8F1C2@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM>
X-Mailer: git-send-email 2.40.1
In-Reply-To: <AS8P250MB0744D14E6CEB1A5AD911A3398F1D2@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM>
References: <AS8P250MB0744D14E6CEB1A5AD911A3398F1D2@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM>
X-TMN: [x/XDJ8vDwMvOg2FLPiBOBRgF5i/siKojDbxFx/iabw8=]
X-ClientProxiedBy: ZR0P278CA0042.CHEP278.PROD.OUTLOOK.COM
(2603:10a6:910:1d::11) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM
(2603:10a6:150:8e::17)
X-Microsoft-Original-Message-ID: <20240506215227.1260832-3-andreas.rheinhardt@outlook.com>
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PRAP250MB0592:EE_
X-MS-Office365-Filtering-Correlation-Id: 23d100ca-d7ce-4f88-5af6-08dc6e16e2d6
X-Microsoft-Antispam: BCL:0;
ARA:14566002|461199019|3412199016|440099019|1710799017;
X-Microsoft-Antispam-Message-Info: ssx863mWQs4xTCjkO5ZhQma9rble/etz56Anxxx2i7G2KWBjhT1xsI88fTRGOWRzB0e9HNUIuSK6Dr4npbd3QwNz2q2ZQ1wfy3O7HM2lVJkqEz00S9leVWkKYsyyXzsEf1JMv9emXorYirxk7tSO+uuUBLaZy84g7/XvD+dX5jdMeeLzP43EKCPox6NqzUTgCRtr3PCRsienpoI+2m91if9qtnRqhpsD431QR+AS48Riu1VbboIkT7SLPQmGtlCrWP8jsSX4ifN2bUYIcoStz0zssygDcVSRRukUhQJmeuv3dXmGe2cSxLHiD+7c9pg0I2oojMwTsIaRH47u+xOlVOhvsviTd7qXHIdvluqc9+fbpx+oaspCaXQVO8JnMrM46JaBdANdCVipgm++lGQiqc6ZIrvOhu2nuj57tpqcUd+HJspxBivOUHptAvkeEG3Cb3hsKZqam7JYLug/ANX7uuCoSacOvYcdTipkRVrslRJIw/a2N5SQsrfXXZ+gXEQYXAElA/CrJRVqfiWfS87HHVDwHEhR5WnbdZKwkBB4VKJBfxTtw19XE9tH9HbiebwoF4qyl+3uwrCePmEJ/MtNlm97JTLocBesqSpWE5m9tAPbBcwhinso9mubRRLpyUMr
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?h45lXknd1eY9/CEHBQooSCtHSCDFMeYwl7PjeqfXN8RUBdTjAadHp1LpNVHA?=
=?us-ascii?Q?NyzQSfHDBTh1ZcW+g9yR8pdHh9uxLpG4+bTcPgmuHkfdaBQMWHe4MhYjakWv?=
=?us-ascii?Q?nj2ce4t2RI9675Qgw4q9x18Nv1Ckau/mJ8ysgdtBZp76C5MAxeTyAUUByEwn?=
=?us-ascii?Q?zpPjya2R22H7kCi46ru4oXhgWoVtYbO8SO8MOy45NsU6AcyhtbkdCxFOim57?=
=?us-ascii?Q?rCLjJhgVYekAbumUqZyuqV8kOIi14j6XwidoaO1fNmn/opwaST1z9oWj9I7P?=
=?us-ascii?Q?1mIH3fXQifLHB0WB6HBU1CXCm4PBEnh7j5x7WieUNUCB9Y7+SahBNHU6DKO4?=
=?us-ascii?Q?sqUgdDo/ikGssCEEwVV4Sh54G1vvkLopzE8b2jZ2SgnBkBZ7Ha36HPmrNoxh?=
=?us-ascii?Q?iBXex09scBk5l3JW11JVtNCReohh3ldzPn41r5b4A5PCoNU/SgjK9wK2TRDq?=
=?us-ascii?Q?LiC3UmMc13O1Z8lUsgXHUkC2NvJBwqZiU3pTbbJsKTjUcFh9URUjWRDH9aUy?=
=?us-ascii?Q?9mRsV6uWdiaRYUaPpUI34WqHnPPYhOUl2Bni8RAU/hkQjB/7+DKNT5i6mltj?=
=?us-ascii?Q?56atcQagnYl0hv+g49kjpg++/L0CtFwGcOKHNqMQlHqpcXdF0rr0xKRHqfrP?=
=?us-ascii?Q?IYWuDTUk6kPPkMDgoKH8Dj8NgDgIEDrFrQJnWf8UeGiIyCuL42yrplOZFnLe?=
=?us-ascii?Q?k1ww8TI7ZUcRZ/yidgS52O0Kyyiie7+/s8M5Lkx8VR+DK9s6gGjK/nQfrrl/?=
=?us-ascii?Q?kzEvxIAFVXDhmScNdaXsQqecmVdhX3QL4n5BAZ+27ZV/cdBqo58TLTn7Z266?=
=?us-ascii?Q?QDTm+479vLLnUtUfOM6Xzvc62ak9Yu5WD2s57ayLrKmY4PPUPmvx1NbJ5VO5?=
=?us-ascii?Q?+jPh14T0iP6wIaskxU89FmdeKowJBua5YSAlumDGam3/qAt68kVXRRX59Aao?=
=?us-ascii?Q?Tse9Jxss1yG+DeQw1q5Q3CdoIKD3JPL5HgWaIw07Xu5zQ+lQzQkOA3kVTbTm?=
=?us-ascii?Q?yRFEjxwyTLRl6373oXmD3F6GsQj9iFdK8OTqnaRj2VbgIizEZ2G69S4GlbDo?=
=?us-ascii?Q?p3HJvwf+C50L2ovkd1B1xvzlCSLGZt+EnOJkeqMvwQF7zoSpy9rQv/MZNsyf?=
=?us-ascii?Q?nvrKde+6qYyxPLI2mDq0oZGeccVu6x3a3cmiryVHicbkSVZ2kejStzvNZPh9?=
=?us-ascii?Q?5fnfCCYSyvmwJmA6Vxlhia+CtSKVdlbAHQVEK/KjyD03wxokLPXCzTSBO/cD?=
=?us-ascii?Q?VzEhA7nyfzQ2YfxzDANf95cFXqEEsxS9EkJyqiVETQ=3D=3D?=
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 23d100ca-d7ce-4f88-5af6-08dc6e16e2d6
X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2024 21:52:55.5770 (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: PRAP250MB0592
Subject: [FFmpeg-devel] [PATCH 27/28] avcodec/mpegvideoencdsp: Pass bitexact
flag directly
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/GV1P250MB07375EC49AC86F83FD1ACBDD8F1C2@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
Don't pass an AVCodecContext*. This avoids inclusions of avcodec.h
and makes it clearer which parameter affect the returned function
pointers.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavcodec/arm/mpegvideoencdsp_init_arm.c | 3 +--
libavcodec/dnxhdenc.c | 2 +-
libavcodec/mips/mpegvideoencdsp_init_mips.c | 2 +-
libavcodec/mpegvideo_enc.c | 2 +-
libavcodec/mpegvideoencdsp.c | 11 +++++------
libavcodec/mpegvideoencdsp.h | 17 +++++------------
libavcodec/ppc/mpegvideoencdsp.c | 2 +-
libavcodec/svq1enc.c | 2 +-
libavcodec/x86/mpegvideoencdsp_init.c | 13 ++++---------
9 files changed, 20 insertions(+), 34 deletions(-)
diff --git a/libavcodec/arm/mpegvideoencdsp_init_arm.c b/libavcodec/arm/mpegvideoencdsp_init_arm.c
index a95b5bebe9..842079267b 100644
--- a/libavcodec/arm/mpegvideoencdsp_init_arm.c
+++ b/libavcodec/arm/mpegvideoencdsp_init_arm.c
@@ -21,14 +21,13 @@
#include "libavutil/attributes.h"
#include "libavutil/cpu.h"
#include "libavutil/arm/cpu.h"
-#include "libavcodec/avcodec.h"
#include "libavcodec/mpegvideoencdsp.h"
int ff_pix_norm1_armv6(const uint8_t *pix, int line_size);
int ff_pix_sum_armv6(const uint8_t *pix, int line_size);
av_cold void ff_mpegvideoencdsp_init_arm(MpegvideoEncDSPContext *c,
- AVCodecContext *avctx)
+ int bitexact)
{
int cpu_flags = av_get_cpu_flags();
diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c
index 0cb25d7714..6417dc48b9 100644
--- a/libavcodec/dnxhdenc.c
+++ b/libavcodec/dnxhdenc.c
@@ -423,7 +423,7 @@ static av_cold int dnxhd_encode_init(AVCodecContext *avctx)
ff_blockdsp_init(&ctx->bdsp);
ff_fdctdsp_init(&ctx->m.fdsp, avctx);
ff_mpv_idct_init(&ctx->m);
- ff_mpegvideoencdsp_init(&ctx->m.mpvencdsp, avctx);
+ ff_mpegvideoencdsp_init(&ctx->m.mpvencdsp, avctx->flags & AV_CODEC_FLAG_BITEXACT);
ff_pixblockdsp_init(&ctx->m.pdsp, avctx);
ff_dct_encode_init(&ctx->m);
diff --git a/libavcodec/mips/mpegvideoencdsp_init_mips.c b/libavcodec/mips/mpegvideoencdsp_init_mips.c
index 3efbeec34a..4a279e9942 100644
--- a/libavcodec/mips/mpegvideoencdsp_init_mips.c
+++ b/libavcodec/mips/mpegvideoencdsp_init_mips.c
@@ -24,7 +24,7 @@
#include "h263dsp_mips.h"
av_cold void ff_mpegvideoencdsp_init_mips(MpegvideoEncDSPContext *c,
- AVCodecContext *avctx)
+ int bitexact)
{
int cpu_flags = av_get_cpu_flags();
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index ab14538b33..cfdd8fa3c4 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -809,7 +809,7 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx)
ff_fdctdsp_init(&s->fdsp, avctx);
ff_me_cmp_init(&s->mecc, avctx);
- ff_mpegvideoencdsp_init(&s->mpvencdsp, avctx);
+ ff_mpegvideoencdsp_init(&s->mpvencdsp, avctx->flags & AV_CODEC_FLAG_BITEXACT);
ff_drawedgesdsp_init(&s->drawedges);
ff_pixblockdsp_init(&s->pdsp, avctx);
diff --git a/libavcodec/mpegvideoencdsp.c b/libavcodec/mpegvideoencdsp.c
index a6de93456d..b8f740630a 100644
--- a/libavcodec/mpegvideoencdsp.c
+++ b/libavcodec/mpegvideoencdsp.c
@@ -22,7 +22,6 @@
#include "libavutil/avassert.h"
#include "libavutil/attributes.h"
#include "libavutil/imgutils.h"
-#include "avcodec.h"
#include "me_cmp.h"
#include "mpegvideoencdsp.h"
@@ -200,7 +199,7 @@ static void shrink88(uint8_t *dst, int dst_wrap,
}
av_cold void ff_mpegvideoencdsp_init(MpegvideoEncDSPContext *c,
- AVCodecContext *avctx)
+ int bitexact)
{
c->try_8x8basis = try_8x8basis_c;
c->add_8x8basis = add_8x8basis_c;
@@ -214,12 +213,12 @@ av_cold void ff_mpegvideoencdsp_init(MpegvideoEncDSPContext *c,
c->pix_norm1 = pix_norm1_c;
#if ARCH_ARM
- ff_mpegvideoencdsp_init_arm(c, avctx);
+ ff_mpegvideoencdsp_init_arm(c, bitexact);
#elif ARCH_PPC
- ff_mpegvideoencdsp_init_ppc(c, avctx);
+ ff_mpegvideoencdsp_init_ppc(c, bitexact);
#elif ARCH_X86
- ff_mpegvideoencdsp_init_x86(c, avctx);
+ ff_mpegvideoencdsp_init_x86(c, bitexact);
#elif ARCH_MIPS
- ff_mpegvideoencdsp_init_mips(c, avctx);
+ ff_mpegvideoencdsp_init_mips(c, bitexact);
#endif
}
diff --git a/libavcodec/mpegvideoencdsp.h b/libavcodec/mpegvideoencdsp.h
index 46b40cf30e..08dd758494 100644
--- a/libavcodec/mpegvideoencdsp.h
+++ b/libavcodec/mpegvideoencdsp.h
@@ -21,8 +21,6 @@
#include <stdint.h>
-#include "avcodec.h"
-
#define BASIS_SHIFT 16
#define RECON_SHIFT 6
@@ -38,15 +36,10 @@ typedef struct MpegvideoEncDSPContext {
int src_wrap, int width, int height);
} MpegvideoEncDSPContext;
-void ff_mpegvideoencdsp_init(MpegvideoEncDSPContext *c,
- AVCodecContext *avctx);
-void ff_mpegvideoencdsp_init_arm(MpegvideoEncDSPContext *c,
- AVCodecContext *avctx);
-void ff_mpegvideoencdsp_init_ppc(MpegvideoEncDSPContext *c,
- AVCodecContext *avctx);
-void ff_mpegvideoencdsp_init_x86(MpegvideoEncDSPContext *c,
- AVCodecContext *avctx);
-void ff_mpegvideoencdsp_init_mips(MpegvideoEncDSPContext *c,
- AVCodecContext *avctx);
+void ff_mpegvideoencdsp_init(MpegvideoEncDSPContext *c, int bitexact);
+void ff_mpegvideoencdsp_init_arm(MpegvideoEncDSPContext *c, int bitexact);
+void ff_mpegvideoencdsp_init_ppc(MpegvideoEncDSPContext *c, int bitexact);
+void ff_mpegvideoencdsp_init_x86(MpegvideoEncDSPContext *c, int bitexact);
+void ff_mpegvideoencdsp_init_mips(MpegvideoEncDSPContext *c, int bitexact);
#endif /* AVCODEC_MPEGVIDEOENCDSP_H */
diff --git a/libavcodec/ppc/mpegvideoencdsp.c b/libavcodec/ppc/mpegvideoencdsp.c
index 07d3e76ee0..1ec35196f1 100644
--- a/libavcodec/ppc/mpegvideoencdsp.c
+++ b/libavcodec/ppc/mpegvideoencdsp.c
@@ -149,7 +149,7 @@ static int pix_sum_altivec(const uint8_t *pix, int line_size)
#endif /* HAVE_ALTIVEC */
av_cold void ff_mpegvideoencdsp_init_ppc(MpegvideoEncDSPContext *c,
- AVCodecContext *avctx)
+ int bitexact)
{
#if HAVE_ALTIVEC
if (!PPC_ALTIVEC(av_get_cpu_flags()))
diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c
index d71ad07b86..3232803dae 100644
--- a/libavcodec/svq1enc.c
+++ b/libavcodec/svq1enc.c
@@ -591,7 +591,7 @@ static av_cold int svq1_encode_init(AVCodecContext *avctx)
ff_hpeldsp_init(&s->hdsp, avctx->flags);
ff_me_cmp_init(&s->mecc, avctx);
- ff_mpegvideoencdsp_init(&s->m.mpvencdsp, avctx);
+ ff_mpegvideoencdsp_init(&s->m.mpvencdsp, avctx->flags & AV_CODEC_FLAG_BITEXACT);
s->current_picture = av_frame_alloc();
s->last_picture = av_frame_alloc();
diff --git a/libavcodec/x86/mpegvideoencdsp_init.c b/libavcodec/x86/mpegvideoencdsp_init.c
index c816ca2ee7..5b4be0e7bc 100644
--- a/libavcodec/x86/mpegvideoencdsp_init.c
+++ b/libavcodec/x86/mpegvideoencdsp_init.c
@@ -19,7 +19,6 @@
#include "libavutil/attributes.h"
#include "libavutil/cpu.h"
#include "libavutil/x86/cpu.h"
-#include "libavcodec/avcodec.h"
#include "libavcodec/mpegvideoencdsp.h"
int ff_pix_sum16_sse2(const uint8_t *pix, int line_size);
@@ -95,8 +94,7 @@ int ff_pix_norm1_sse2(const uint8_t *pix, int line_size);
#endif /* HAVE_SSSE3_INLINE */
#endif /* HAVE_INLINE_ASM */
-av_cold void ff_mpegvideoencdsp_init_x86(MpegvideoEncDSPContext *c,
- AVCodecContext *avctx)
+av_cold void ff_mpegvideoencdsp_init_x86(MpegvideoEncDSPContext *c, int bitexact)
{
int cpu_flags = av_get_cpu_flags();
@@ -112,24 +110,21 @@ av_cold void ff_mpegvideoencdsp_init_x86(MpegvideoEncDSPContext *c,
#if HAVE_INLINE_ASM
if (INLINE_MMX(cpu_flags)) {
- if (!(avctx->flags & AV_CODEC_FLAG_BITEXACT)) {
+ if (!bitexact)
c->try_8x8basis = try_8x8basis_mmx;
- }
c->add_8x8basis = add_8x8basis_mmx;
}
if (INLINE_AMD3DNOW(cpu_flags)) {
- if (!(avctx->flags & AV_CODEC_FLAG_BITEXACT)) {
+ if (!bitexact)
c->try_8x8basis = try_8x8basis_3dnow;
- }
c->add_8x8basis = add_8x8basis_3dnow;
}
#if HAVE_SSSE3_INLINE
if (INLINE_SSSE3(cpu_flags)) {
- if (!(avctx->flags & AV_CODEC_FLAG_BITEXACT)) {
+ if (!bitexact)
c->try_8x8basis = try_8x8basis_ssse3;
- }
c->add_8x8basis = add_8x8basis_ssse3;
}
#endif /* HAVE_SSSE3_INLINE */
--
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".