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 860404738D for ; Tue, 7 Nov 2023 00:08:05 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C4C0D68CADC; Tue, 7 Nov 2023 02:08:01 +0200 (EET) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2023.outbound.protection.outlook.com [40.92.73.23]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4BA7668C6D1 for ; Tue, 7 Nov 2023 02:07:55 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XgELkMCmg790Trd4tH2N/taS7/IPyPpuIvuNb9bP6SEhP0YoPHfKZNd9kUkB1/d8MWN91XZ4FHDBlAtSUH1HDdZgF3N1o9B/FqZP0IY6/TzzGzEfGSHKexchaDwSxA3AhZtyDVsqEqWvkY/sgCd4dBZl330u2fDI6CsjE5anmEGooR0i83194t0TAKf6unMuqJ2GEP74vyazOEBoW7DxIANRO1s4air79EZVFpjyIajVXOQOJBcPQUIxTUA42xKmFROg+Pu/cwWMuIvBza8OXBa8Kvr/HCzsx8txwn/9sAiyZkhOIuvIHIL4rL9CzkYokNgtxvzLQHUaqM+mROo7ig== 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=A/v6EYSAefJ+A8a97BiwRcRS4NtB6GsIgasXrKWft+I=; b=BkB6qq/7LhfHojx95GMvMyJiuT+S4zKFBkR6yVFEcCzDpaSRjXPAW/tWgv2FaQmisd2+r/Tv90KLywoQNBFhbsiClm+ERpOOxJCFmlmLRrJmtRD14SgamkiMgzlLwyD4anzEdPZhHbtkRiGNycLjqDjojMxbJuVhXfSK6THAUT7r0zSgK6JhR8imzcCM5smW9FyBLBrNW37xWiaevGI2BMLhMqLrNpqpTKjpsfsVPQhP+ymUCdQsVuCY0mvSVEQN3pgQtmmusqqNVLm1FZuVyVprK/xWCykAcsxIQIXI9bv00DnrpBP7hMWx07Q1hbXI1nr2TC/E03PAa2u5SmvwoA== 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=A/v6EYSAefJ+A8a97BiwRcRS4NtB6GsIgasXrKWft+I=; b=EeW4EUBoOtIV1jKgC8nxfqFKQGIDooEYSz5opENOYaZQT/xktpx/ADcmSPbuuSUf0JSh+Bfm7Ei2pvWSRkEtL7+HIL+tjWBRYh34zv6KjkdlmsaOVxomjBvqK3fxsYOTN77ysCKCNpcfZREwLenB6Lw+twgqJkUqMicrScfW9OXAV93HtONV+RFnNHDjkM/nDRI+9zKiXTdY9z/uNAA/iDOAYVukqQvoij4zK1AGTjb2QoSMnMX8bTNn12pSuyEALRdqWDF9dqfzuGam3BVp8iSTPaBIFPDkBp51Ct2sMuKVK40juAa3RJtDZDt6R4LzybOdQ95puuphq4Ae2CHfQw== Received: from GV1SPRMB0033.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8b::7) by AM8P250MB0278.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:329::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.28; Tue, 7 Nov 2023 00:07:53 +0000 Received: from GV1SPRMB0033.EURP250.PROD.OUTLOOK.COM ([fe80::f1aa:b5e0:c00a:aa55]) by GV1SPRMB0033.EURP250.PROD.OUTLOOK.COM ([fe80::f1aa:b5e0:c00a:aa55%6]) with mapi id 15.20.6954.027; Tue, 7 Nov 2023 00:07:53 +0000 Message-ID: Date: Tue, 7 Nov 2023 01:09:12 +0100 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20231106150449.7898-1-jamrial@gmail.com> Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: <20231106150449.7898-1-jamrial@gmail.com> X-TMN: [3AkNAxDYlLHfEVU6OFhm1uscO3MNO0ndAABTDqycp2o=] X-ClientProxiedBy: ZR2P278CA0004.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:50::8) To GV1SPRMB0033.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8b::7) X-Microsoft-Original-Message-ID: <59c0aa76-5fc1-4a49-a183-4306a9a313c4@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1SPRMB0033:EE_|AM8P250MB0278:EE_ X-MS-Office365-Filtering-Correlation-Id: e531869c-1270-4b7e-0621-08dbdf25962c X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kPG3TV8xWFSyRflReatpxCUnET+U/GBexMxWS4X+SOCVAlEfR4gH3FgMGljdxI8pnufH1ZTgobPOQHRLlmv1c75jvhz7fvVslotJnAYhKprdRNHpQYOrGmZQXzY6gFtQuSxCk9yTEhle5INHKaJR9+lZnGw0BqxJ9nD7LYxJvjEu63jgTMQiGnpLqqztQtvBCgYQ8SHCEJb6z2w8X1Wz4RIrQQ8UJHFfEl+F7szFN77OtXpwZwUCBP90wFrW2qI9EvELoOY6+0I0MZ1Y9Q06lZIQ0HhrxZuCzCOL/GQ4XX9RPxYaquB3icUa+JOl5aOaagQ2hYEZYvJVGYuNHpNj1bZaQdYmxwavctCosnDxSnTmqmXOBSI/qHVIobou09H0ZfLgQRtfauBW9MtVmIpseih1XitK4OngPMYLpDhcT9gh1PUSAilg9KNDW8H6H0bMivERFP9NBPWp8SFpkfCMx0hB2F4p76SK3wPixUdJWYimvx/VecmGiDCOhNwhRD0hZn684x0V7fN1kJX7DgPTI0FMZ8pcANDkw6G5ZLfotrGaEziNaxOdavK4vy8jf44o X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZmNTcFBWYkFDc2ZwSGNmKy9jcGJISVl1MDg5MzdSRU0xMmJDZ2J1RXhld3Ex?= =?utf-8?B?clBQWllsY1NMOEpIOU56c1J5MHF4QWxnRm1RQTN5OTFUWlFsazRaUFB2ODRo?= =?utf-8?B?TjhOR2xJM1ZRNmhvY1ZpZEdQK2dVVk1ISnZkcFN5Mlc2RXJ4a3VId0ZLWDhr?= =?utf-8?B?S3VtWEJIaVZMSVJjNnBzYVRaNHJiWkpaUWVzeGlqY1N2aWFyQU15V1FYNXpy?= =?utf-8?B?U2lRR2NVa2NNeDZreU1VL0lDa3A0NXFSQzBoMXVHUXh3cyszbGw3VjBnY05v?= =?utf-8?B?bXdNdUxlU3RkTEpIM05vNGxEMVUzdlM3b2YydWlkY2J4T0FsU1NHTHVGVFpp?= =?utf-8?B?amNuWHhRMkxwWFgyaDl1NEwwcEJpWU1INjJoc0I1REJYQWtMWldURzZBZWZt?= =?utf-8?B?M3RSa3NzS0IzaW5Lai9scnpybG41MzlBTlV1RUlFSjRCRVlrQSszNHNUb3pI?= =?utf-8?B?eXpGd3pvckxYMzRvaFpmdkorb0kzamluaG51SVd4N1duYnlESEQ3QXRLK0sw?= =?utf-8?B?OVlyWEhPT2s3SFh1aC83N2RtQkkyNi9KVGNxeXFXNzVlU21PeStJamxXYlZm?= =?utf-8?B?eHFHelFNUDFHc2pnOENjTHlyZVF1UGhvSjlTaTE4YzM2bXVIcXFmVmRNL3Y3?= =?utf-8?B?NjZXZ0FBaFZCYnBVRFF2YzUvaGdYd2VFVDIwVWxSVllxb0FPaEdVR29IWGZC?= =?utf-8?B?bWQ4ZERoMnVjbVplamtPRjJMZ01CNTJPd1NVOFJ0RlBhS1hlYVZIdVpIQS83?= =?utf-8?B?ZDVuUzB4UTRFRU4zWFRPY1Z1dHRqWEN6M3pUaGJLMzBJOW8wUXFSdWx5c3Zu?= =?utf-8?B?YTVnK2lseXJQUjQ0MnR1ZnRvMmthQ3N6bDlsNUNnTU1uc1M0dlo3STExdXdE?= =?utf-8?B?OUJWU3FoSmh0ZmN4S0ZadE9zbE1CN0xEVmZNNWhvbFBma2ZPREU1MGlIU3Fx?= =?utf-8?B?K2pmaU5RSnVXd0hrNkF3a2F1VkxQdTJncDdha1NhRTZXNDlUbGhXcEYwVjZT?= =?utf-8?B?cGFReTRsNEIwaUJtdlk5NElyaGJMRVNlTms0eEs2YUFQalg0VHlSSW9RZ2J1?= =?utf-8?B?Vk5IdmdtaTZ2MDZtWEFoU01wekxNT3BVQ3IwU0kwQSt4ZmRmMTkrLzBDL3M0?= =?utf-8?B?eDhVUkQ3SFNWNEQva3Zkay9TdTduMUp4TG5GWDRoUmltalBIdFUyTEVkZ21N?= =?utf-8?B?b0dpaWNqc0hjemFkOUVGUjVKSWpuckFjMGJGZ1NEamdnL0ppRjV2L09OV2RS?= =?utf-8?B?c1JoVHlmWnJZWWZ6clVXbWZrdXI1TWJkek10T29CaUp6NTE1Smx6UlJWTk1N?= =?utf-8?B?d2QzaVR2a1d3em0vZWhEMHVzUzd3YWhLNWZMZEs2dzlRM0lNVjQ3eHoyeGdP?= =?utf-8?B?TTdhcDA1cUFpNXdlTXlvN08vcGtYUmtBRGh1OWk4TW9EOWRDZ3BVeGh4WFJ5?= =?utf-8?B?NGZFZnozTkNzUXp0cmdDNkhzRnpOcjcyVFFQUVlYcVN2bGZ2bzVlR2tMUGJK?= =?utf-8?B?V1U2L25adEpOYnNpclhqWHlWMWJaUC8rL2puVnFwQllCbGRWSnB2YUlYdGdi?= =?utf-8?B?NWVoeFU4UDk3OHFnSjhGRDRXM1B1TjNhUHNIS29xQ29nNEJLVGdGZWhmNTMw?= =?utf-8?B?QmZsRWdPREtSK0E0Q0N2SEgyYlhxWWUxVWxDSkpSUlltbWt4bGFRRy8raVh0?= =?utf-8?Q?yxrrzG+ek2029OecURFc?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e531869c-1270-4b7e-0621-08dbdf25962c X-MS-Exchange-CrossTenant-AuthSource: GV1SPRMB0033.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2023 00:07:53.3623 (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: AM8P250MB0278 Subject: Re: [FFmpeg-devel] [PATCH] avformat: move internal AVStream related functions and structs to a separate header 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: James Almer: > Signed-off-by: James Almer > --- > libavformat/Makefile | 1 + > libavformat/avformat.c | 214 -------------------------- > libavformat/demux.h | 29 ---- > libavformat/internal.h | 291 +---------------------------------- > libavformat/stream.c | 243 +++++++++++++++++++++++++++++ > libavformat/stream.h | 338 +++++++++++++++++++++++++++++++++++++++++ > 6 files changed, 583 insertions(+), 533 deletions(-) > create mode 100644 libavformat/stream.c > create mode 100644 libavformat/stream.h > The diff says that this patch does something else than what it claims to do: It also moves code and not only adds a new header. > diff --git a/libavformat/demux.h b/libavformat/demux.h > index 1f57e062f6..0682147776 100644 > --- a/libavformat/demux.h > +++ b/libavformat/demux.h > @@ -26,35 +26,6 @@ > #include "libavcodec/packet.h" > #include "avformat.h" > > -#define MAX_STD_TIMEBASES (30*12+30+3+6) > -typedef struct FFStreamInfo { > - int64_t last_dts; > - int64_t duration_gcd; > - int duration_count; > - int64_t rfps_duration_sum; > - double (*duration_error)[2][MAX_STD_TIMEBASES]; > - int64_t codec_info_duration; > - int64_t codec_info_duration_fields; > - int frame_delay_evidence; > - > - /** > - * 0 -> decoder has not been searched for yet. > - * >0 -> decoder found > - * <0 -> decoder with codec_id == -found_decoder has not been found > - */ > - int found_decoder; > - > - int64_t last_duration; > - > - /** > - * Those are used for average framerate estimation. > - */ > - int64_t fps_first_dts; > - int fps_first_dts_idx; > - int64_t fps_last_dts; > - int fps_last_dts_idx; > -} FFStreamInfo; > - Why are you moving this to stream.h (which makes it visible to muxers who have absolutely no business knowing about it)? > /** > * Returned by demuxers to indicate that data was consumed but discarded > * (ignored streams or junk data). The framework will re-call the demuxer. > diff --git a/libavformat/internal.h b/libavformat/internal.h > index 7702986c9c..9996b7a770 100644 > --- a/libavformat/internal.h > +++ b/libavformat/internal.h > @@ -26,6 +26,7 @@ > #include "libavcodec/packet_internal.h" > > #include "avformat.h" > +#include "stream.h" What's the point of this (apart from making this patch simpler)? And what is the point of this patch? When one has a header that includes stuff that is unused by several files that include said header, moving said stuff (or its complement) into a new header allows to reduce the amount of stuff actually included. Yet you are not doing this here and the FFStreamInfo changes go in the opposite direction. - 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".