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 644E1475C3 for ; Mon, 13 Nov 2023 01:46:20 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BB14A68CC89; Mon, 13 Nov 2023 03:46:18 +0200 (EET) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5600268C9F2 for ; Mon, 13 Nov 2023 03:46:16 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699839977; x=1731375977; h=from:to:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version; bh=ceFoFUwQ37V69rpPTAF/DvU/akOmC/2IEYeq6JAh3wQ=; b=LTjV6E31t6rG9Ov895ZN6LwOfJpMZt8o+xO0l0Qp4Gc/HOPop+Frk1KH YIKroB15823K49sSU4x8Rr3YneYegyQzlBquSz0MWGb/Vj4gx9qFUJdiQ UkfbktMSgRD7C3kEm6Mj0jTEkFlRp1noGQR281AoigM9Q79uNPKGeIE0V 1W017po3mAZ25bccri6dYE7/uTr/+sSI1gChXOjNPqPxvjdf8yH5FYGig PsO6w6Q2oBDW/jWH6KavzbRXEQueNHkRZ4NYjDme7dKw9u7dD/nrGk4ct hnlqKiTr1Qzcbgpnsg6Z59w5aAclk4UyPdcl2o6Uc+Iip3K/pQOqXWDID A==; X-IronPort-AV: E=McAfee;i="6600,9927,10892"; a="476587640" X-IronPort-AV: E=Sophos;i="6.03,298,1694761200"; d="scan'208";a="476587640" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Nov 2023 17:46:14 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10892"; a="937627571" X-IronPort-AV: E=Sophos;i="6.03,298,1694761200"; d="scan'208";a="937627571" Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by orsmga005.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 12 Nov 2023 17:46:13 -0800 Received: from orsmsx601.amr.corp.intel.com (10.22.229.14) by ORSMSX602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Sun, 12 Nov 2023 17:46:13 -0800 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34 via Frontend Transport; Sun, 12 Nov 2023 17:46:13 -0800 Received: from NAM04-MW2-obe.outbound.protection.outlook.com (104.47.73.168) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.34; Sun, 12 Nov 2023 17:46:13 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iNnIHhQmx6Hr7NZdQi1Tp6QvacYfJ/ghXJ4wGkRXVUcgFLkKD/0hVvphAEELc1WN3G6gi6dH9lsLmURI2HScCb6fol67DljiDLFF/DlyvgBOuwm1MlYu1w4v6dVW+Rj53f/PuckiRHg+vUtVpx0GUrr5QMikFQRA2KT9F6gk8VYjXr539+K1sqmbkl7qHPovlIwHnzYkazPOc3EAGlI8OspGI9txz9LFeTm4a70CGylHXn4j/VVKERhb38n2qzTj0ZajHEftjzpbWQmK2R5u+jw0eKkpSieO7oYOdP5v0u5QFa2dqFFhmfiRI4nKZgbupwajJGeVMnqKwS3rUqVapA== 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=aO4eicOaiN4AWUWkutS67EQd3KO9I6GG9s1C2ksmoSE=; b=Yci/XlC/Pdp0FyMWY3oJahUqJ1yBceHvAV/2gLe8lFYMay9Q9F1fkg1cNixr3AeYs5/R4YEIP0baBj2AsRb1OpSXPlbEldYPaBMUEZT3YgXHk9zBwReG0gr0E/efcjqkB/AUloIwecT6oZNnqNJkl4Rw50pb4FHeyyzk59KLf2Qzg9yPNzNy5bdxU2BxBkPrAUZcuvP3oFipxb13s6UJxnlKwp5H/tDzF3VABVdDfGvVeXO9rJj98CnrmOFSwruu4gIHVzsFRpPDl4qXHH0rVHHoi53fO9bVYWCPqQxdsfHGZSqn9JSfys+mwfgDKq2jtnhPtohmzRcloKSNApUAQg== 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 CYXPR11MB8664.namprd11.prod.outlook.com (2603:10b6:930:e6::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.26; Mon, 13 Nov 2023 01:46:11 +0000 Received: from DM6PR11MB2681.namprd11.prod.outlook.com ([fe80::554:31e:c67c:1747]) by DM6PR11MB2681.namprd11.prod.outlook.com ([fe80::554:31e:c67c:1747%6]) with mapi id 15.20.6977.029; Mon, 13 Nov 2023 01:46:11 +0000 From: "Dai, Jianhui J" To: "Dai, Jianhui J" , "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v3] avcodec/vp8: Export `vp8_token_update_probs` variable Thread-Index: AdoV0DIsO8BdEOzaTuiwreFjxJ4PlgAAsomQ Date: Mon, 13 Nov 2023 01:46:11 +0000 Message-ID: References: In-Reply-To: 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-publictraffictype: Email x-ms-traffictypediagnostic: DM6PR11MB2681:EE_|CYXPR11MB8664:EE_ x-ms-office365-filtering-correlation-id: d1377bce-8c50-4cf4-ef96-08dbe3ea5034 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: FfaADCvX9Aty+8sm1cpuLA3naDy6SnDsOie42NzeMoWKDnaOh8OeZFRFTD9+nwrxAaVV932/enjQElRuEPRf5FdbCslKLrIBuMZuR/8HRU2TqAdy4nopDZeXs1VM4Y1GZaBP5WLF8grr2F84p88w5qQTJ7AJ9EFbAkNU5szlbZEP1MyoGyC7aeo/6gUryVc1hXk8AbNld1xVU4mbPmS4L34OXNY8+qO1cTpnv8U/nieVMGbYy2/ZurUYu1NHeWmOQknJwaWcAR6pvJyt7gsoaGKlJY//regas8cPvQbS0bn4u0xhx8SxsAGheam7Z5obMwTaczqhXf4Yok2UeNgrYyMQ1B4LR8DMz3LA8DeWC96Avd15MZrMc0jhhz2bhvESHjGLZMe9VKPTXimTNNWfZjTvzTTiaoAlwEqyixT4HuL5970apzrdEtD+bZ/rLq2PVeMC1V3+q9af2fM8S2rH06X41mvgVPJ2w3p6hdYjaksqDCkeRbSJWQCjoIsox/JXM09YMJ0n3Gf5+Zt4Yvg4RNwya+zWhUuboyV4YBxoiPq+NfnMS/p2N2prRRINfWeX9a9pZv06LJkakvF5h7TxN+m/5xfKqElbw3hi610TjpIowk/0+V7FG8KJvpLCgGa90qJmNzS3zivt3Kfe/pYbTg== 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)(346002)(376002)(136003)(39860400002)(366004)(230922051799003)(64100799003)(1800799009)(451199024)(186009)(55016003)(41300700001)(2906002)(30864003)(5660300002)(8936002)(83380400001)(52536014)(8676002)(316002)(76116006)(38070700009)(66946007)(66476007)(66556008)(66446008)(64756008)(110136005)(33656002)(38100700002)(122000001)(6506007)(53546011)(7696005)(82960400001)(86362001)(478600001)(71200400001)(9686003)(26005)(2940100002)(81973001); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?KhRfRpZBAddRWlE51IBbepF3/mxVhIqILTrqR520JfzsMuvXWQETGv5gv8Pb?= =?us-ascii?Q?P9Fogpxme05J9wVnEetleupBMEM4IoJjYf/w0YPkKETOqKiWxBw6hfNvZ4Ma?= =?us-ascii?Q?BzMCrxoj3snk2W/VnJJiRigt52toudBPE5hKRuid2fijm4OuZrvBcBjvMqwy?= =?us-ascii?Q?FaJ/NicK8RcvrYG76UOQnQ4RxEKL3PCafKa1naO1DnxlhrjxXpN0hBxrCB8+?= =?us-ascii?Q?uimRElrsMzSEcDXHfHeC8sZinhbSX2kCsN6RBjm/HSyk0BwIBYARDtUshZGb?= =?us-ascii?Q?6cZ6FJejVDfQMoGwVXf5Q0gi4tAxqc2kUhwG5NLXdD1+RX3QlG5iDa40E1V3?= =?us-ascii?Q?5+R0p4J38n+PXAd4vPyJIhdmiauam+1J1Hy40dTryuGuv2zUD63uvbrPzZLx?= =?us-ascii?Q?J59NEwoxQHjIjkBx/j3HJl9Lbosn88A2QMIX2e8X6n0DFtIMYma+qVpOAWZP?= =?us-ascii?Q?Lbpy3oNSVq7DmFO7wi3EMt/8iKD/lm+bYBh9lh91O3JFRhQbsmNRd1L+Ck7m?= =?us-ascii?Q?GV0RLDdplKTY9Xz1KsTeqwwJVM3NT/dd2qhFaJgNNi/XLJXbqrsZnXfkUNJL?= =?us-ascii?Q?VgUYmXCmUaWxq6AqVUkQSByh5abM13uDYH51+hIGF9b8jScxn36iODP0GtRY?= =?us-ascii?Q?eof0zXo5a1og/XAqgcoficAq4Zy+i61Q5n2XB5tPyA/FoKDbN++DyNwCIRue?= =?us-ascii?Q?oPAsKPkt1wUpwyJtMWyHCu+JzHlqCElc6eq6o4EcC0ZaHI+s26ts4l/IqdCP?= =?us-ascii?Q?wrKyppTibelveRgSAk26tUle2K/eV1sLRV818VAjhIq0IY0TTu4D/6uH7wJS?= =?us-ascii?Q?nqeeVdp2qmNK1qgy1eWcy6EuDvaz5Ea04x2cMv3qPqefZFt1F2pgsE5YWIFn?= =?us-ascii?Q?14eLfDol1aEYRHMPJK70BP+zxdBZttms9NQ8HBIeVTNxUpwrqRq6XEJtRPiD?= =?us-ascii?Q?gO+gekYKG6Q3A7MQAO5iGQ0vp4pfYG6cgJrZfUjTc/bWbKE55ka3yKW7b62N?= =?us-ascii?Q?/+/ZNwRHD8Ybu6nvPHYzcCrC90ZF2Tp/xyJ//cEYaX8YmLgEJtRFKbxPVpXj?= =?us-ascii?Q?oov5GipgVrUb8NvKDFdg0gLKrm906SL5wfMF6j7gmuxNZLXwo9pjWRBWMJCt?= =?us-ascii?Q?rWtKpSQOfDm9zcMYXsR3vNa54NrKN6si2+UNGaci1q1fmS+9Ds0l6bq/YWln?= =?us-ascii?Q?S0FqcZ6EoH82Zebq8SlQpi1y9I+c0dmI/l0W1iF9DamYl0vGyVq0WT80I63K?= =?us-ascii?Q?uGXLcy+CqM5ddOL5rPdKvUY5JMQJLa9Bgj0I1sdsVIuwgFcDQmKIBC8MvZvU?= =?us-ascii?Q?2wd+3M+LjgOdRimjKl0F3hHgPBibc++4ow0+8fh26Ejfb5Xjlj0ueyvklvk9?= =?us-ascii?Q?EyZ8a54sOeNBlKXI/ru2beFaBGb8cwDglA8xwxnPuApp7d+Wxzj66PqDby2e?= =?us-ascii?Q?xpoyeV+Om/G2Cn1MhfCybSX7JqUfgDXPWo3zUdwHGcWH7GkbE8TPflxgXIuw?= =?us-ascii?Q?VNrdbyjSUtRifzfeSWIMYRvByB3+j3tJ659aETKiQAz1l4lOE7AHChFNE9bF?= =?us-ascii?Q?Mq4d3VvM37Y/cPpCOFg4xSr6HyNQJCr9M0c9wGXR?= 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: d1377bce-8c50-4cf4-ef96-08dbe3ea5034 X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Nov 2023 01:46:11.0326 (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: /VGNpnmH0+Sh6SpisKsBRDfOvaN5weqH2DGmBdIs64upyeDypYdm/WEEe41I0KcYOoZ/muqE++O2VmfLDPKtnw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYXPR11MB8664 X-OriginatorOrg: intel.com Subject: Re: [FFmpeg-devel] [PATCH v3] avcodec/vp8: Export `vp8_token_update_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 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: > -----Original Message----- > From: Dai, Jianhui J > Sent: Monday, November 13, 2023 9:44 AM > To: ffmpeg-devel@ffmpeg.org > Subject: [PATCH v3] avcodec/vp8: Export `vp8_token_update_probs` variable > > This commit exports the `vp8_token_update_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..83c60adeb0 > 100644 > --- a/libavcodec/vp8.c > +++ b/libavcodec/vp8.c > @@ -458,7 +458,7 @@ static void vp78_update_probability_tables(VP8Context > *s) > for (j = 0; j < 8; j++) > for (k = 0; k < 3; k++) > for (l = 0; l < NUM_DCT_TOKENS-1; l++) > - if (vpx_rac_get_prob_branchy(c, vp8_token_update_probs[i][j][k][l])) > { > + if (vpx_rac_get_prob_branchy(c, > + ff_vp8_token_update_probs[i][j][k][l])) { > int prob = vp89_rac_get_uint(c, 8); > for (m = 0; vp8_coeff_band_indexes[j][m] >= 0; m++) > s->prob->token[i][vp8_coeff_band_indexes[j][m]][k][l] = prob; > diff --git a/libavcodec/vp8data.c b/libavcodec/vp8data.c index > 857406928a..675c2a033d 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_update_probs[4][8][3][11] = { > + { > + { > + { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + }, > + { > + { 176, 246, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 223, 241, 252, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 249, 253, 253, 255, 255, 255, 255, 255, 255, 255, 255 }, > + }, > + { > + { 255, 244, 252, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 234, 254, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 253, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + }, > + { > + { 255, 246, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 239, 253, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 254, 255, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > + }, > + { > + { 255, 248, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 251, 255, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + }, > + { > + { 255, 253, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 251, 254, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 254, 255, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > + }, > + { > + { 255, 254, 253, 255, 254, 255, 255, 255, 255, 255, 255 }, > + { 250, 255, 254, 255, 254, 255, 255, 255, 255, 255, 255 }, > + { 254, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + }, > + { > + { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + }, > + }, > + { > + { > + { 217, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 225, 252, 241, 253, 255, 255, 254, 255, 255, 255, 255 }, > + { 234, 250, 241, 250, 253, 255, 253, 254, 255, 255, 255 }, > + }, > + { > + { 255, 254, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 223, 254, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 238, 253, 254, 254, 255, 255, 255, 255, 255, 255, 255 }, > + }, > + { > + { 255, 248, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 249, 254, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + }, > + { > + { 255, 253, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 247, 254, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + }, > + { > + { 255, 253, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 252, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + }, > + { > + { 255, 254, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 253, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + }, > + { > + { 255, 254, 253, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 250, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 254, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + }, > + { > + { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + }, > + }, > + { > + { > + { 186, 251, 250, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 234, 251, 244, 254, 255, 255, 255, 255, 255, 255, 255 }, > + { 251, 251, 243, 253, 254, 255, 254, 255, 255, 255, 255 }, > + }, > + { > + { 255, 253, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 236, 253, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 251, 253, 253, 254, 254, 255, 255, 255, 255, 255, 255 }, > + }, > + { > + { 255, 254, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 254, 254, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + }, > + { > + { 255, 254, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 254, 254, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 254, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + }, > + { > + { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 254, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + }, > + { > + { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + }, > + { > + { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + }, > + { > + { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + }, > + }, > + { > + { > + { 248, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 250, 254, 252, 254, 255, 255, 255, 255, 255, 255, 255 }, > + { 248, 254, 249, 253, 255, 255, 255, 255, 255, 255, 255 }, > + }, > + { > + { 255, 253, 253, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 246, 253, 253, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 252, 254, 251, 254, 254, 255, 255, 255, 255, 255, 255 }, > + }, > + { > + { 255, 254, 252, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 248, 254, 253, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 253, 255, 254, 254, 255, 255, 255, 255, 255, 255, 255 }, > + }, > + { > + { 255, 251, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 245, 251, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 253, 253, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > + }, > + { > + { 255, 251, 253, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 252, 253, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 255, 254, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + }, > + { > + { 255, 252, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 249, 255, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 255, 255, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > + }, > + { > + { 255, 255, 253, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 250, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + }, > + { > + { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 254, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > + }, > + }, > +}; > diff --git a/libavcodec/vp8data.h b/libavcodec/vp8data.h index > 8b8f1ed111..c8e79fdbeb 100644 > --- a/libavcodec/vp8data.h > +++ b/libavcodec/vp8data.h > @@ -513,176 +513,7 @@ static const uint8_t > vp8_token_default_probs[4][8][3][NUM_DCT_TOKENS - 1] = { > }, > }; > > -static const uint8_t vp8_token_update_probs[4][8][3][NUM_DCT_TOKENS - 1] = > { > - { > - { > - { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - }, > - { > - { 176, 246, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 223, 241, 252, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 249, 253, 253, 255, 255, 255, 255, 255, 255, 255, 255 }, > - }, > - { > - { 255, 244, 252, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 234, 254, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 253, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - }, > - { > - { 255, 246, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 239, 253, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 254, 255, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > - }, > - { > - { 255, 248, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 251, 255, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - }, > - { > - { 255, 253, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 251, 254, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 254, 255, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > - }, > - { > - { 255, 254, 253, 255, 254, 255, 255, 255, 255, 255, 255 }, > - { 250, 255, 254, 255, 254, 255, 255, 255, 255, 255, 255 }, > - { 254, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - }, > - { > - { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - }, > - }, > - { > - { > - { 217, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 225, 252, 241, 253, 255, 255, 254, 255, 255, 255, 255 }, > - { 234, 250, 241, 250, 253, 255, 253, 254, 255, 255, 255 }, > - }, > - { > - { 255, 254, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 223, 254, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 238, 253, 254, 254, 255, 255, 255, 255, 255, 255, 255 }, > - }, > - { > - { 255, 248, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 249, 254, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - }, > - { > - { 255, 253, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 247, 254, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - }, > - { > - { 255, 253, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 252, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - }, > - { > - { 255, 254, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 253, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - }, > - { > - { 255, 254, 253, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 250, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 254, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - }, > - { > - { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - }, > - }, > - { > - { > - { 186, 251, 250, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 234, 251, 244, 254, 255, 255, 255, 255, 255, 255, 255 }, > - { 251, 251, 243, 253, 254, 255, 254, 255, 255, 255, 255 }, > - }, > - { > - { 255, 253, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 236, 253, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 251, 253, 253, 254, 254, 255, 255, 255, 255, 255, 255 }, > - }, > - { > - { 255, 254, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 254, 254, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - }, > - { > - { 255, 254, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 254, 254, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 254, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - }, > - { > - { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 254, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - }, > - { > - { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - }, > - { > - { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - }, > - { > - { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - }, > - }, > - { > - { > - { 248, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 250, 254, 252, 254, 255, 255, 255, 255, 255, 255, 255 }, > - { 248, 254, 249, 253, 255, 255, 255, 255, 255, 255, 255 }, > - }, > - { > - { 255, 253, 253, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 246, 253, 253, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 252, 254, 251, 254, 254, 255, 255, 255, 255, 255, 255 }, > - }, > - { > - { 255, 254, 252, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 248, 254, 253, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 253, 255, 254, 254, 255, 255, 255, 255, 255, 255, 255 }, > - }, > - { > - { 255, 251, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 245, 251, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 253, 253, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > - }, > - { > - { 255, 251, 253, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 252, 253, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 255, 254, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - }, > - { > - { 255, 252, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 249, 255, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 255, 255, 254, 255, 255, 255, 255, 255, 255, 255, 255 }, > - }, > - { > - { 255, 255, 253, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 250, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - }, > - { > - { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 254, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, > - }, > - }, > -}; > +extern const uint8_t ff_vp8_token_update_probs[4][8][3][11]; > > static const uint8_t vp8_dc_qlookup[VP8_MAX_QUANT + 1] = { > 4, 5, 6, 7, 8, 9, 10, 10, 11, 12, 13, 14, 15, 16, 17, 17, > -- Fixed the mistake in v2. `vp8_token_update_probs` should be exported instead of ` vp8_token_default _probs`. > 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".