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 0243442BCF for ; Wed, 12 Jan 2022 09:52:05 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 78D2468AE4E; Wed, 12 Jan 2022 11:51:58 +0200 (EET) Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-oln040092072021.outbound.protection.outlook.com [40.92.72.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E25E068ADE7 for ; Wed, 12 Jan 2022 11:51:51 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YbwYecSs5EXuGymNC2aSoBMbnzeccyZGFKYnrUo7fsYv09mEOKieZ85JpfiiZ+jZoqzAeFwtsbaoRgqXHHaydtlIs6dFUmbBw6M86awwYHqfrIV61ppSwDBkqcXLwz7esDXrBXewHUZC/vCy5ImWAXpxH1lN7+pJFrTGL5V6QqZbLRD0S45dygr/AHqthNlGcJe2kIu14PpR8303zBjlBEdCVbs3M+QpIdnU5Bcs73EM/cgrFBLlvgfwINUzepC/zf+Cv9ow35jT0y4OJxRF2TneYvJ/iVAyGKWhUnTkJx4pyZDFQbZCJepVRoIac04fFcd+R2kTrovGRTy5HeX3ow== 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=Zk6Aux0a5bAhXX4V5x74zpKYcV3UnD3UwjPmeyj4Xcs=; b=jSDq20jJ30QWIQ3FBb/qGbVBuUNgrI6Sm/dOSGv7D+aKsS2vXfOd+4hNtqDpb67TOl/NEsDk07lV/1O9c2q/V8qHoSAxQj7Z803wTYK1wyck6qZhoVskC6U7NmPGDX7tS9+2wCOYRgT7/Tg6BnvcpNJQvFb866qQRBvNj9cF+5nR4YFkAfCxpbeac3UXS1wbPdtrQHBYzfFdVX9O6GXo6kCI17+hZPbsn+uTHwGm8d3EDlq0Rs7geCf63kZ5Gw6xvtapM9Ik1Zr3E6NHKEkLWeG69vSINKKBHhkmdt5VQxgkedbHMIr7XSsGNX/7VCbsk8aAPUONDTwXkqQHK5KehA== 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=Zk6Aux0a5bAhXX4V5x74zpKYcV3UnD3UwjPmeyj4Xcs=; b=d06yg55CxhnrKE4Uxj0IAnCJZIRD/5bSkc5B7AbUE4LRfeuiWJ3/GodIfjkpkWzkvY66jSuS2lQLL3krN5W5xyruEeLS+BCxD/6u6AEInLwYk6tNINgUZti/Vs4okXh3/lFDX0FpzEWVFQngjaY2p9BnEmlUDByPur/couVHoTrz93GSDHSdsa3ATU4mfbJw6jQNycXhwy+NVtGVZcKBwXgiASUA3i7L7mFnETe9RyxwnU4TB7VLu2CaivfgJ/LnogYUxgBYuOn3lMJUOhAH+o2w0uF4GQD5LmwZ/jdc2IKTl9dVAEkwb0wDcgOgAsYb4dKy5oedvRiSuHu5cXO4Hw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7144.eurprd03.prod.outlook.com (2603:10a6:20b:29e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.11; Wed, 12 Jan 2022 09:51:50 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4888.010; Wed, 12 Jan 2022 09:51:50 +0000 Message-ID: Date: Wed, 12 Jan 2022 10:51:48 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [qWWxpHv0oKvv6elP3RcuWODDxl6u63Bd] X-ClientProxiedBy: AM0PR03CA0091.eurprd03.prod.outlook.com (2603:10a6:208:69::32) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <7a160a3c-8e2c-12c0-d4b8-bd4417cdee9d@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9445cd6c-5509-4637-8471-08d9d5b127c3 X-MS-TrafficTypeDiagnostic: AS8PR03MB7144:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AqlnWj3N1qkGpqd02KB2wD6BtATHulgGk/qqcGfeyTAQ95Zn8r7YxX+X4VynPnL5XpIap7UAauEOcKfUGm8OLVKCP3Ok8TRE3fUV81oGO94YZklWpqWhWXGquqcU9zS+aQ2gpGxtlfoG5kaofSehxISxRJLfJUgihuNV0Ix9lrS8a3Gv1D4y7XR6bac3sRWP58Xrg/Ds0DvT/c78TzEZPev6k9+ID935kIiiXIS/LR/RRvjwyxxlm3F77XmMoe0kjupZ1IxZDLCN22JGuNiclwjPgRaGGXJThDfokzxW2brjbN/ZFcFwzKnrZymLN8/K15YSGgbKa52yVlPzwhmDLcnkNa4elOmjBwG9QbgwmXHiMRLqPcZfe+D2qI4F+CJQOPSDVbmwh02EI1V3TTT15kxWIOTP/97tTDvQFeQDVJjibeZziXMcqkUDTcj3MMGpvdbcDp097y/avLfhUWaTlJaybyYCkiF6A5mE81kKw4Fug+McMdzxWTZ/VUp/HyymMegNXlIC2xycCjvfcJ8pqVzw1X+pWEwqXAGu+7Id5+V6fnX5H7yOBmXdybMaN0HbuehnS2xMQQzT4nKKz7Ui8A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?aUFRZDVHOTR5ak5JQ1dGTnJZV0JUUTdKWEpRcHlZYmJJcTdaVmNqZ0dXNnVI?= =?utf-8?B?TnlSdTNDamQ2ck1STVlkSEd3SUxoV200S0FOaENkTDlXWk9pTjlRVkhZWVBU?= =?utf-8?B?UVZEVkRmdWdIS2ZHU013cGYrY1V5WGJyVjh1VEdpQjEycHlMZVB6L2VWMXQ1?= =?utf-8?B?c0FzVExpNzdCbk85SHVsNFZqeFhRMzNKdEszZld1UVl0bHVJZ1UvZmJHNlBx?= =?utf-8?B?cWJSVXJBRHdZUUFneHkrVnBLZDZabkM3bnhPWVZXRHJOSDFIYWFrdGtWZHQ5?= =?utf-8?B?MmJ6bHNpSW40M3J1TTk4WGo5OU52OXViOFNKdG8xSk1ScDg2STFHUUdXV3J6?= =?utf-8?B?ZXJCYlFOdlZ4dm92bzhrSmNSZ3B6ZEswbkp3cm04aEp6S09KTUt1bEpLR25J?= =?utf-8?B?SEF5aG5jcVpXVmtLQWQraVAxcG1GSitJMDlORXFKUy83K25xMXRnM0RnTncw?= =?utf-8?B?T0htb2xCc0ZHcFpiRnR5dDkxL2JjUkJMdE9MeEIzR0doMGZDK05HME9JQUJK?= =?utf-8?B?N2Z1c0VrQnN0ZkZ5WFh6Vk9sMm8vOFZxUlN4Mmc5dzV4T2g2MG12SmQrbDBp?= =?utf-8?B?MUdIYXlzUElGalphQ3NMK1lyQXRNTkRQaWhDejVqUkNIRFBIY2tBeTB5NjNB?= =?utf-8?B?UVFtSlJ1WllIKzB2Y21VQ29Fc2tyczNjR25wRFFPODI0UlRPanlTZGk4WmZR?= =?utf-8?B?Z09ZczZlZXZUZHZadWtGT0JKRE5MN29NMy9jVCthSUdzVlBUMmtJNTQvd2My?= =?utf-8?B?cXJia3BLZTkrU2FqK24xa3ZNdzdyVXZRWllXK214YXp5YktKTlRmMTRodjVo?= =?utf-8?B?RSs1NjA1QVRaOE0wRDZHc0pzaUdiTVlUVzBYQVNaWWNQbjE4MFJUOHprN3gx?= =?utf-8?B?c2JLeEZzTmtxeEhxbHc1ZzM2d1ZHekRrWW5mYyt2ZXcxUTBUM001YXVaL3ZP?= =?utf-8?B?ZXhBeUlnQnpIMlEzeEFNbkxuSUJNK0lBWW9wUEt0Vy9LU2VHamtpaExWcWJI?= =?utf-8?B?bGs3MVU0TDB6OXFOLzFyR0RUSHVMaGJ6TnQxUTVGc1Vtb2NxN3JuTktYK01F?= =?utf-8?B?M1NnTDhJcHlndWxiUjFxS0Y4emcyb281Z1JGVVViOGVQcDVFQldBTnFUc3pR?= =?utf-8?B?cmpJZk4wZXA0K21Qa0MyaVUzRnZoUWJwWThFSndLM3ZzZStzbFBwclErNzdh?= =?utf-8?B?OCtRWGR6eWc5U2t3N2txV3oraXdrMm5vWGJmNG5FbmdQRWdBbUcrSXJUR1NL?= =?utf-8?B?UFBjMTUzdlJaeEd3bXhMdzVianJXTTJ6QmhaeGE2aVVyTjRNQT09?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9445cd6c-5509-4637-8471-08d9d5b127c3 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2022 09:51:50.4574 (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: AS8PR03MB7144 Subject: Re: [FFmpeg-devel] [PATCH 1/2] avcodec/mpeg4video: Split off data in a header of its own 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: > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/ituh263enc.c | 1 - > libavcodec/mpeg4data.h | 3 +- > libavcodec/mpeg4video.h | 35 --------------------- > libavcodec/mpeg4videodata.h | 61 +++++++++++++++++++++++++++++++++++++ > libavcodec/mpeg4videodec.c | 3 ++ > libavcodec/mpeg4videoenc.c | 1 + > libavcodec/mpegvideo_enc.c | 1 + > libavcodec/msmpeg4.c | 2 +- > libavcodec/msmpeg4data.c | 2 +- > 9 files changed, 69 insertions(+), 40 deletions(-) > create mode 100644 libavcodec/mpeg4videodata.h > > diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c > index d944c4879f..5a7791111e 100644 > --- a/libavcodec/ituh263enc.c > +++ b/libavcodec/ituh263enc.c > @@ -39,7 +39,6 @@ > #include "mathops.h" > #include "mpegutils.h" > #include "flv.h" > -#include "mpeg4video.h" > #include "internal.h" > > /** > diff --git a/libavcodec/mpeg4data.h b/libavcodec/mpeg4data.h > index 30179d9801..c5a2b14721 100644 > --- a/libavcodec/mpeg4data.h > +++ b/libavcodec/mpeg4data.h > @@ -28,8 +28,7 @@ > #ifndef AVCODEC_MPEG4DATA_H > #define AVCODEC_MPEG4DATA_H > > -#include > -#include "mpegvideo.h" > +#include "mpeg4videodata.h" > > /* dc encoding for MPEG-4 */ > const uint8_t ff_mpeg4_DCtab_lum[13][2] = > diff --git a/libavcodec/mpeg4video.h b/libavcodec/mpeg4video.h > index cec8b30c32..87d9c9996e 100644 > --- a/libavcodec/mpeg4video.h > +++ b/libavcodec/mpeg4video.h > @@ -27,7 +27,6 @@ > > #include "get_bits.h" > #include "mpegvideo.h" > -#include "rl.h" > > // shapes > #define RECT_SHAPE 0 > @@ -118,40 +117,6 @@ typedef struct Mpeg4DecContext { > int rgb; > } Mpeg4DecContext; > > -static const uint8_t mpeg4_block_count[4] = {0, 6, 8, 12}; > - > -/* dc encoding for MPEG-4 */ > -extern const uint8_t ff_mpeg4_DCtab_lum[13][2]; > -extern const uint8_t ff_mpeg4_DCtab_chrom[13][2]; > - > -extern const uint16_t ff_mpeg4_intra_vlc[103][2]; > -extern const int8_t ff_mpeg4_intra_level[102]; > -extern const int8_t ff_mpeg4_intra_run[102]; > - > -extern RLTable ff_mpeg4_rl_intra; > -void ff_mpeg4_init_rl_intra(void); > - > -/* Note this is identical to the intra rvlc except that it is reordered. */ > -extern RLTable ff_rvlc_rl_inter; > -extern RLTable ff_rvlc_rl_intra; > - > -extern const uint8_t ff_sprite_trajectory_lens[15]; > -extern const uint8_t ff_mb_type_b_tab[4][2]; > - > -/* these matrixes will be permuted for the idct */ > -extern const int16_t ff_mpeg4_default_intra_matrix[64]; > -extern const int16_t ff_mpeg4_default_non_intra_matrix[64]; > - > -extern const uint8_t ff_mpeg4_y_dc_scale_table[32]; > -extern const uint8_t ff_mpeg4_c_dc_scale_table[32]; > -extern const uint16_t ff_mpeg4_resync_prefix[8]; > - > -extern const uint8_t ff_mpeg4_dc_threshold[8]; > - > -extern const uint8_t ff_mpeg4_studio_dc_luma[19][2]; > -extern const uint8_t ff_mpeg4_studio_dc_chroma[19][2]; > -extern const uint8_t ff_mpeg4_studio_intra[12][24][2]; > - > void ff_mpeg4_encode_mb(MpegEncContext *s, > int16_t block[6][64], > int motion_x, int motion_y); > diff --git a/libavcodec/mpeg4videodata.h b/libavcodec/mpeg4videodata.h > new file mode 100644 > index 0000000000..b20096067a > --- /dev/null > +++ b/libavcodec/mpeg4videodata.h > @@ -0,0 +1,61 @@ > +/* > + * MPEG-4 encoder/decoder data. > + * Copyright (c) 2000,2001 Fabrice Bellard > + * Copyright (c) 2002-2010 Michael Niedermayer > + * > + * This file is part of FFmpeg. > + * > + * FFmpeg is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * FFmpeg is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with FFmpeg; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA > + */ > + > +#ifndef AVCODEC_MPEG4VIDEODATA_H > +#define AVCODEC_MPEG4VIDEODATA_H > + > +#include > +#include "rl.h" > + > +/* dc encoding for MPEG-4 */ > +extern const uint8_t ff_mpeg4_DCtab_lum[13][2]; > +extern const uint8_t ff_mpeg4_DCtab_chrom[13][2]; > + > +extern const uint16_t ff_mpeg4_intra_vlc[103][2]; > +extern const int8_t ff_mpeg4_intra_level[102]; > +extern const int8_t ff_mpeg4_intra_run[102]; > + > +extern RLTable ff_mpeg4_rl_intra; > +void ff_mpeg4_init_rl_intra(void); > + > +/* Note this is identical to the intra rvlc except that it is reordered. */ > +extern RLTable ff_rvlc_rl_inter; > +extern RLTable ff_rvlc_rl_intra; > + > +extern const uint8_t ff_sprite_trajectory_lens[15]; > +extern const uint8_t ff_mb_type_b_tab[4][2]; > + > +/* these matrixes will be permuted for the idct */ > +extern const int16_t ff_mpeg4_default_intra_matrix[64]; > +extern const int16_t ff_mpeg4_default_non_intra_matrix[64]; > + > +extern const uint8_t ff_mpeg4_y_dc_scale_table[32]; > +extern const uint8_t ff_mpeg4_c_dc_scale_table[32]; > +extern const uint16_t ff_mpeg4_resync_prefix[8]; > + > +extern const uint8_t ff_mpeg4_dc_threshold[8]; > + > +extern const uint8_t ff_mpeg4_studio_dc_luma[19][2]; > +extern const uint8_t ff_mpeg4_studio_dc_chroma[19][2]; > +extern const uint8_t ff_mpeg4_studio_intra[12][24][2]; > + > +#endif /* AVCODEC_MPEG4VIDEO_H */ > diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c > index 325593a795..37088b7a6b 100644 > --- a/libavcodec/mpeg4videodec.c > +++ b/libavcodec/mpeg4videodec.c > @@ -34,6 +34,7 @@ > #include "mpegvideo.h" > #include "mpegvideodata.h" > #include "mpeg4video.h" > +#include "mpeg4videodata.h" > #include "h263.h" > #include "profiles.h" > #include "thread.h" > @@ -56,6 +57,8 @@ static VLC studio_intra_tab[12]; > static VLC studio_luma_dc; > static VLC studio_chroma_dc; > > +static const uint8_t mpeg4_block_count[4] = { 0, 6, 8, 12 }; > + > static const int mb_type_b_map[4] = { > MB_TYPE_DIRECT2 | MB_TYPE_L0L1, > MB_TYPE_L0L1 | MB_TYPE_16x16, > diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c > index b77653d453..8871d83281 100644 > --- a/libavcodec/mpeg4videoenc.c > +++ b/libavcodec/mpeg4videoenc.c > @@ -28,6 +28,7 @@ > #include "mpegvideo.h" > #include "h263.h" > #include "mpeg4video.h" > +#include "mpeg4videodata.h" > #include "profiles.h" > > /* The uni_DCtab_* tables below contain unified bits+length tables to encode DC > diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c > index 15b6669e46..afad9c8be1 100644 > --- a/libavcodec/mpegvideo_enc.c > +++ b/libavcodec/mpegvideo_enc.c > @@ -64,6 +64,7 @@ > #include "aandcttab.h" > #include "flv.h" > #include "mpeg4video.h" > +#include "mpeg4videodata.h" > #include "internal.h" > #include "bytestream.h" > #include "wmv2.h" > diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c > index e76aec6dfc..f12586dd64 100644 > --- a/libavcodec/msmpeg4.c > +++ b/libavcodec/msmpeg4.c > @@ -34,7 +34,7 @@ > #include "mpegvideo.h" > #include "msmpeg4.h" > #include "libavutil/x86/asm.h" > -#include "mpeg4video.h" > +#include "mpeg4videodata.h" > #include "msmpeg4data.h" > #include "mpegvideodata.h" > #include "vc1data.h" > diff --git a/libavcodec/msmpeg4data.c b/libavcodec/msmpeg4data.c > index a3a8144664..63f30ac544 100644 > --- a/libavcodec/msmpeg4data.c > +++ b/libavcodec/msmpeg4data.c > @@ -28,7 +28,7 @@ > */ > > #include "h263data.h" > -#include "mpeg4video.h" > +#include "mpeg4videodata.h" > #include "msmpeg4data.h" > > uint32_t ff_v2_dc_lum_table[512][2]; > 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".