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 7369E455D9 for ; Tue, 9 May 2023 05:28:49 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 471F068C1A6; Tue, 9 May 2023 08:28:46 +0300 (EEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9EB2E68C0AE for ; Tue, 9 May 2023 08:28:38 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1683610123; x=1715146123; h=from:to:subject:date:message-id: content-transfer-encoding:mime-version; bh=y6sToO/dHGSIvykQAFLR1gMbXO7bgHYRhKx9BQJDV4w=; b=WZkeKN8fMI86zm39RlWOxtbZMTOF3r7KPMnnjaR2TlQ5lLGsKcM3miqU d8neow27bC+Llceyq/Xv/0P7lhDexc470EcDWAQzPJQAy3b3Ifcywp7sj SCAZlIsBhLvGAfiFMvGAlctv4KqG+vOHtD/U++chiy3K8YIf1TMmRmToI rLJclWj16psxr4/uOh71e7HJE4cym/y5lm2sHJLPsd/J1sIJCUWTM62q0 F72atuelkPgxteBsEQeBQgE+bMWRWHsDz5Q+HQfLXMPkklRUyMwtWB3ta PxHT2BlOd2khkhCjuUYPLx2mzaSvn/UugtjDiLRFCybvW/UAKwEK486Eh Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10704"; a="352873153" X-IronPort-AV: E=Sophos;i="5.99,261,1677571200"; d="scan'208";a="352873153" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 May 2023 22:28:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10704"; a="788373388" X-IronPort-AV: E=Sophos;i="5.99,261,1677571200"; d="scan'208";a="788373388" Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by FMSMGA003.fm.intel.com with ESMTP; 08 May 2023 22:28:34 -0700 Received: from fmsmsx602.amr.corp.intel.com (10.18.126.82) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Mon, 8 May 2023 22:28:34 -0700 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23 via Frontend Transport; Mon, 8 May 2023 22:28:34 -0700 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.108) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.23; Mon, 8 May 2023 22:28:33 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PFmM3ChPd6o/LKIOhB3cCkbLFRYbTiv5lv1C3bziuhAImHdZZhb7pzFz/vmlPdpLTR87zW/zKxKtH3xIL3GszD4i1SJ4F5atGfkQhaoz1EqSW4et6KHKZaXEHIF8c6HF+FZ43la6GWzFZtLRPyXDkuBMk/24hPgx+Kw722Jcnkbjhg7kGrF4NbVi66fdpWwFVCDXO+yxMbRQU2txzMgSVpcEzMAk9iZCkqmcCcxA8IhWBnu79uT6aBxnL0XZ/vsFwdOTs9+jR+Yw/Z1MZ1GSWIbinFzMlg2sepD18HgGYUOzTvsClyAiIum1+CGcyXbsZ6/gRqdk9xJMe2S6aS5VEw== 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=cMpA1kgqyTK2sLOKzjLR8T5jtSpqWQbGaeWym1unP58=; b=KU1dWtlcNmjwivdr/fe159zpnnYAeUujBJJQOyeTloP557nY4Jj8JA4tijzsHlSBuBU1krHo5ZHn2iD+LLJmGFCfgpLeVj+TP9giTpjdzNtq+OkoOVYo00fh3r0tZM9n9/TuwrnHjHIis8BdykzGCl25Tcv2euAtX6HN/+c8uep4e2hQlATZxPtFDk1LBFbkwWkl8Qhcgeo0e2W/O5OIaoGm/nSRtjXYN4MjDEMcoR0pcDcFIg8luXh/9fO4Q4HqIIBH2A03gwju33hmhlBEwTw/e0cfP+kjcFh8Hj6954E+xhPH97uXGB3PTQzL+mRggKdNqfEnGDg5AXIImVSKfg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from DM6PR11MB2681.namprd11.prod.outlook.com (2603:10b6:5:bd::33) by BL1PR11MB6027.namprd11.prod.outlook.com (2603:10b6:208:392::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6363.33; Tue, 9 May 2023 05:28:27 +0000 Received: from DM6PR11MB2681.namprd11.prod.outlook.com ([fe80::835b:3875:61ba:6a08]) by DM6PR11MB2681.namprd11.prod.outlook.com ([fe80::835b:3875:61ba:6a08%4]) with mapi id 15.20.6363.032; Tue, 9 May 2023 05:28:26 +0000 From: "Dai, Jianhui J" To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH V2] vcodec/vp8data: Move ff_vp8_dct_cat_prob to vp8data.c Thread-Index: AdmCE4kV6gYt1G2GSdSTzH4N0Ym3yQ== Date: Tue, 9 May 2023 05:28:26 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DM6PR11MB2681:EE_|BL1PR11MB6027:EE_ x-ms-office365-filtering-correlation-id: 1e2a4737-c085-4d29-e7c5-08db504e3722 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: pPkKJHu59SBtASwaMtdvkUod9bY4BfABtlu5tow7sQB1oL9q2cm+vBMuI1DuVHPaRKjPCE0Pc9aSC3xEUqkpjvPRCGVqOFsgGp+cLdo8hxnE49e1YJ5/Lw985rIj27pOAyRCHhLfOOscuTKarXzAZ5KnRaQXAdMc0MWCdFfoS4gpJUwV07eZ5mo2aUvHwajOQUTHhe0vGITuZlmNgYliJjLCpBu/Lj9dhzd8scYIPcHh1HXO1kpPslMx2S5s1V4JJVWzScXLBSbZ0dF4mLpXW2VUfZHNM8EDWLN3OF8HqJPcrDHxdmazbtaQnB/eX/aVHVRLl6NfZBZEfVKtAe2Nb0uVN2JcfURuJxlnZtJuydA95QeXkqLDZ4/twGxMn5vcF0ZrL95KSi2UqIQCHf9nFyx8A5ZRkHFqtJZ3saJ75D9/0dP3mWWnqNF6LD0LAivKE09LeKFoG8uuRrAg69VBAwGqtdTyWYN0rWzbQrhKbLBuc8jJoiiInvTLoWXSEnjzR/A/RVQ/xWY51/F4xPS3tVoHtiweA7Ce/KmocTiQWd2xDYl4oBResXevaJtTskQ5eSZ/68r4JWbDupCYhe3HBDzzJTbDbU8ibbnOt7SHpHEJQ686ADs886owAbB9RKYFCNIrrli1W7ItE1PJ3DrS1xxT43VQJ7jGLQo5noDriNM= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR11MB2681.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(366004)(39860400002)(376002)(136003)(346002)(396003)(451199021)(76116006)(86362001)(478600001)(33656002)(66556008)(66476007)(66446008)(64756008)(41300700001)(6916009)(316002)(66946007)(38070700005)(83380400001)(71200400001)(7696005)(8936002)(8676002)(5660300002)(52536014)(38100700002)(122000001)(82960400001)(6506007)(9686003)(26005)(186003)(2906002)(55016003)(2004002)(32563001); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?foCVJ3LBDqSfSLlk5MkXbj6fHNZQ9LPIEQuHferGmqjkt5DIbHiEevopKKfc?= =?us-ascii?Q?uj96VczZYb1QwfQBUo29lVnBgYZP7frDGIQuR6D8XTLSHX2mJsMAvWUG9Xme?= =?us-ascii?Q?AmHCw0rVCxV5FHP/wYhKWmOyHOk0HKf8c1625SvH+bTRLenlpD9MGikKBtDL?= =?us-ascii?Q?4AUaV6RWYYm7W0oxQft9KGOnvCtih49tuxAWcrr2/2zxsFCqngYVx7VHB2KJ?= =?us-ascii?Q?fhIf3bsxhPqO9VjcRUT4XWAOyCbAmOhpYVFbYFU2J5qqRtwkTwLBFIVKv1S8?= =?us-ascii?Q?e7FS9p0R96OiFa8yLxmJkxgHZSqKo7V5E1MLBBe+BBuxTMunq5618u9BErLE?= =?us-ascii?Q?lJc3rTJK1KYpzrvvZl+pX7v3sRmPdePtu/ksUzVRloKPtZQ4JL5JnErFVafy?= =?us-ascii?Q?pucUigfupTrCDIL5/XtnOWMERbqsgt6wnZlic5dLipUkc1YRN8qGXtJA0ni1?= =?us-ascii?Q?UfLj5KP50UfxdfTP38OApz3+SpiltzEe0R/LLJRaubOoBYcTq7azwsOynljm?= =?us-ascii?Q?5Wwadof9wFltQZaJfhsfjaV2WiB2+kFV1u7ejXCW0de/8ROUQjpnw2c/GDHh?= =?us-ascii?Q?zqvBgajjDVnpNT1585OR7m8iHnXcJVhouUGveI6gWgYAJ+Iz8ixVXqbK0Hhm?= =?us-ascii?Q?dqkVmfj4zZAVpty7DW8A2Es9LU01ySNWG4kvFmC2WliM3NbJXFJXhDBMNAzb?= =?us-ascii?Q?VDEh+Q+l6n1gsKgW9dDhcZ7F93gUAROrVm5xXgnPeq6ZWpLd3mWlglICFEAl?= =?us-ascii?Q?VD9WM4tNjidcLagZAonRQCYpsD8hLcDD4pZvdb9uzmIaZirkEUsD4okKf6ye?= =?us-ascii?Q?ddDkAaw+CBrt1gKYsV10r7I7uqL+3ZH+tk31wfRjr7o2SGDmcbVkMTCkJUrk?= =?us-ascii?Q?WKXgY70qRNhxTDM2VCkdNpl1NRC09G4K5RzvNca811u9vSvFFP0SazC+V7eJ?= =?us-ascii?Q?ziqZzMwnUP3/5Hlu+VS5H8KCLShBZEbRAEwj1MlC9XPq0ZT6uZL63GNcqA46?= =?us-ascii?Q?YERKej2UFCwGsARnuo22I79PLPvSJXH+zmG6oeoWMRbTO9zcB7a2KjUO5a2/?= =?us-ascii?Q?FHttm1k2QemE4mLvNxCSlOzEvMUUeXsAYdEwMrVFnIWnOmK1gqGzkrbpqZn/?= =?us-ascii?Q?NMCJYExSYXBgBHKE/cV8yHmKe6Z+MQpv1LflMaCUeR9rAm2YUcIoJBvDeM4M?= =?us-ascii?Q?Bnonrz+7qf018Ex+dO3HCqd0C2bVQtzW5xQxTl8VoXaBk4S4UAfy9Tl9dJII?= =?us-ascii?Q?xBKVr8p7PpRfgAJYSUI8BeN1NELMFGwICs1XQAI1IaUzGxZSuaGhjT8SPG7c?= =?us-ascii?Q?5bip8aCdpXQ6m6HzVtDzQ+kIy9Sd2yiSLoUcQMJeRcTul8UleTmFKQulz60g?= =?us-ascii?Q?FcpKdltuX8EK99nfeDP/NlspstkxEw1KTdSQmMpfmjzHN/bauQbFYKEE3s2A?= =?us-ascii?Q?lnB5n4nTRLo3VW6D/Mw7a95fcIdKWqmciephs45YsB8ftmHxjoZidaggew6O?= =?us-ascii?Q?/m9/32gQaoVepT4NglEFgNiTOHedh0qUMfD41IJ6Tc3+vYMprP2Nm/qbxSmd?= =?us-ascii?Q?7QVmwGtomTbd4NnxrlucNghN0XFbIueErxdCkznk?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB2681.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1e2a4737-c085-4d29-e7c5-08db504e3722 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 May 2023 05:28:26.5269 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: JVfEYyE/QRpCbOOEql6U1I6DNFM8TVkbs44xUt4Ni+j6T6LBklhjGyLyg6HrqtHN1lNd7tTKbhkLD3VLr45a0w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR11MB6027 X-OriginatorOrg: intel.com Subject: [FFmpeg-devel] [PATCH V2] vcodec/vp8data: Move ff_vp8_dct_cat_prob to vp8data.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 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: Avoid compiling error if included by multiple sources. Signed-off-by: Jianhui Dai --- libavcodec/Makefile | 4 ++-- libavcodec/vp8data.c | 42 ++++++++++++++++++++++++++++++++++++++++++ libavcodec/vp8data.h | 20 +------------------- 3 files changed, 45 insertions(+), 21 deletions(-) create mode 100644 libavcodec/vp8data.c diff --git a/libavcodec/Makefile b/libavcodec/Makefile index b0971ce833..3cf4444b7e 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -762,8 +762,8 @@ OBJS-$(CONFIG_VP3_DECODER) += vp3.o jpegquanttables.o OBJS-$(CONFIG_VP5_DECODER) += vp5.o vp56.o vp56data.o vpx_rac.o OBJS-$(CONFIG_VP6_DECODER) += vp6.o vp56.o vp56data.o \ vp6dsp.o vpx_rac.o -OBJS-$(CONFIG_VP7_DECODER) += vp8.o vpx_rac.o -OBJS-$(CONFIG_VP8_DECODER) += vp8.o vpx_rac.o +OBJS-$(CONFIG_VP7_DECODER) += vp8.o vp8data.o vpx_rac.o +OBJS-$(CONFIG_VP8_DECODER) += vp8.o vp8data.o vpx_rac.o OBJS-$(CONFIG_VP8_CUVID_DECODER) += cuviddec.o OBJS-$(CONFIG_VP8_MEDIACODEC_DECODER) += mediacodecdec.o OBJS-$(CONFIG_VP8_QSV_DECODER) += qsvdec.o diff --git a/libavcodec/vp8data.c b/libavcodec/vp8data.c new file mode 100644 index 0000000000..a41fc872f5 --- /dev/null +++ b/libavcodec/vp8data.c @@ -0,0 +1,42 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "stdint.h" + +// cat 1 and 2 are defined in vp8data.h +static const uint8_t vp8_dct_cat3_prob[] = { + 173, 148, 140, 0 +}; +static const uint8_t vp8_dct_cat4_prob[] = { + 176, 155, 140, 135, 0 +}; +static const uint8_t vp8_dct_cat5_prob[] = { + 180, 157, 141, 134, 130, 0 +}; +static const uint8_t vp8_dct_cat6_prob[] = { + 254, 254, 243, 230, 196, 177, 153, 140, 133, 130, 129, 0 +}; + +// only used for cat3 and above; cat 1 and 2 are referenced directly. +const uint8_t *const ff_vp8_dct_cat_prob[] = { + vp8_dct_cat3_prob, + vp8_dct_cat4_prob, + vp8_dct_cat5_prob, + vp8_dct_cat6_prob, +}; + diff --git a/libavcodec/vp8data.h b/libavcodec/vp8data.h index 1fcce134eb..8b8f1ed111 100644 --- a/libavcodec/vp8data.h +++ b/libavcodec/vp8data.h @@ -339,26 +339,8 @@ static const uint8_t vp8_dct_cat1_prob[] = { static const uint8_t vp8_dct_cat2_prob[] = { 165, 145, 0 }; -static const uint8_t vp8_dct_cat3_prob[] = { - 173, 148, 140, 0 -}; -static const uint8_t vp8_dct_cat4_prob[] = { - 176, 155, 140, 135, 0 -}; -static const uint8_t vp8_dct_cat5_prob[] = { - 180, 157, 141, 134, 130, 0 -}; -static const uint8_t vp8_dct_cat6_prob[] = { - 254, 254, 243, 230, 196, 177, 153, 140, 133, 130, 129, 0 -}; -// only used for cat3 and above; cat 1 and 2 are referenced directly -const uint8_t *const ff_vp8_dct_cat_prob[] = { - vp8_dct_cat3_prob, - vp8_dct_cat4_prob, - vp8_dct_cat5_prob, - vp8_dct_cat6_prob, -}; +extern const uint8_t *const ff_vp8_dct_cat_prob[]; static const uint8_t vp8_token_default_probs[4][8][3][NUM_DCT_TOKENS - 1] = { { -- 2.25.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".