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 72B5244236 for ; Sun, 2 Oct 2022 23:08:49 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D2CEA68BC0E; Mon, 3 Oct 2022 02:08:46 +0300 (EEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064083.outbound.protection.outlook.com [40.92.64.83]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 362A168B930 for ; Mon, 3 Oct 2022 02:08:40 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M5ZCblLm/BYFi95WjZ7wVEESJaFrEGLEXSByG6j/KaM80poiqzCMIniyKUw3sP02ZACSjDNupZylZ5O9dsB7XX5HLJSswuXA+IoeHghY5+8/4sa22+sfIZ/dH+wIqVdnPFXc4PpjzUMSNbhGItY69JQSO9eOA0O/SPHO9s66aA8P9TAV7Noxg7sXPlYRu0spE0cF3oef29sWf/B/kYFygiYk+i2dEtanJYXpdZd6hVvfJYEALyrctTxkJdPxan5StBQrKnDyvhGJ0q3Tt57i6dOmdnnar8VHSD/kZjreH/eaf50uTI6xaAnNsifELT8K4o+G2O3JI8kE5ZZdOQQ61A== 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=olIy7Nh44CPFgEQaCGjRV7JAftl7nz6ui+DifOTIqIw=; b=mUTcM6tH8FuNlbCYZIESCSA1p27frZ7o9MSM78xxNa2AqVOPtmsdUEA3lglruzOzChCSGLVA8DUsz1XfnwIp7bgMotA40YszrRNmOAhOeggsFgdFWkA0JaiaSlD8l1N6YnR+lzolBjq0dtMdvsBuxqd3wiyhqkhfY2FiqRrz/NMx80Cs4VljVYIhtAVF2EJUTZOklM03t9KuZp1gT347WLOGvCNgTaVVnd54IN7/Yo8JxvFaPaxcUvPeKU3cqKj39uaQ0y5o8Vu+WXMpFOYeHP5yqj4SLhubIdth0aXxopv03F8up+JiiV8XSNsYC2InUv/ENP6kMqBmGcn/6SzXVg== 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=olIy7Nh44CPFgEQaCGjRV7JAftl7nz6ui+DifOTIqIw=; b=ikkYyyolgu0wUf8ED16YOKU39An34zuzAkAlDBIkLPNcgzzoCHDSnEEh6VoWkl8anyBIfMv/kHkU3VeNb09ll7ZHRLjZ6OV0yX6hMkUcoNOUAp+jqAJdAyk17lp2Gf7vpIz77UYWvlPE8+wnkW4rW2NXi5zpV+P2cxoMrJyax46X0+QLIIF1pVCqzg8baa+tWhupyBKAETXrLkJ+7pdsHtjyIqnRyzAGzE8uDfp7OyO4Mwlk5KbxdBmSCVO2AevMU5TIVVODvvbzr83a+/arGW441akTJXFyG+v63aBPPeWPQdstCotCXGlPX7MWk7efXkkcLbhuf5TlMKAEckCUvg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by GV1P250MB0716.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8c::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.23; Sun, 2 Oct 2022 23:08:38 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8%9]) with mapi id 15.20.5676.023; Sun, 2 Oct 2022 23:08:38 +0000 Message-ID: Date: Mon, 3 Oct 2022 01:08:44 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [3QwqW2vjxSrxoZWRUaCE/arRq/UuCjkmK72J2V2E3RY=] X-ClientProxiedBy: ZR2P278CA0005.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:50::10) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <99e8bb35-eb75-a31e-22a7-39f6f17890d2@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|GV1P250MB0716:EE_ X-MS-Office365-Filtering-Correlation-Id: c1ff140b-6ded-47e7-dee3-08daa4cb0a32 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9fR+3aosYNVufRIgpkyogLes/fHP1Qf3fi08jDzntS3YkxVJnDA+K18E9rekK9R8KfjuWNQhHZpCklRyExrFJYnqjYTjErM7n2q5xK/7/poTY5vPozTYioYvUQkD1l3djYAqqxX5UkbLLbEXOKJOsVtmyrRNZnOmFbt14x1pWBzy0oCZCr5z+9nAqmDnKTdoMjxKzSWFEKV1mWpoBFwRv02uwq/fnFjnfAgRlsLBqxZMwMfOKkaECKfaq7UB5v0Bq+NIqt6uP1NDfGtzmuOlEEiGKjDAOl+6h9m8lVi9fWFTVb0ceokOeyRfuqyu76fbP3OFTBj9LdTr0SMzC0y5K1+1UWxvJoWIr6GTlwAM9A4wB0SRCK8OZGc8RHoTXKp33F8ZcdQuerZby/myeRCksLoB2y+4+PBjVRbyQLt1NnoXWQvXl8kIttpcTTrC3WBjs9aZNP0ckFBa3be5HPFfO9E7yehZWYi7y5vzXxQjakNPawMQaRuRZUn/HhZUgWfGVwQIYBeQgbJo6VLTfdl7wdlHWTC1JPIjQ0fdWBCblvALw/4MewJhUxQlIkiRgHUaiuHweIfbURWiN9qyV/5LkAD0Fbkhu/uDs/X4/8u1LYBhztCyJLOwdfARuUbt18pScGU8/ADUnLNKCUmRKaajCkIDzw7c7VQRdoqXJ+OEW+fo/wPPOpbxtpfH1a+SUllh X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?bjhuMjZRa3I2dms4NzgreW1Oa09pT1lXNlZQdDB5Z2xzaXBLWUZUTzFsK3BJ?= =?utf-8?B?R09JU2NZTWdNTHE2M0xLSU9MUEhyS1NnNHUzTzY0bkV3eHFtQ1NzWGdMK1VC?= =?utf-8?B?S2FqVW5KVSsvMkIzSnFHUThsMldTMTBvOHUrZkQveUsvZ1Y2Q3dDTUFlUkpw?= =?utf-8?B?N2dMaURVZWhsR3VPaUFVWTkvVngwUE1VTlhRYnU0cy9zczFnbGVjZ0hxSWZL?= =?utf-8?B?UDZPczMwZlBhUW9rNXhKZVhwRXRXSzVjSzd4djd0NDNwUnB3ZUx1K3AwdkQ0?= =?utf-8?B?bDhOTFgxSm1TSkgvditPQTZzUWR6S3ZyQXp4Sk5GSzhvd3BBcFR4dmJVd3Vs?= =?utf-8?B?cXRQRkd0eGR1TEcrRmFBNGRaVitkaGVIdWVESEkyaFFSaE5hMmpFUVpZL0lB?= =?utf-8?B?bUZ1cmhlUmV3SkdESjNZd1VwT0Z2T1B6N3ZqakJCbGtDQ3ZCSEl3eU1hWFEw?= =?utf-8?B?V3NlUkNSMldHY0dIRGpWNDFKYTl4bUZTLzMwMjJWeVVsM29tcHYyMERET2ZL?= =?utf-8?B?VVZUQmlya0oxMVhnWDNscmxCdkxkMTdPN3FUQWZaM0RnNjNPYnppR0JBR3Fj?= =?utf-8?B?ZUVOdHRGNDJBWkVOVTRkZFZObWlmNmszM1V6TFVyWHRTT0E5SkMyTkVaY0Zi?= =?utf-8?B?cThEazRZTTdIdnprY1hhd0ZKaHo5NjZ2YjJHMklFN01nRndBK2VzNWxMR0Zl?= =?utf-8?B?bW52aTMzRHI0ZUYvNE56R2ltTEVjWkRpQXhVQmhCdnh4dGR6OWdwcG1pakE4?= =?utf-8?B?TkFxNnFFRGZyZUQzcGFVMnhCeVJqQUxvT3R1QTRZOXVxbkt3TFYvUVZnbmEr?= =?utf-8?B?VmdadDlBRlo4Y0JTMmgya0tnRlVZYVVaTi9KSWJWeStNSUYycC8yR2NmWHFC?= =?utf-8?B?SVk5UC9GRUl0YWY4NWF2VkFIMUxzdEUvRWl1VVFzbk9RdzhJZnlMRkVLTHFq?= =?utf-8?B?NXBLMXo2MGxGSEpuRHZjYkpjWGt1a0F6NERJbW1JRDFXOGJQUEcwVXU3MEVN?= =?utf-8?B?Q0dBdWRNa1E2R2RLSllPQjh1WHdWMU9tK1ZybzZNTGdFMWVVditsMkdNZ0Fs?= =?utf-8?B?c2tvUUh0ZHpRZ2YvbnJTM2NuVkZHTE9oRWFFd0x5Um5TUXJQZm92VnRWdXZ6?= =?utf-8?B?ZVV5MmE4aTlLTGVHY1FHT0s4V3JtRC83VHNWdFkxT0JrNm4yY241K0lCMWdD?= =?utf-8?B?VklGd0NUcmJiTmxhOThwY3pvV0xaSEFlZzhvS2tHTEhzUGhGbjl1Qks5UTBX?= =?utf-8?B?UDUzcnhkeGFTREJTclJHWlFIaXIxRmh0S3hDL1R1SzZobUVMeldtNklrcUhp?= =?utf-8?B?R0JlQW1MMFpBcDZYN09Bc0FXUjZTZ2ZVUzhLYldSWjdaaWMzcDhvUmxQSFYv?= =?utf-8?B?NVV6NEhzTE1GR1k1YmtSNG5JWDJQdHFZeHRlS1N0SzhwUWxYd0hYdnc2MFdl?= =?utf-8?B?d3BUS2FTY0kzajVkWXNrdHJXRzQxbjFMcG4zeUxlaGRRWHpWSGtBdWp1TnlC?= =?utf-8?B?VWlUbjZFV21sNlVFNU9SdEg5Mk0rOGtqRCtPczNSd0xVeFZWVFJaTU5OYm5Y?= =?utf-8?B?RzZmS0ViaEJCMlhYbzZ3amg0L3Vpd0VicWFrQWMycW9XUTBiRURVSjlJRzVv?= =?utf-8?B?d3RuNnJZZ2Vjczh2NHdoNTF3RUtUZHNCcjF0QU0wQ05qcXNQWjdtc0diNVlo?= =?utf-8?B?SWRaWGd3eXpBNnlndG0vQVBTdTRzdnFQaFNIVngrZ2xma2t4OC93MXI3eVdZ?= =?utf-8?Q?qA+SmJ1bi/hGrp5Vxp+HGN3Vae522gayhvmUoL6?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c1ff140b-6ded-47e7-dee3-08daa4cb0a32 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Oct 2022 23:08:38.4955 (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: GV1P250MB0716 Subject: Re: [FFmpeg-devel] [PATCH 1/5] avcodec/mpeg12vlc: Move MPEG-1/2 RL VLCs to it 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: > It is better place for these declarations than > mpeg12data.h as RL VLC are just a variant of VLCs. > > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/mpeg12data.c | 1 + > libavcodec/mpeg12data.h | 4 ---- > libavcodec/mpeg12dec.h | 10 ---------- > libavcodec/mpeg12enc.c | 1 + > libavcodec/mpeg12enc.h | 3 --- > libavcodec/mpeg12vlc.h | 15 +++++++++++++++ > libavcodec/speedhq.c | 2 +- > libavcodec/speedhqenc.c | 2 +- > 8 files changed, 19 insertions(+), 19 deletions(-) > > diff --git a/libavcodec/mpeg12data.c b/libavcodec/mpeg12data.c > index 4da96d7da3..e301310b9f 100644 > --- a/libavcodec/mpeg12data.c > +++ b/libavcodec/mpeg12data.c > @@ -26,6 +26,7 @@ > */ > > #include "mpeg12data.h" > +#include "mpeg12vlc.h" > > const uint16_t ff_mpeg1_default_intra_matrix[256] = { > 8, 16, 19, 22, 26, 27, 29, 34, > diff --git a/libavcodec/mpeg12data.h b/libavcodec/mpeg12data.h > index f51faf4607..bc39655fbf 100644 > --- a/libavcodec/mpeg12data.h > +++ b/libavcodec/mpeg12data.h > @@ -30,7 +30,6 @@ > > #include > #include "libavutil/rational.h" > -#include "rl.h" > > extern const uint16_t ff_mpeg1_default_intra_matrix[]; > extern const uint16_t ff_mpeg1_default_non_intra_matrix[64]; > @@ -40,9 +39,6 @@ extern const unsigned char ff_mpeg12_vlc_dc_lum_bits[12]; > extern const uint16_t ff_mpeg12_vlc_dc_chroma_code[12]; > extern const unsigned char ff_mpeg12_vlc_dc_chroma_bits[12]; > > -extern RLTable ff_rl_mpeg1; > -extern RLTable ff_rl_mpeg2; > - > extern const uint8_t ff_mpeg12_mbAddrIncrTable[36][2]; > extern const uint8_t ff_mpeg12_mbPatTable[64][2]; > > diff --git a/libavcodec/mpeg12dec.h b/libavcodec/mpeg12dec.h > index b4e94a92ce..4c015d3096 100644 > --- a/libavcodec/mpeg12dec.h > +++ b/libavcodec/mpeg12dec.h > @@ -24,16 +24,6 @@ > > #include "get_bits.h" > #include "mpeg12vlc.h" > -#include "rl.h" > - > -#define INIT_2D_VLC_RL(rl, static_size, flags)\ > -{\ > - static RL_VLC_ELEM rl_vlc_table[static_size];\ > - rl.rl_vlc[0] = rl_vlc_table;\ > - ff_init_2d_vlc_rl(&rl, static_size, flags);\ > -} > - > -void ff_init_2d_vlc_rl(RLTable *rl, unsigned static_size, int flags); > > static inline int decode_dc(GetBitContext *gb, int component) > { > diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c > index e1f09b7ede..f636afe42d 100644 > --- a/libavcodec/mpeg12enc.c > +++ b/libavcodec/mpeg12enc.c > @@ -43,6 +43,7 @@ > #include "mpeg12.h" > #include "mpeg12data.h" > #include "mpeg12enc.h" > +#include "mpeg12vlc.h" > #include "mpegutils.h" > #include "mpegvideo.h" > #include "mpegvideoenc.h" > diff --git a/libavcodec/mpeg12enc.h b/libavcodec/mpeg12enc.h > index fbbc43f891..0455e5e4e2 100644 > --- a/libavcodec/mpeg12enc.h > +++ b/libavcodec/mpeg12enc.h > @@ -25,9 +25,6 @@ > #include > > #include "mpegvideo.h" > -#include "rl.h" > - > -void ff_mpeg1_init_uni_ac_vlc(const RLTable *rl, uint8_t *uni_ac_vlc_len); > > void ff_mpeg1_encode_picture_header(MpegEncContext *s, int picture_number); > void ff_mpeg1_encode_mb(MpegEncContext *s, int16_t block[8][64], > diff --git a/libavcodec/mpeg12vlc.h b/libavcodec/mpeg12vlc.h > index 70aca645cb..4fb19371f0 100644 > --- a/libavcodec/mpeg12vlc.h > +++ b/libavcodec/mpeg12vlc.h > @@ -28,6 +28,7 @@ > #ifndef AVCODEC_MPEG12VLC_H > #define AVCODEC_MPEG12VLC_H > > +#include "rl.h" > #include "vlc.h" > > #define DC_VLC_BITS 9 > @@ -49,4 +50,18 @@ extern VLC ff_mv_vlc; > > void ff_mpeg12_init_vlcs(void); > > +#define INIT_2D_VLC_RL(rl, static_size, flags)\ > +{\ > + static RL_VLC_ELEM rl_vlc_table[static_size];\ > + rl.rl_vlc[0] = rl_vlc_table;\ > + ff_init_2d_vlc_rl(&rl, static_size, flags);\ > +} > + > +extern RLTable ff_rl_mpeg1; > +extern RLTable ff_rl_mpeg2; > + > +void ff_init_2d_vlc_rl(RLTable *rl, unsigned static_size, int flags); > + > +void ff_mpeg1_init_uni_ac_vlc(const RLTable *rl, uint8_t *uni_ac_vlc_len); > + > #endif /* AVCODEC_MPEG12VLC_H */ > diff --git a/libavcodec/speedhq.c b/libavcodec/speedhq.c > index 11d3311794..6dbba02776 100644 > --- a/libavcodec/speedhq.c > +++ b/libavcodec/speedhq.c > @@ -38,9 +38,9 @@ > #include "idctdsp.h" > #include "libavutil/thread.h" > #include "mathops.h" > -#include "mpeg12dec.h" > #include "mpeg12data.h" > #include "mpeg12vlc.h" > +#include "rl.h" > > #define MAX_INDEX (64 - 1) > > diff --git a/libavcodec/speedhqenc.c b/libavcodec/speedhqenc.c > index 747ed679bd..4a009bd070 100644 > --- a/libavcodec/speedhqenc.c > +++ b/libavcodec/speedhqenc.c > @@ -34,7 +34,7 @@ > #include "avcodec.h" > #include "codec_internal.h" > #include "mpeg12data.h" > -#include "mpeg12enc.h" > +#include "mpeg12vlc.h" > #include "mpegvideo.h" > #include "mpegvideoenc.h" > #include "speedhqenc.h" Will apply this patchset 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".