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 000B2442C7 for ; Tue, 6 Sep 2022 01:34:02 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4B4D068B9DB; Tue, 6 Sep 2022 04:34:00 +0300 (EEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064035.outbound.protection.outlook.com [40.92.64.35]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 06F2168B72B for ; Tue, 6 Sep 2022 04:33:53 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LA47z/UPXzmwUSSy4Yiv9hhxzQepDkeVwJTfSqWb4sVHiGynX1+vLsOwdoysA1UYts9NAPr74C30t5UuRkU94cptyhaqTkNxAqs7kfbM0sviOw/kMC/v7JuKw+tmzVnT122gt5IC8WZ7pIDMN66UxuEqhZKPzbccjHM8QMjrxMd5gEySguHIqTlfkfAortLK7fnr38F3vgEMt44m3TTSfPYXrTZOo0YQAqMI7MxRpCP+Pytd8P7oOMSlshkYTwlpXhmrlcYkVI5Lp8UwcXUQ6OpliXQzAeewqn075rmlymgpYP9G3kwg49H8T2CKp4IfoLfWE7Rf9ST7XTCq5hpOcA== 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=l8rUBohN0jY54p+895SU2ra6GYZByouupbfDojtNvn4=; b=MMUt61znSW342mLSVPX/+yWhRFdiMzENLqDTW57+2ZqELPgwUeImW/QPuJqNB6Xh6VJYNO5RQhEySNY8h2it6rfQ5o6XiX7iMwRvn4rUb5kpPTbAP+FSUogGLHqfoUz+rJd2aThyUKq/AOo3JlIMWKR4/Ztbnju8At2h+cmTygu9SRTcgrbvFbXXj5FrP7WOOjM0t+StJqMEtZ+oG8H2E5YbqAmQyco4yJ1t9rIKNL9Tppesn2+hIbxajJylEOWNQCVYAveE68nkSyDUT8ChN64OESFBgqYpEqJqmq6Jl0MX+yMHVFGrmeu+eSLQxSZPHd1vZCOYjm2/G+m5pQzjyg== 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=l8rUBohN0jY54p+895SU2ra6GYZByouupbfDojtNvn4=; b=quISxgeJJD12OipVtn0OcSGAN1nFRvtIVPnbbKgxGp/nGKB82MRk/8GNIXemV2QzL7Uaz+4IcErvKzvszASR/Jh0NsNOWwc1M9PR6A4ZTmdJ0lcatUyTz251js6V/1YqXmX2NcFvfNquODtPvwH/wpJN6EdU73/SDQGYqMFxcIUXxL/PfnmbnUzij3E48ERKCg6Z2PGOecBZOtVk0fH+q+NVD7HunSexQh2bY0oBp1hFfNwOdtFq9atTdWjfdzDlj2I2lHDUQbULrN9hmSWan4fMx03hx2dO/6aQJioOeVJlfx8IikuYRE9RAYpsHDXqo2etGS1Vp6UW7QUpFqzUsQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU0P250MB0916.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3ec::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.12; Tue, 6 Sep 2022 01:33:51 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::c3af:c609:301f:beab]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::c3af:c609:301f:beab%7]) with mapi id 15.20.5588.018; Tue, 6 Sep 2022 01:33:51 +0000 Message-ID: Date: Tue, 6 Sep 2022 03:33:52 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [/Kij+QOYX9+oTQoUG3wgt3Bfr5Oo9Zc5vg2lyKTzE9U=] X-ClientProxiedBy: ZR2P278CA0026.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:46::9) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0ba1714c-0a05-4af3-4f6e-08da8fa7da93 X-MS-TrafficTypeDiagnostic: DU0P250MB0916:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VrMWU9iZGxaeEgWbi7B88djZOnkYYKqxex3lHbrs6zzEyfBkF8KyfVJAruK2Qslf+M6i/o7CO83DqpxLBIWdmYrp2H36+Knbygi9FF3wFDnXIq9z93gGFTxnM4L+CRUfmHgAmMCH7talZHzUDS5MP4tNOdDkEo6X95xQ9igq9w6wUMvUPi+k88bTlEpP3tZcO5h0BufjobRO4L2nDH6oLBBPv+mSUnbvZUwFwrcfQAzMhZpJC2ADAtnACQo7ZBPzylWliA4e/zoTxhwOhf5WvEh6rBgW5uA2SsiDjngNAQEphjWkI7wguc+ugdxNz/R56NujsU8TNF0yRy0lLDjebOYCIbXHgxh/p+n0JhdWhNc9Ov3g29y9p+IObHtW6t/UzAXAMfhhT9U9M4SqmaWeh6B4RAV3kGIuVrg47WSIUnFmSiGMPEuZ+X9CUrsEjyMC9KfFGS6lj6T7OvK+4MbQtlI/zuIsNJUoOWV/GeV1Jb20JdwZ3buEvzrK92xYvw3aPG1wWJc5C4rrNrPEUxtMShxxB1ST45yUDaC8OosBg4zi2KbsnKjEn7vAaGi26yMTpq3ziffPH87/qB5wSdnsMav2p8nWh5KtTkM7S/rY1M+4oxfQ5Zh5jpTxHdqI/Oo9ukwImzy8srMwD0GGUrk0AfAPfmw5AeLAngAvfc8cjP+EdrUUHzmJf7cRoEdM+DJf X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?eWFVRXI3SEt3NFRicXUxQWR4N201LzZCdnVpL1BPQmU3d08yT3VQZ3ZMNUda?= =?utf-8?B?dGIrNVBRSnkyQzAyMVl4cTlSRUlweHlJd0pzN09kZmxHc051VFRlMjMvcGJx?= =?utf-8?B?L0s5aW5SR0I4Z1NjZERWc3hubVdJZHo4dzlabWZzV2VXTjZIQWVOK0I3YzBG?= =?utf-8?B?TUV5c2hsSDZ3OHc5Si9ZdXVuZlllQ2k1MlZFa0ZTVG9PbGczRjlnVzFadVJU?= =?utf-8?B?WVRWVzB6K2U1cUhieDkvMGtzc3ljeDdtV1lqdXFOVUlJcHhzYmwyNjNCTmhG?= =?utf-8?B?UnBaTVA4NUlTTGV0T1MrV0tIZk5LdzhXejJlTFN2bGpRcmFIUVd0NGxqOXdO?= =?utf-8?B?RFp3OTdhamRRYWJORklVKzQxRTNEMW5tb1p3U0dJTzlybFBHMWQyZGhpM2hY?= =?utf-8?B?SnE4bldLZkJOU000a24xSFFJVVdiS1RTN1RwZG81bXJBelk1Wk9ybW40MVdN?= =?utf-8?B?MkR4aHdDOEowNXBzdW11OVU3STRzQ3JrNHB1TXkvNkViOXFMNVp6RkpyNExt?= =?utf-8?B?a3h5ODdDbjlKU0RZYThhczRDTlg1WnNGZ3VzSGZUdjFlOVBVRStReU5KbTU2?= =?utf-8?B?S25YMFhQSy9lZmNHczhCcVUxYzhqVVdVQ3o2d2tmYVg4dDR2a1l2TTN5dHdy?= =?utf-8?B?ZFV3NzRwbVdwUndaMXRlZDBlOFFJYmhGLzluUGROam9TTFExNDZlUm1uRldw?= =?utf-8?B?MnVnVGkxbkVtOGJqTWtibU54Q2F4RGRPSElEanl1R3RKNE1BaGQzNWFGRWRZ?= =?utf-8?B?WlF1WW9tb2ZrOHpsTEEwWjlUQW8rNjRaSmN0dWhGeXNrdEY4SXpQY0VqcGNl?= =?utf-8?B?eTlOdkZ2enltRmo2dC9LdzRGdHZHRnRoRzdMK081QlNmazNDRUp4eEJKc3lQ?= =?utf-8?B?VXdoMWpWZk00SkZteGtUWGN0eUJkNmZTbEpCUTBFMnZyQldHMXJRNitaeFVq?= =?utf-8?B?RERYMlh6Z09BV3kybXpDbEVNeWhTK3NEV3NYY29NeWhOTXR1MVFuNUk0L0ll?= =?utf-8?B?enhyRjhnbFVwZ05WVXhZYVV1VFU3Y3cvMU5HQmNqbmROWGN0cnpIS1FEOTlY?= =?utf-8?B?b0dET21nZ2dFQ3ZDcndlV2VURVhsdXBJdTh0N2oxQnJ2OXlNbE9iU1Y1cEJN?= =?utf-8?B?cHZ2UGVpUHlnWnFBcmlwelA2dWNtZjVMbU9YbDBxTE5IVy9KNy9XVCttZU0x?= =?utf-8?B?Z0s2T1lna3lNSTNla2JNajJLYkhSWmFBM055NlJUM0RURXFTRjFJU1d5dysr?= =?utf-8?B?aWhmZlo2YjFNRGZYdDhNU1B5VnJUd2VIdFpVZnRjWGNOTmQrbnlVNVE4WkZK?= =?utf-8?B?M2xHU3BZYzFnMUZvUnMzemN6UnJyQW5wZVNBMUZza0hnRUpUYVZXc2Z2bi9h?= =?utf-8?B?TVYwYlVKSDlrb2MxSFREN3p0UXhWTWQ1NUpYOTlwTXF4QkI4c3Qwb3pka0Nt?= =?utf-8?B?U1FqU3JmWnVraE51a2lnMFN3ZlpSWHh0TGlkRHJBL0xjK1pVVkJQeEJZZWNO?= =?utf-8?B?TnNrejBsUUQrbi8yZWVkZnNnRGU3MHJZcEMxK1BNVm1sd3YzeDFhQmxhYmly?= =?utf-8?B?aXhNYmpNSmVFdXpyVFRDRklqeEJOUGVOc3RNSWdscjRwTFdKK1RuM05aRHgw?= =?utf-8?B?N1dDL1Z1SmM5cS9LSWFSUkpEb2s3NEEzc21NcjFGNS9CSUppQks2ZVV6NEk5?= =?utf-8?B?VW8zVjJ4RVRDVUZhQ24wL1VpL0w3eWhlWjhtTXU3RlpPQ2l0Zk5YZ1VOckFH?= =?utf-8?Q?ryBWWPy0ft9rzVbXwgGlx5QW1DnCkgkWysY2tZW?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0ba1714c-0a05-4af3-4f6e-08da8fa7da93 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2022 01:33:51.8087 (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: DU0P250MB0916 Subject: Re: [FFmpeg-devel] [PATCH 1/9] avcodec/dvdata: Order code table by codes 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: Andreas Rheinhardt: > Right now, it is nearly ordered by "left codes in the tree first"; > the only exception is the escape value which has been put at the > end. This commit moves it to the place it should have according > to the above order. This is in preparation for further commits. > > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/dv_tablegen.h | 2 +- > libavcodec/dvdata.c | 12 ++++-------- > 2 files changed, 5 insertions(+), 9 deletions(-) > > diff --git a/libavcodec/dv_tablegen.h b/libavcodec/dv_tablegen.h > index 941b5572be..0dcfffc140 100644 > --- a/libavcodec/dv_tablegen.h > +++ b/libavcodec/dv_tablegen.h > @@ -51,7 +51,7 @@ static struct dv_vlc_pair dv_vlc_map[DV_VLC_MAP_RUN_SIZE][DV_VLC_MAP_LEV_SIZE]; > static av_cold void dv_vlc_map_tableinit(void) > { > int i, j; > - for (i = 0; i < NB_DV_VLC - 1; i++) { > + for (int i = 0; i < NB_DV_VLC; i++) { > if (ff_dv_vlc_run[i] >= DV_VLC_MAP_RUN_SIZE) > continue; > #if CONFIG_SMALL > diff --git a/libavcodec/dvdata.c b/libavcodec/dvdata.c > index 231569a328..1e48db591d 100644 > --- a/libavcodec/dvdata.c > +++ b/libavcodec/dvdata.c > @@ -75,7 +75,7 @@ const uint8_t ff_dv_quant_offset[4] = { 6, 3, 0, 1 }; > * when building misc. tables. E.g. (1, 0) can be either 0x7cf or 0x1f82. > */ > const uint16_t ff_dv_vlc_bits[NB_DV_VLC] = { > - 0x0000, 0x0002, 0x0007, 0x0008, 0x0009, 0x0014, 0x0015, 0x0016, > + 0x0000, 0x0002, 0x0006, 0x0007, 0x0008, 0x0009, 0x0014, 0x0015, 0x0016, > 0x0017, 0x0030, 0x0031, 0x0032, 0x0033, 0x0068, 0x0069, 0x006a, > 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 0x00e0, 0x00e1, 0x00e2, > 0x00e3, 0x00e4, 0x00e5, 0x00e6, 0x00e7, 0x00e8, 0x00e9, 0x00ea, > @@ -126,11 +126,10 @@ const uint16_t ff_dv_vlc_bits[NB_DV_VLC] = { > 0x7fe8, 0x7fe9, 0x7fea, 0x7feb, 0x7fec, 0x7fed, 0x7fee, 0x7fef, > 0x7ff0, 0x7ff1, 0x7ff2, 0x7ff3, 0x7ff4, 0x7ff5, 0x7ff6, 0x7ff7, > 0x7ff8, 0x7ff9, 0x7ffa, 0x7ffb, 0x7ffc, 0x7ffd, 0x7ffe, 0x7fff, > - 0x0006, > }; > > const uint8_t ff_dv_vlc_len[NB_DV_VLC] = { > - 2, 3, 4, 4, 4, 5, 5, 5, > + 2, 3, 4, 4, 4, 4, 5, 5, 5, > 5, 6, 6, 6, 6, 7, 7, 7, > 7, 7, 7, 7, 7, 8, 8, 8, > 8, 8, 8, 8, 8, 8, 8, 8, > @@ -181,11 +180,10 @@ const uint8_t ff_dv_vlc_len[NB_DV_VLC] = { > 15, 15, 15, 15, 15, 15, 15, 15, > 15, 15, 15, 15, 15, 15, 15, 15, > 15, 15, 15, 15, 15, 15, 15, 15, > - 4, > }; > > const uint8_t ff_dv_vlc_run[NB_DV_VLC] = { > - 0, 0, 1, 0, 0, 2, 1, 0, > + 0, 0, 127, 1, 0, 0, 2, 1, 0, > 0, 3, 4, 0, 0, 5, 6, 2, > 1, 1, 0, 0, 0, 7, 8, 9, > 10, 3, 4, 2, 1, 1, 1, 0, > @@ -236,11 +234,10 @@ const uint8_t ff_dv_vlc_run[NB_DV_VLC] = { > 0, 0, 0, 0, 0, 0, 0, 0, > 0, 0, 0, 0, 0, 0, 0, 0, > 0, 0, 0, 0, 0, 0, 0, 0, > - 127, > }; > > const uint8_t ff_dv_vlc_level[NB_DV_VLC] = { > - 1, 2, 1, 3, 4, 1, 2, 5, > + 1, 2, 0, 1, 3, 4, 1, 2, 5, > 6, 1, 1, 7, 8, 1, 1, 2, > 3, 4, 9, 10, 11, 1, 1, 1, > 1, 2, 2, 3, 5, 6, 7, 12, > @@ -291,5 +288,4 @@ const uint8_t ff_dv_vlc_level[NB_DV_VLC] = { > 232, 233, 234, 235, 236, 237, 238, 239, > 240, 241, 242, 243, 244, 245, 246, 247, > 248, 249, 250, 251, 252, 253, 254, 255, > - 0, > }; Will apply this tomorrow unless there are objections. - Andreas _______________________________________________ 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".