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 3262C442A3 for ; Sun, 4 Sep 2022 21:54:40 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D73AD68B871; Mon, 5 Sep 2022 00:54:37 +0300 (EEST) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069044.outbound.protection.outlook.com [40.92.69.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9C81468B545 for ; Mon, 5 Sep 2022 00:54:31 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iAUfD6Eylfi/l7+IQHI3faQefB4A4a0bLtYEEL8DZRh9I4psVfl3MEBtr7857HNhkjZZRuqbxhWa7BqPOU3TrisfvjVGXEDRniM9uagVEuX88XzOiloDIVm41cdT92srrxK0ttO1AupzRgHqXXt81vC2lWQP7OYl9ehiARI5WAq2kYc+y1ta4OWlJDK6K48MSePfqQXK1S+VjO6Uh47Vz+4EnOBMej2ulpiQLLurvJCi40MGKRiaMHawOeOsRs8U46o3EYW5jnnRg7VW9OvLUmgM3aYZpJpKVy/o87uuAC5HSNIIF+ZZBKktBL9cNcjveNprF2vF7OGXpNrxX7J1Gg== 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=Y+5d1dWYVD987flezXzraj8jgPRS6BFM6mZb9q5038w=; b=h8CJ9HNpHaFG7lY/h5UD/erGAwkkFMg7/xk5i5IBnb1kH+L7snB4/T9ZDay6T1oYPswLPrOFRkI6guVee4p5IBZDQmwpisVZlvJQv9U5PuGZT4MU6o/YP5F/cYgnMiQ0T43z9CdpR2AN2U34IeXSOTO3MxReEJB74Ue7GoY0Z1H5pcOzoZGidGIZaGyJq0TjJUL/gZoHqFpVKb73PoUt7RK6pR6m15Xq/ROyNn92qQg9NcyVmGU6dnQUytwRr4YSXr5D6TdDAFKE4d7odmyn60dsrrQ9Iacmj06IlkjseDP/FX7Of02FS7653FEroEeuyJ4BplQbBAtAi+wV/pw7Xg== 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=Y+5d1dWYVD987flezXzraj8jgPRS6BFM6mZb9q5038w=; b=E/dr8L1VyB561mu6iwLPoAPDuyAnttCgDULuuD71tFv2ymuWARN6ciONyIUGB4MmbKchBPsabRYC1+kZDHStIcU1fATNwpgByXaAZ+ppU5JIclZK8c0qhbuMGGEds0qCfZyWOFIwmqbukiEXxjVdEsTBWn6Ut91s0OFsW2UJna9YwWZWLhpMG/IrfhbXLG5ui2n+0GogvPKpvGuzEsValxTOrMtyqB57bVQIthQHXXM12TfbuunYpp0M8+yX7WyOYpSj6o0AenXaIJI8mFE6WoFl+3cO9yHdX3aBsJ2TweI3bmC9nWgONLS86Wzo/aMijXQKX88jpW9sB9NbOzyoHA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU0P250MB0746.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3ca::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.15; Sun, 4 Sep 2022 21:54:30 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f85a:9a02:f8be:7c47]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f85a:9a02:f8be:7c47%2]) with mapi id 15.20.5588.010; Sun, 4 Sep 2022 21:54:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 4 Sep 2022 23:54:16 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [NgQMjht1g2nOGo4DVRjOLZj4M3NBwIz8na0JcKuSB0I=] X-ClientProxiedBy: ZR0P278CA0120.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::17) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20220904215424.3671647-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 766dee67-49a4-4958-28e4-08da8ec00b20 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmpOESH07gTfyFtwl3n8uZhuc/8THYfvUiJPnjZHXCzOj0aDbsU5wpKemw5cjNNY3u/H8yJg5vCHRRP8rmOzzKl9xNToiF3nTWMIDvNLqiEbG9hMA9lFPE/3eJU21p9VzByut2k7WxnMTNXmNHD0xNMsZ9oEvzbhk1SFRLCGP9GxZ5NYN70m5U0pVN7jwGtpqpwMCehBvXU/NwCV4nYDqwt79dhS8+6bVkfHE5sHDBf5So3MTTbEs5Qs8qKVPpheXy9RiiicfO77VWQ9awwwmxF7Yza7Mu3wUGvZ7Y0ErE+hMeWYM9Xoy+FZXOWtEWyke1GuE2evEKG0Em8oQyihbdnDPRThLi/AVy7GgXsXUM2UdGz3IXJSNOlwyZWLjQNrUaPEIMYk9nH5I25yvQw7PNiTQcbsmUcvErQkmctfGmnHNy5a5/Yq3UMB8uUAVXWD5+T5EyJ01Y2iUzIrGe9rQKtUowUaf9wVDjOf+TYHJxxfRlKVc0T5Qnfw+8JDi4jpNccZ3qSFHYrQTogIi29RgQ16/KSexzTpGDWMVR68zlXABXcBop4Ngrw8a8SDJ9gtubpOw4Umdba8W0WsAWg4g5amk0hwMtTMcUOP0hTUrT1r58XNG4xrjk4pSBZQls1VFv2kUlb9DDWMLp0yi2HfrGQwHMPgX68biglfuvYA5E39Xnf/AbIX8N1jEicXxMLazz5nDP7jXZ2HSD3abqTyaUOs+TOTsTmaGNlJa50Rd9A6mx6IbBAdvAS78UVDvHWghC4= X-MS-TrafficTypeDiagnostic: DU0P250MB0746:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: G+d8/Z0ussBhE/mLD+Djok/yvcpXMoHuCwgpA0NSNV1qmuXhTsMtKP0T4UWisy/3/SPajIE7qIe9uumNnvuAE+S95ZaePGI3NjbxDzpszc5uwB/HnSELQ/204VoR1HUEe0b0BcZtY2JX2mI/uP58DXzDRCM4QZGFCrkaQUJTwpKf+Dg5Uacsty+esKZ8TtazVS2AYo2BsJqNJctKfK6Btd3cy9tTPOD1UyUEBvpbx8pPfsQQY8wdN3XMtscnCiPicy0QN3kg7b5d0WAHDDXIebTamqmgMVKNAnYtkEY2XMhKsvzn3+AXVHmAikkeE0SJYpsFtpVhaj6oQ8gnoeyjr6MlndoRXaWeNyKXA8YlyedhYlltrjR2KOr+SbajHum+GM1pFoLikuJpuyG14q1v3/WoFnjplzUTyspiMc8lC5Vkr/RZ3IODVjY+gGztVDlG6NyXkDpoGc0LtEeGpVSIkRmNGD6YB9ynR12H5T0bNPwJzU+nHm7JXftpbAWaqifaV7p7X1fUEqeAUEu+dS2znl3GnlIerDKE5evdlWFZaOnIk2hFHDx0KUId4BTavQfJmZhyYuf33rJQZxoomQmAm6tfoI5+iO8GsdDGfLr27ZsPvBE2W1GE++VxpW5npotf4A5qcJqtjKau/VeKTl5Cig== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ETZ0khZgUreY32os+BzyYHN3FXjE/Flfn0NB0jPrxwXRj9LfXkAN2/wG5XR8?= =?us-ascii?Q?QK7S9aSi/QpnWrlk2a3c5WPLmwtIQ1wsrdzWoroFNt/Rr5wac1S8Q4DfyBuu?= =?us-ascii?Q?+So5DMJZICpHRAtBhh4xJBp5FVfL/h6VVs/XCjCvx2ctslxbvQFC9XVHEO/j?= =?us-ascii?Q?8Eec2A97t5EPt28vVtOsg/IWni+9CjlnJKDmK5p+WP0fEcYg/NRHvKlTRGxD?= =?us-ascii?Q?4uz5pZigkRbqcXw4tQTTVnq9/izvS0Ne54WqUpaFB2G+humnCgl3hkbbNvU4?= =?us-ascii?Q?qMPnsUhEuEetDmrEtKTeyT7A6t2hOtO6hNsJdvMgeeDeswN0zodU6iabaFxo?= =?us-ascii?Q?6XFLAfjD1XTtRchBHQ/j++GO2b+mwq7ez0O8sVWnl3OS5NNhw8z3WlJGnibW?= =?us-ascii?Q?fNuxc7G+FxBrtE21U/qiLRvrzDwQ27V42wouuQJBNuDTobCsfjrYvcD3/iKY?= =?us-ascii?Q?CO4d1pV1w3r2nvkHNNIUcA0BNrhvVOp8BUDpMnQnvGPFGiXrlv7CS7pR252G?= =?us-ascii?Q?AZf1l7KTajxQ48oHVs1JXChaaPIbA890zQcXVLW8ApNx6ui6qi1RM9OuRbdE?= =?us-ascii?Q?GgnBij+2jaoi6JmrZwpjNJMplXwMbfEPELxYNsAlCeHYuQCoxewiz+YhAap4?= =?us-ascii?Q?8g2W9C6NXMBi4N0b5ev0dyqGmmC9iDj3J0K1oL6q+S5buaJJ8LmqcG5suo+0?= =?us-ascii?Q?W2Gcyg3WmVefLDPiK7gAbbkTFYDIgEIX2dNxCG23rAON9FUt5bkzkCPC42bB?= =?us-ascii?Q?sRPdL4JS1ANicxIAzOtigKqaFb/29rklvpsty04+7BEtrcczQHW8NV9Xlil5?= =?us-ascii?Q?Rg1IbQze7dLDiRKys482gsk87tOaDBqBcEK9iHG2MMecRX+u/ojhmXsqTz7n?= =?us-ascii?Q?R1PCzV2qF/AOa1I5OtZObfLpQlip7kolByZ3CUd+Aw+uq3nJoyrdKoumFHcx?= =?us-ascii?Q?XVeI8K9Ohnu6r6B1wn+x8WXrdUMe59SmbYY5uuspzt6eixrLivQpwVEgjgVe?= =?us-ascii?Q?fDAfvfuWMZ4uyyZJgnIBnGx8tYlbPP4TE21FAOE3Vap25sjYt3lvznN1fUPz?= =?us-ascii?Q?hPBKIJdon21X5egb6Z5sTL0M7880fkv/gfjw8fGE/FnFBJ3pwwdJcOxif1V5?= =?us-ascii?Q?PcDmBXraAFCzanzacS22NjjE8stnYZcRWYnvtfmrnUD9EXf8v2oSBhMZToaz?= =?us-ascii?Q?Lyw8fK4v+fadhwQ2JZiwE+AdScKuqRbJh2WJgcYAF9EjYFgt3DQU9P3R7jUg?= =?us-ascii?Q?LmVS5gv7pNutI4kIVZOxFzk5QghQDzhiNvVf6hvXmIVisgiFt4CC7VndCZmY?= =?us-ascii?Q?kdsMdpdtKYA6RYjKBqeFwuhH?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 766dee67-49a4-4958-28e4-08da8ec00b20 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Sep 2022 21:54:30.0367 (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: DU0P250MB0746 Subject: [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 Cc: Andreas Rheinhardt 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: 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, }; -- 2.34.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".