From patchwork Wed Nov 8 01:43:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dai, Jianhui J" X-Patchwork-Id: 44570 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:f392:b0:181:818d:5e7f with SMTP id qr18csp82955pzb; Tue, 7 Nov 2023 17:43:43 -0800 (PST) X-Google-Smtp-Source: AGHT+IE35ojIb6GbDgAtVq8d9B1ze6yMdKa3l0O9CjNxAYuln7kjNzfyCFVLqtq0w5vFrvpe1O6R X-Received: by 2002:a50:8714:0:b0:53d:f072:7b0a with SMTP id i20-20020a508714000000b0053df0727b0amr308231edb.39.1699407823247; Tue, 07 Nov 2023 17:43:43 -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 n10-20020a05640205ca00b005435247fcbdsi6502219edx.645.2023.11.07.17.43.42; Tue, 07 Nov 2023 17:43:43 -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=@intel.com header.s=Intel header.b=Ll5gHkPR; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 500A368CCFA; Wed, 8 Nov 2023 03:43:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 22C5E68CCBE for ; Wed, 8 Nov 2023 03:43:31 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699407817; x=1730943817; h=from:to:subject:date:message-id: content-transfer-encoding:mime-version; bh=QDZrSVZKIYKgnSpj86w6i0iTAGVfrGc0fMs8j9pPPLw=; b=Ll5gHkPR5Kv0CqVi4o8lMM9yBFKt6zM2rjCm110P4eg0D2g7B3nMJewo bUT5W3Iy3qcNd0gS3BRLfPJfkgmw8giOb3CkpIaBgDuAnNUaht+rRpMaR X4lmy9VVRdlPfN0mz0rnUmSjhoSi6n9yWrPjnnFPrv/ZqKyI0WN7FQrKI S4S9StVXQ0504l04oMnRXBnzKu24Z1mUM/ek1ayvVvLWzm2adG5D0uixv vZwBy4OG1+VqtEYekhkBaNtrkCUit0bjnSbdSRONy4AO3qUgXJzXAnJ80 mX0oCvOsOGzLmQX36VjOFh39z87ACFHqHSQAsTRJs8mKaKmHFgLxMzhhK A==; X-IronPort-AV: E=McAfee;i="6600,9927,10887"; a="386841139" X-IronPort-AV: E=Sophos;i="6.03,285,1694761200"; d="scan'208";a="386841139" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Nov 2023 17:43:28 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10887"; a="886501788" X-IronPort-AV: E=Sophos;i="6.03,285,1694761200"; d="scan'208";a="886501788" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by orsmga004.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 07 Nov 2023 17:43:28 -0800 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Tue, 7 Nov 2023 17:43:27 -0800 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Tue, 7 Nov 2023 17:43:27 -0800 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx611.amr.corp.intel.com (10.18.126.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34 via Frontend Transport; Tue, 7 Nov 2023 17:43:27 -0800 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (104.47.58.168) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.34; Tue, 7 Nov 2023 17:43:27 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BjLtyi7kLpC/ZeVH2sZH2N6jK98vulFN3nCGEJigFcNeesuCI1uwMdIOpdcjuxvYpn76jArULvJM1parRFrFp5jW9ej5GQKYHCSyC5lS5cWysecflTSdQeLhWZY3lykj+iV8uiG+5L5pGU+N0wIF54cJAySLyoy7nYgUfklxmw+gNj2XeViZ5FJoXe49iTS0GSqq2okxVR9ttgGhOpPUJ/rYK5fyZpYEainM+hd9bRuNw3cE3mNmZxo52pHrZHW4GkoBAWA1DrLleHQaPzwlmRxEB1PUDOOKRCZBm8DMIefRFJtF1LM+45ZQ5vM92sGKSDDSitiisV7KyS/e6ROCjA== 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=IK4H0HC+EWQ5WX9PBx1Kwf8GZnkMCVizia0y6Dc+9bQ=; b=M7Tilg5ZhEnPorIHJ/nU02XCovGt4wU1UHDyKAc0rNYTOSvDOBPmaeGcst+yM4IcEDfKt4KxBLMju1L3ClBG+jVhuIsCG3WBZuFAp7K5hk2CjwbLkUsz11bD8eqpkMSDfxPKk2wgWYXBjwdstfJDZSQB2hHBf/FwqNMrpSft2PI255Esk9b/wU1DgxkDU5xnoH35+Be3T3+1ujZ4UHy71+Ql262l99FgVBdTRLSCfGNsROUzeO63VspjzZPWdgbZUFxueC0tpH/sBRlnjXG0/Q/baxKIVeGH53FbFqjBy2jgleBC2DsY27TNKmk9Up7kWOZ8FzioY/w+fiVAbxG2bw== 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 SA1PR11MB8256.namprd11.prod.outlook.com (2603:10b6:806:253::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.28; Wed, 8 Nov 2023 01:43:25 +0000 Received: from DM6PR11MB2681.namprd11.prod.outlook.com ([fe80::c129:6547:c4b5:f256]) by DM6PR11MB2681.namprd11.prod.outlook.com ([fe80::c129:6547:c4b5:f256%7]) with mapi id 15.20.6954.028; Wed, 8 Nov 2023 01:43:24 +0000 From: "Dai, Jianhui J" To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v2] avcodec/vp8: Export `vp8_token_default_probs` variable Thread-Index: AdoR4qgEl0dEHfaBQ8yoHlS0EjImxw== Date: Wed, 8 Nov 2023 01:43:24 +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_|SA1PR11MB8256:EE_ x-ms-office365-filtering-correlation-id: 1f7978c6-fdad-49b3-49e6-08dbdffc1915 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: kM3PlGtfYaDTYOg8iqzx2O1ORrRZviAf3RI7zNyCVD+Hq8fEMdIcwwFCJBq6TwPjPwmHU/CJNnM7b03CLZvoX7SlqIIw1tGjI8O3dST0fhe0tXCXw/ZNyI0WAVSPAssgGePoT+FWfG88prKKySSdZ9OLJHM2ZoMTjZ5rP9MdNFS1qAt0s//IXb9nM8OhONRY/w4vNZhvW5yts/RdE7cnGKoypheMN2Dt3BGz4mFQ/jp57HCCgT/ZgKU7B00zd3QSsabU+/ASrYpqPd8t0MOk/i4ujpGKklrcjaXfrNT7fB6F0fPGEIxQfszjc036gqCBx8jVpys5vxAoo6YRI8QX8TxU4iF2kOakGE/Ei9kG1mR72Xn2ICA03V0OtSf3As3ArKc9P4+BOjzoaYCukEVeughmlhMdhOn+DjuoAhdk6Ce4nuqcpHvjhkx5E/GVnQ27O/8neZ4J48Qfa2E0zwJp4GKorwABhWFktVtU1tOJXBpmK8Znah8uwoktIvbB9zm46rGKWrRfNbtT8tMsAMszqMWBtWEeRGUuDMJfhuaVwjIzVT3xOXBotmdF8EkXkt+w4jWDkad0htnqi4yOFubBH9Jt4cHZ5CdgIs5VUKO5bOtCtvwUflS834BfRF7VkYYUCk8CgUb8pPXIw0w+wB9oNA== 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:(13230031)(396003)(376002)(346002)(366004)(136003)(39860400002)(230922051799003)(64100799003)(1800799009)(186009)(451199024)(478600001)(41300700001)(9686003)(7696005)(6506007)(71200400001)(8936002)(52536014)(83380400001)(8676002)(5660300002)(76116006)(2906002)(30864003)(26005)(6916009)(64756008)(66476007)(66946007)(66446008)(316002)(66556008)(38100700002)(122000001)(82960400001)(86362001)(55016003)(38070700009)(33656002)(81973001); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: D53T2ivon9AG9CEWIMFEfyzkchN5nq/gV/8p7dAV6HCQvrR/FClGjYzm+hNbcrFPi/koH3wi8NL6XV6SnSlqPA38w9X4lUn7+Jhe1kKPRFBtSNoERn23dpqXrVclEnTZ7LYBMKvb5zweMP7FRs9Y4qqppMOTE2tQGJkqCOVJ5cmZobX7yjz0MgXXaBhzkqnzgGiaHaN5/du62YmE7bm0PuVE/xbd8xyUgwHM33cGUWwitM5j7w1EjxA1JGXnIXftdbGrSlHrIRUFH95kRiaCNJORqc04uGaskkgwle5oWy/IBtkJ5dZ/scDU6R4jetR7D4J9f+jFnMEHlL8uqhyBDI+330VM7exzBvLDFFnipljCzn2aLOP+wnK90qNCmooI3NIhXN3FLVXKyDlU71CuPMQ3hcfJbO2dEvkPPojU7QeObzqLRhsmYjDFLW0XOFm9rU2PHEDa+NsujlMwxbfvUURIKrdL92YBigY+ya8MDARSZv4nWY7KLJMPbxGGl9vuuK63CZ6hZvbU+J07TbZ0ITiDbVcSPtWV/AWOQF/6XJ1ZT+RWU22wXf9xnNC2lauomJ7NuMQySYso4pD5dQgg+R0RwPTKX0OidgBtB/oO6n2GrEfV1tFcELDbGQv9cF59tAZD1j7/IiPlziFPzmRBNbvgyitmjykeCNRuzhJht7QSijz6oy1UNHiEZDrpXU0lwkQxSyzp+pF6wWadS7wMY7sPPURU3sIKIDiIBN681e7gqy050EyOhlrH1AztJM81H5AJNFaC3F94in9WMIyLsWwy13oeCynROk7lOFXsG71NKfegg7MQz1jx5gk7Q472f693TBizlq0RHT3cyMUI9cKCb0LErFKLAA7ynQB9KCZbOl4rkOKfe40iUlVuZCo6cqteiGbPFQT3zqW4UMvJLJVo/ea6UFAs6wq2/OoVcnNCR52IuUM5yRDJGyJ3vfRf3Vm3w5GtgZ5E29vRt69yxq8e2YHx3Jobd0HePHaXhH/IDwxrd25m2B7qVoI7YPHmw+FxXNxldjmg2rRk93i2P99mngBsyFLLpiolGivwzuFrlC+bT5TmrJZBHbHCg3lxZDM4vOZisWQygLoy+SES6+FV2ISM2QQZfW9zhPZMQWi1Yizl8vY5MuMHP/wTvgIrgLS75JJwvdZiK3AMDQJo4GFzL08LpnCyD7Or9E8d1frL5Miqd72sChD7jGT6j4Ob37nGKJWN3cKoyW/aepExwWmGjnrNVLiYf706oUlLeUdwva4IATkZhwIr/f/Qz4iDdZa5U+Xt4iH4nGqQpjWKwyb00+a8C5ZvTkZTOUAK9jY7dSgaHDCtZ6opin0Lpbj/71JGNz3QsZNbzKdqWVCOYrA2hLky3fnDeuM5hIasYGHkcbdrqQBl6e+O+NYfnDrHInfCKA9mEE+4Shnye6f+OQvy81b0biLH0WEJPcUqgQ9uTGoAyxF6ip3NMuIv5YRApaEp4kghIoAcpFekUiQ1GLSKtkUp0AW95Dz6YR1/4cUwu6A7IpTCK2cM9Z+fwbvqV0F/7QVzjZv/mlvkhjPJLTF3W0OsoBjhIUoJcPAeFu2FqP8dtVxxderlBdr99Eqb 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: 1f7978c6-fdad-49b3-49e6-08dbdffc1915 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Nov 2023 01:43:24.8184 (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: ph+sSopixV8lP89T7hSC8Nwe/cuqvzIvHOkYaIf8agMYGzaksmbja+NEQfHaSBUlKu4FhwJwPnAEinxTSnpRlw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR11MB8256 X-OriginatorOrg: intel.com Subject: [FFmpeg-devel] [PATCH v2] avcodec/vp8: Export `vp8_token_default_probs` variable 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: rvEBVLKW3CT+ This commit exports the `vp8_token_default_probs` variable to internal library scope to facilitate its reuse within the library. Signed-off-by: Jianhui Dai --- libavcodec/vp8.c | 2 +- libavcodec/vp8data.c | 170 ++++++++++++++++++++++++++++++++++++++++++ libavcodec/vp8data.h | 171 +------------------------------------------ 3 files changed, 172 insertions(+), 171 deletions(-) diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index ffc430dd32..de44fdcc21 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -445,7 +445,7 @@ static void vp78_reset_probability_tables(VP8Context *s) int i, j; for (i = 0; i < 4; i++) for (j = 0; j < 16; j++) - memcpy(s->prob->token[i][j], vp8_token_default_probs[i][vp8_coeff_band[j]], + memcpy(s->prob->token[i][j], ff_vp8_token_default_probs[i][vp8_coeff_band[j]], sizeof(s->prob->token[i][j])); } diff --git a/libavcodec/vp8data.c b/libavcodec/vp8data.c index 857406928a..b0a029f902 100644 --- a/libavcodec/vp8data.c +++ b/libavcodec/vp8data.c @@ -40,3 +40,173 @@ const uint8_t *const ff_vp8_dct_cat_prob[] = { vp8_dct_cat6_prob, }; +const uint8_t ff_vp8_token_default_probs[4][8][3][11] = { + { + { + { 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 }, + { 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 }, + { 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 }, + }, + { + { 253, 136, 254, 255, 228, 219, 128, 128, 128, 128, 128 }, + { 189, 129, 242, 255, 227, 213, 255, 219, 128, 128, 128 }, + { 106, 126, 227, 252, 214, 209, 255, 255, 128, 128, 128 }, + }, + { + { 1, 98, 248, 255, 236, 226, 255, 255, 128, 128, 128 }, + { 181, 133, 238, 254, 221, 234, 255, 154, 128, 128, 128 }, + { 78, 134, 202, 247, 198, 180, 255, 219, 128, 128, 128 }, + }, + { + { 1, 185, 249, 255, 243, 255, 128, 128, 128, 128, 128 }, + { 184, 150, 247, 255, 236, 224, 128, 128, 128, 128, 128 }, + { 77, 110, 216, 255, 236, 230, 128, 128, 128, 128, 128 }, + }, + { + { 1, 101, 251, 255, 241, 255, 128, 128, 128, 128, 128 }, + { 170, 139, 241, 252, 236, 209, 255, 255, 128, 128, 128 }, + { 37, 116, 196, 243, 228, 255, 255, 255, 128, 128, 128 }, + }, + { + { 1, 204, 254, 255, 245, 255, 128, 128, 128, 128, 128 }, + { 207, 160, 250, 255, 238, 128, 128, 128, 128, 128, 128 }, + { 102, 103, 231, 255, 211, 171, 128, 128, 128, 128, 128 }, + }, + { + { 1, 152, 252, 255, 240, 255, 128, 128, 128, 128, 128 }, + { 177, 135, 243, 255, 234, 225, 128, 128, 128, 128, 128 }, + { 80, 129, 211, 255, 194, 224, 128, 128, 128, 128, 128 }, + }, + { + { 1, 1, 255, 128, 128, 128, 128, 128, 128, 128, 128 }, + { 246, 1, 255, 128, 128, 128, 128, 128, 128, 128, 128 }, + { 255, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 }, + }, + }, + { + { + { 198, 35, 237, 223, 193, 187, 162, 160, 145, 155, 62 }, + { 131, 45, 198, 221, 172, 176, 220, 157, 252, 221, 1 }, + { 68, 47, 146, 208, 149, 167, 221, 162, 255, 223, 128 }, + }, + { + { 1, 149, 241, 255, 221, 224, 255, 255, 128, 128, 128 }, + { 184, 141, 234, 253, 222, 220, 255, 199, 128, 128, 128 }, + { 81, 99, 181, 242, 176, 190, 249, 202, 255, 255, 128 }, + }, + { + { 1, 129, 232, 253, 214, 197, 242, 196, 255, 255, 128 }, + { 99, 121, 210, 250, 201, 198, 255, 202, 128, 128, 128 }, + { 23, 91, 163, 242, 170, 187, 247, 210, 255, 255, 128 }, + }, + { + { 1, 200, 246, 255, 234, 255, 128, 128, 128, 128, 128 }, + { 109, 178, 241, 255, 231, 245, 255, 255, 128, 128, 128 }, + { 44, 130, 201, 253, 205, 192, 255, 255, 128, 128, 128 }, + }, + { + { 1, 132, 239, 251, 219, 209, 255, 165, 128, 128, 128 }, + { 94, 136, 225, 251, 218, 190, 255, 255, 128, 128, 128 }, + { 22, 100, 174, 245, 186, 161, 255, 199, 128, 128, 128 }, + }, + { + { 1, 182, 249, 255, 232, 235, 128, 128, 128, 128, 128 }, + { 124, 143, 241, 255, 227, 234, 128, 128, 128, 128, 128 }, + { 35, 77, 181, 251, 193, 211, 255, 205, 128, 128, 128 }, + }, + { + { 1, 157, 247, 255, 236, 231, 255, 255, 128, 128, 128 }, + { 121, 141, 235, 255, 225, 227, 255, 255, 128, 128, 128 }, + { 45, 99, 188, 251, 195, 217, 255, 224, 128, 128, 128 }, + }, + { + { 1, 1, 251, 255, 213, 255, 128, 128, 128, 128, 128 }, + { 203, 1, 248, 255, 255, 128, 128, 128, 128, 128, 128 }, + { 137, 1, 177, 255, 224, 255, 128, 128, 128, 128, 128 }, + }, + }, + { + { + { 253, 9, 248, 251, 207, 208, 255, 192, 128, 128, 128 }, + { 175, 13, 224, 243, 193, 185, 249, 198, 255, 255, 128 }, + { 73, 17, 171, 221, 161, 179, 236, 167, 255, 234, 128 }, + }, + { + { 1, 95, 247, 253, 212, 183, 255, 255, 128, 128, 128 }, + { 239, 90, 244, 250, 211, 209, 255, 255, 128, 128, 128 }, + { 155, 77, 195, 248, 188, 195, 255, 255, 128, 128, 128 }, + }, + { + { 1, 24, 239, 251, 218, 219, 255, 205, 128, 128, 128 }, + { 201, 51, 219, 255, 196, 186, 128, 128, 128, 128, 128 }, + { 69, 46, 190, 239, 201, 218, 255, 228, 128, 128, 128 }, + }, + { + { 1, 191, 251, 255, 255, 128, 128, 128, 128, 128, 128 }, + { 223, 165, 249, 255, 213, 255, 128, 128, 128, 128, 128 }, + { 141, 124, 248, 255, 255, 128, 128, 128, 128, 128, 128 }, + }, + { + { 1, 16, 248, 255, 255, 128, 128, 128, 128, 128, 128 }, + { 190, 36, 230, 255, 236, 255, 128, 128, 128, 128, 128 }, + { 149, 1, 255, 128, 128, 128, 128, 128, 128, 128, 128 }, + }, + { + { 1, 226, 255, 128, 128, 128, 128, 128, 128, 128, 128 }, + { 247, 192, 255, 128, 128, 128, 128, 128, 128, 128, 128 }, + { 240, 128, 255, 128, 128, 128, 128, 128, 128, 128, 128 }, + }, + { + { 1, 134, 252, 255, 255, 128, 128, 128, 128, 128, 128 }, + { 213, 62, 250, 255, 255, 128, 128, 128, 128, 128, 128 }, + { 55, 93, 255, 128, 128, 128, 128, 128, 128, 128, 128 }, + }, + { + { 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 }, + { 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 }, + { 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 }, + }, + }, + { + { + { 202, 24, 213, 235, 186, 191, 220, 160, 240, 175, 255 }, + { 126, 38, 182, 232, 169, 184, 228, 174, 255, 187, 128 }, + { 61, 46, 138, 219, 151, 178, 240, 170, 255, 216, 128 }, + }, + { + { 1, 112, 230, 250, 199, 191, 247, 159, 255, 255, 128 }, + { 166, 109, 228, 252, 211, 215, 255, 174, 128, 128, 128 }, + { 39, 77, 162, 232, 172, 180, 245, 178, 255, 255, 128 }, + }, + { + { 1, 52, 220, 246, 198, 199, 249, 220, 255, 255, 128 }, + { 124, 74, 191, 243, 183, 193, 250, 221, 255, 255, 128 }, + { 24, 71, 130, 219, 154, 170, 243, 182, 255, 255, 128 }, + }, + { + { 1, 182, 225, 249, 219, 240, 255, 224, 128, 128, 128 }, + { 149, 150, 226, 252, 216, 205, 255, 171, 128, 128, 128 }, + { 28, 108, 170, 242, 183, 194, 254, 223, 255, 255, 128 }, + }, + { + { 1, 81, 230, 252, 204, 203, 255, 192, 128, 128, 128 }, + { 123, 102, 209, 247, 188, 196, 255, 233, 128, 128, 128 }, + { 20, 95, 153, 243, 164, 173, 255, 203, 128, 128, 128 }, + }, + { + { 1, 222, 248, 255, 216, 213, 128, 128, 128, 128, 128 }, + { 168, 175, 246, 252, 235, 205, 255, 255, 128, 128, 128 }, + { 47, 116, 215, 255, 211, 212, 255, 255, 128, 128, 128 }, + }, + { + { 1, 121, 236, 253, 212, 214, 255, 255, 128, 128, 128 }, + { 141, 84, 213, 252, 201, 202, 255, 219, 128, 128, 128 }, + { 42, 80, 160, 240, 162, 185, 255, 205, 128, 128, 128 }, + }, + { + { 1, 1, 255, 128, 128, 128, 128, 128, 128, 128, 128 }, + { 244, 1, 255, 128, 128, 128, 128, 128, 128, 128, 128 }, + { 238, 1, 255, 128, 128, 128, 128, 128, 128, 128, 128 }, + }, + }, +}; diff --git a/libavcodec/vp8data.h b/libavcodec/vp8data.h index 8b8f1ed111..4ba45926cb 100644 --- a/libavcodec/vp8data.h +++ b/libavcodec/vp8data.h @@ -342,176 +342,7 @@ static const uint8_t vp8_dct_cat2_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] = { - { - { - { 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 }, - { 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 }, - { 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 }, - }, - { - { 253, 136, 254, 255, 228, 219, 128, 128, 128, 128, 128 }, - { 189, 129, 242, 255, 227, 213, 255, 219, 128, 128, 128 }, - { 106, 126, 227, 252, 214, 209, 255, 255, 128, 128, 128 }, - }, - { - { 1, 98, 248, 255, 236, 226, 255, 255, 128, 128, 128 }, - { 181, 133, 238, 254, 221, 234, 255, 154, 128, 128, 128 }, - { 78, 134, 202, 247, 198, 180, 255, 219, 128, 128, 128 }, - }, - { - { 1, 185, 249, 255, 243, 255, 128, 128, 128, 128, 128 }, - { 184, 150, 247, 255, 236, 224, 128, 128, 128, 128, 128 }, - { 77, 110, 216, 255, 236, 230, 128, 128, 128, 128, 128 }, - }, - { - { 1, 101, 251, 255, 241, 255, 128, 128, 128, 128, 128 }, - { 170, 139, 241, 252, 236, 209, 255, 255, 128, 128, 128 }, - { 37, 116, 196, 243, 228, 255, 255, 255, 128, 128, 128 }, - }, - { - { 1, 204, 254, 255, 245, 255, 128, 128, 128, 128, 128 }, - { 207, 160, 250, 255, 238, 128, 128, 128, 128, 128, 128 }, - { 102, 103, 231, 255, 211, 171, 128, 128, 128, 128, 128 }, - }, - { - { 1, 152, 252, 255, 240, 255, 128, 128, 128, 128, 128 }, - { 177, 135, 243, 255, 234, 225, 128, 128, 128, 128, 128 }, - { 80, 129, 211, 255, 194, 224, 128, 128, 128, 128, 128 }, - }, - { - { 1, 1, 255, 128, 128, 128, 128, 128, 128, 128, 128 }, - { 246, 1, 255, 128, 128, 128, 128, 128, 128, 128, 128 }, - { 255, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 }, - }, - }, - { - { - { 198, 35, 237, 223, 193, 187, 162, 160, 145, 155, 62 }, - { 131, 45, 198, 221, 172, 176, 220, 157, 252, 221, 1 }, - { 68, 47, 146, 208, 149, 167, 221, 162, 255, 223, 128 }, - }, - { - { 1, 149, 241, 255, 221, 224, 255, 255, 128, 128, 128 }, - { 184, 141, 234, 253, 222, 220, 255, 199, 128, 128, 128 }, - { 81, 99, 181, 242, 176, 190, 249, 202, 255, 255, 128 }, - }, - { - { 1, 129, 232, 253, 214, 197, 242, 196, 255, 255, 128 }, - { 99, 121, 210, 250, 201, 198, 255, 202, 128, 128, 128 }, - { 23, 91, 163, 242, 170, 187, 247, 210, 255, 255, 128 }, - }, - { - { 1, 200, 246, 255, 234, 255, 128, 128, 128, 128, 128 }, - { 109, 178, 241, 255, 231, 245, 255, 255, 128, 128, 128 }, - { 44, 130, 201, 253, 205, 192, 255, 255, 128, 128, 128 }, - }, - { - { 1, 132, 239, 251, 219, 209, 255, 165, 128, 128, 128 }, - { 94, 136, 225, 251, 218, 190, 255, 255, 128, 128, 128 }, - { 22, 100, 174, 245, 186, 161, 255, 199, 128, 128, 128 }, - }, - { - { 1, 182, 249, 255, 232, 235, 128, 128, 128, 128, 128 }, - { 124, 143, 241, 255, 227, 234, 128, 128, 128, 128, 128 }, - { 35, 77, 181, 251, 193, 211, 255, 205, 128, 128, 128 }, - }, - { - { 1, 157, 247, 255, 236, 231, 255, 255, 128, 128, 128 }, - { 121, 141, 235, 255, 225, 227, 255, 255, 128, 128, 128 }, - { 45, 99, 188, 251, 195, 217, 255, 224, 128, 128, 128 }, - }, - { - { 1, 1, 251, 255, 213, 255, 128, 128, 128, 128, 128 }, - { 203, 1, 248, 255, 255, 128, 128, 128, 128, 128, 128 }, - { 137, 1, 177, 255, 224, 255, 128, 128, 128, 128, 128 }, - }, - }, - { - { - { 253, 9, 248, 251, 207, 208, 255, 192, 128, 128, 128 }, - { 175, 13, 224, 243, 193, 185, 249, 198, 255, 255, 128 }, - { 73, 17, 171, 221, 161, 179, 236, 167, 255, 234, 128 }, - }, - { - { 1, 95, 247, 253, 212, 183, 255, 255, 128, 128, 128 }, - { 239, 90, 244, 250, 211, 209, 255, 255, 128, 128, 128 }, - { 155, 77, 195, 248, 188, 195, 255, 255, 128, 128, 128 }, - }, - { - { 1, 24, 239, 251, 218, 219, 255, 205, 128, 128, 128 }, - { 201, 51, 219, 255, 196, 186, 128, 128, 128, 128, 128 }, - { 69, 46, 190, 239, 201, 218, 255, 228, 128, 128, 128 }, - }, - { - { 1, 191, 251, 255, 255, 128, 128, 128, 128, 128, 128 }, - { 223, 165, 249, 255, 213, 255, 128, 128, 128, 128, 128 }, - { 141, 124, 248, 255, 255, 128, 128, 128, 128, 128, 128 }, - }, - { - { 1, 16, 248, 255, 255, 128, 128, 128, 128, 128, 128 }, - { 190, 36, 230, 255, 236, 255, 128, 128, 128, 128, 128 }, - { 149, 1, 255, 128, 128, 128, 128, 128, 128, 128, 128 }, - }, - { - { 1, 226, 255, 128, 128, 128, 128, 128, 128, 128, 128 }, - { 247, 192, 255, 128, 128, 128, 128, 128, 128, 128, 128 }, - { 240, 128, 255, 128, 128, 128, 128, 128, 128, 128, 128 }, - }, - { - { 1, 134, 252, 255, 255, 128, 128, 128, 128, 128, 128 }, - { 213, 62, 250, 255, 255, 128, 128, 128, 128, 128, 128 }, - { 55, 93, 255, 128, 128, 128, 128, 128, 128, 128, 128 }, - }, - { - { 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 }, - { 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 }, - { 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 }, - }, - }, - { - { - { 202, 24, 213, 235, 186, 191, 220, 160, 240, 175, 255 }, - { 126, 38, 182, 232, 169, 184, 228, 174, 255, 187, 128 }, - { 61, 46, 138, 219, 151, 178, 240, 170, 255, 216, 128 }, - }, - { - { 1, 112, 230, 250, 199, 191, 247, 159, 255, 255, 128 }, - { 166, 109, 228, 252, 211, 215, 255, 174, 128, 128, 128 }, - { 39, 77, 162, 232, 172, 180, 245, 178, 255, 255, 128 }, - }, - { - { 1, 52, 220, 246, 198, 199, 249, 220, 255, 255, 128 }, - { 124, 74, 191, 243, 183, 193, 250, 221, 255, 255, 128 }, - { 24, 71, 130, 219, 154, 170, 243, 182, 255, 255, 128 }, - }, - { - { 1, 182, 225, 249, 219, 240, 255, 224, 128, 128, 128 }, - { 149, 150, 226, 252, 216, 205, 255, 171, 128, 128, 128 }, - { 28, 108, 170, 242, 183, 194, 254, 223, 255, 255, 128 }, - }, - { - { 1, 81, 230, 252, 204, 203, 255, 192, 128, 128, 128 }, - { 123, 102, 209, 247, 188, 196, 255, 233, 128, 128, 128 }, - { 20, 95, 153, 243, 164, 173, 255, 203, 128, 128, 128 }, - }, - { - { 1, 222, 248, 255, 216, 213, 128, 128, 128, 128, 128 }, - { 168, 175, 246, 252, 235, 205, 255, 255, 128, 128, 128 }, - { 47, 116, 215, 255, 211, 212, 255, 255, 128, 128, 128 }, - }, - { - { 1, 121, 236, 253, 212, 214, 255, 255, 128, 128, 128 }, - { 141, 84, 213, 252, 201, 202, 255, 219, 128, 128, 128 }, - { 42, 80, 160, 240, 162, 185, 255, 205, 128, 128, 128 }, - }, - { - { 1, 1, 255, 128, 128, 128, 128, 128, 128, 128, 128 }, - { 244, 1, 255, 128, 128, 128, 128, 128, 128, 128, 128 }, - { 238, 1, 255, 128, 128, 128, 128, 128, 128, 128, 128 }, - }, - }, -}; +extern const uint8_t ff_vp8_token_default_probs[4][8][3][11]; static const uint8_t vp8_token_update_probs[4][8][3][NUM_DCT_TOKENS - 1] = { {