From patchwork Sat May 7 11:28:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35653 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp2121864pzb; Sat, 7 May 2022 04:31:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwyU4jzaCcStRObN2FvdN81zvPsg4KT9gGuDpfaxnRFK18NJV21oRsl81t6CVtJRGji6hO+ X-Received: by 2002:a17:907:9722:b0:6f4:6989:9bc2 with SMTP id jg34-20020a170907972200b006f469899bc2mr6979723ejc.601.1651923114133; Sat, 07 May 2022 04:31:54 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t12-20020a170906064c00b006f3a9502509si7478935ejb.121.2022.05.07.04.31.53; Sat, 07 May 2022 04:31:54 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=jLegBKEm; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D827268B44E; Sat, 7 May 2022 14:29:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068102.outbound.protection.outlook.com [40.92.68.102]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E0AEB68B3A5 for ; Sat, 7 May 2022 14:29:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=at5fclV1iOM5pA5PNEZdpUbF/Va9WdCbjQ8pAfqzLyE30CXF0fRe6RfcFUEo/0BDO2g24CfUbjRKS6+U6xr+sdsHG6vSJI3V4QugpVThuF7KhI/HhNpo6FKoRrf4sdBxk7Hyba1qGR+jYBCu739sgoPP/PQjJwiKk3HA3wG+8iXpQEPkQVSmWBzbuOq/WgrhcLj5xCGL138s8OD0q/cut63k0cB8qUxDHUpU6JrvnxjKyJwlN+EUjmLuaGgQ8kZiZAFCK2gnBi7SfNDtHk5qKs86PVcCYdSCWjuA7wdT5KYBKzDW+FwNkFHjCO2p/hcuc6qlwdWCrISczvfyQ9txeA== 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=M6QthpuJM7bMeMLtk9rGqAyGhZZqkyv7e/HGuRiFsfk=; b=Xbox4hLMEWjTUoEevGGzB52ioee1nXzjBAMvg65TAhHungn6cWIZm7sQaOqcDbM6sCJCQwJ+6L0bYEMLXptpXjQVjAne7eNXGmhyTaQOg9jHasoBaH5xA+hhcPHS8I4wbhY8mCoDE1ZlAx+fK7mFMGzGoI4iHaAsxPVatluL/c73s5nnlkAtI1GYkXpoVNSnhWNyJMYt2EMmfSoBTlr49zrRKEEsUneCtvJMtuXBUgdvzBYNeeaQJmfn//SV+Y9+o4XXTRtD/sDfZAxaKrJWYBxcWJJTnl8IgvBSoGl+PVjGq/jhreTzeqfZzCp1LsAKPxrvxMv4vuZfgVqcVOWG3g== 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=M6QthpuJM7bMeMLtk9rGqAyGhZZqkyv7e/HGuRiFsfk=; b=jLegBKEm0z2sVRIb5hAE2Oky63I1rz5wm4wHB0LvA+cFkgaY++liD7KLgCf8/06Vk/6bZDcJcy7wANiE9cWwMIhRRRkG80w7rd3Yx6J3+sFYrJJh6CgJyCBXgTf+Umg1EfkkfRmzbhv+U364xKPrQ2OuuBQRh/WJu2zL9cFBHoY3M65Sf+E1t3HLP2cl3Akzb9fdzpof3NaLnTKdFKkouxBZvGWMWdOmEMpqXFIZVzvcNJ2cJW3YIiLPrZKhF/fyR68cOejgG7Kd1iREVabsbyOLSF8Q8qrXSm/sziFm6YeIWhON0C6L5zbdqT08C4OOiODLq9iG5uskdoARJfmVsQ== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by DB6PR01MB3895.eurprd01.prod.exchangelabs.com (2603:10a6:6:4b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24; Sat, 7 May 2022 11:29:49 +0000 Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431]) by AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431%6]) with mapi id 15.20.5206.024; Sat, 7 May 2022 11:29:49 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 May 2022 13:28:05 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [zdQOHIQUCgRSi655qpWWmDaAQw3qy8oe] X-ClientProxiedBy: ZRAP278CA0004.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::14) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220507112830.406162-18-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dca4c98c-1714-47c9-15e4-08da301ce531 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVZjuqTokTVdg9S7+crVfX8bNjjfziqVv63TEz2mWkbio6iT1cVbZqisOjyCkZaDcllmcwHRCegrQIRIJY7HOGgXDwYZ+TBvZFJuCd0ts7mZmQyr8OY/5pDxHCsAi+CcguKMSG/rSjxte/+BGWlfbkIRnaaF3G/ly4f3S6k/rJ9z0dlbhKKFe/MPOvMbwIyOr/Bnc32WgYmS9T1SW/k5+/QcBLxE7aCtob+W3WoRoiHPlUQDzla0cyY7VwTcUsFYdE3KWl3xKMi0/Z3DoD5KtW6IJ03PtGKB8sCcZK6+6TYiFRTvlkjWN9Ju8EtaIzR3O7NBuFYdCgXbxSEdf7+lDr7W6su/XrfdtAtnqkNvDhUcjrtQ3SBQlXfswQfwVjR8SV6Jadr1nHWBVNJMrS368QJopF+4gngfgL2noYjDoNjbsnVwBaY+ZP6hTGpGpWjrtnLwh0ACPoWCjvYYHf4hcbkI2j8TU7vKqO1CuoX36ASpRI3vN0zXn+H+FTvE463XWYVuoJpkmsYNpPc7uYpqkZj+T1GALxdaUWkiZNToWbqHmpuiXeJhM0xMEGcpPaFuu0g+2Swre1bnOsakZ26NJnALE6E1oIrk7B7ZoPwDX/pX6L4pn/ec3gnMvFUjElGro36ZL+GQHdIOZ2/IWSfO//iprJrb74OxXV/TUToBLRK6XCFFnrGC+0Jz3nt5XSOjbnqHjjXk0SLIlW3xam5ds6Qyv15VQIAMe4= X-MS-TrafficTypeDiagnostic: DB6PR01MB3895:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SX18RXKDZNEieDNh4GqG+objLwM+xsL6EbFeIh9cZSOAHD+XIGahpfkArsNYilQzTx6WGk1SQZ77E6OYSYW4t/VgVJIjgAsbQJl+m56KzZ2a+TdAZukeD55cXH0APhWdRinzPOWMOqhEnZNZfKzzX6o6ggwv4AN1pOGbEZeeEOcchfu/4Rs4i/lDDo6j1npqCZzDbNWYz1xRJ9/kMp9DOTAiMxCSctGGe9aAy2Todp1h+PhtTLen1HE2AfxNW7fjz7DO0i6VSbuv0iqLIdGZZ1M8HHjiUq30udbyjcyeC/3ljiwF2pLKISFoyzVj5CQRRpZcDzylHjfr4BcpgEExdmz0CdAXu+k5lmV11iaOsUeVduLYmnpCSqNKAGVguV8FBOsK7t0wlagehFKAkXAwr6nLpTg7V7ji/91YpYj3GAVToS5WccHrNgk/o74U/xNhYW2ZjkI9j1B8tvPWMg1dVDmtVEU6BTHxy+YDjNhdC3wzvz2/sq0YFiAFhRoAs4At0D1mqsWmSMCEkfJC8TsBhEAzdwD8UnOh8MPYpG9SM5QQ14SL30gXqOLHi/wNWgSRffssUwmTqjoaKqG30sja4cDR8Xo1SOmZv0m6OYZ04+9JZidZMVNrdZAViJd+03mp X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qSrAk+ZLru8QaNRAguXHG6otnPmJ/S6cGc67x6OjldtA55e/Vhvtd7zPI28uMrGVJnPWfaxqpfjk1UKEzBz3GvTVwuTAK08HM2VKzl/jjaiZ/Dy7Yxenl61oTsgmcLV/i3KCUAhvE9uCe6oFLmxy/c6918/ZgMSEAbfP33Tc1+TMhSAc4WXDWez81jyjNJEXqZEvv+Ac5rKnS47088DVYfyjw1+CNtl8rhRsZcTgGMZrVM/9dZqx27y2lgSNbRXpAP3d40SA7kGChI9kEmMxnHTa5h/qXTHdBhIxJuYsQ7xJuXI/f+qRiMiY7aet4fGaHTn8Sr9zzZCvHIqfjbB4a7kDtl8D0KPvlIBPneZjhQaL9ze84KyEJW3KAxM76Y6fOZCjnFRstWzKvxRrsy2zgdPhSEHMSIQeh3VwI8AyuKHNCPaFZvltu8YIN/n0XxCOsx3iCEvXdqhVuIzLFuHXKN5O1nZaoYB4YlCdhNAqo2ZfrZ1YZPOVS190soeLrE58hDjR6qPykV+5XYbr+Fwo1xqRyrT6+Zs4nYQmONKqmgEFXS2ce3+oUoKyXgSl22IMgg4c+xxv3n/FMdUaVLDg0CIUXF5WRpwKpB9tv7o3HtC+6cHE+7jpxgT7KB67QDeD7ATqXw/+t9+uuMtEVX0HomHj5C+LD8UWtlziAiDX60hDKf1H+CTQGnPSPp55jKq3rLLLP5W0pKVXwY/9hPoedg3hU1GmtP+VYMkFtCMeSFyWeZ5F0lpT09rhrMMNADL/sC0X84KRx6UnXPeuJ+WQWGEnsQ3HOzodj8tiEXK541xxrtIC4gE2IgMGiNzW4YJvb2AHyfi2IP6IQWMWvX++xNgkXl4QsJU2HyTLVbjhulKWOcuLFtgJlrXJAFe35hX2MZDe9JMPTLZk9qEYQWGpk9KCJ1XlusPCSYu2ELgb5UcolWPLcyYhj6QTAypFf/tLm6b3ggH0Sb6g7CI9eSOU6gdRiaKMEu+tmEhLUZKuHsUYswr3xT5Y84FY+pR+ukgbG7e3obKsJ4hKw0/KOL0tIvt8WApYbdjwXW/wtlMakyqWRNAkmQA/kFjjrkRAlZWKdmD6TqPLf1gE/MdXkj+JbEeWu2e4tGJIFPhWrqbr7QLZUjbsuWQYIK1fqDJ4BBlzAWHYXuH/E1FSaqr6AlUd1QXmYL3fZm6EFKgV9vvWqzJOc6KccCG75qAfZrX1SXChwupgUQUbx4wPbuK7E4tA2zClszE/MwWGLcOteROgZgaelybPD4xIt17b23wcgime1FTRBsvv5xXG+n9RVGOlXTzVWIlwTFilzpx2JfqsmD5SMn18nca+yl4bS2AZ5SkMz0JDFOyh8oJyVkkm9PGzU4DJrqZ3yYsyqOMZLQHOjvJG7Ky0FI229NUJVC9wicaWRDXdHnoUFp8dDrPgbsr6i8lGFd75Z5nmUPA/541koF2On4KEGWBFU5ZpeqzEZLQE X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dca4c98c-1714-47c9-15e4-08da301ce531 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2022 11:29:49.1732 (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: DB6PR01MB3895 Subject: [FFmpeg-devel] [PATCH 19/44] avformat/utils: Move avpriv_new_chapter to demux_utils.c 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: E8Dx3BC+aC94 It is demuxer-only: Muxers deal only with chapters given to them; they don't create any of their own. Signed-off-by: Andreas Rheinhardt --- libavformat/demux.h | 14 ++++++++++++ libavformat/demux_utils.c | 41 ++++++++++++++++++++++++++++++++++++ libavformat/ffmetadec.c | 2 +- libavformat/flacdec.c | 1 + libavformat/id3v2.c | 2 +- libavformat/internal.h | 14 ------------ libavformat/oggparsevorbis.c | 1 + libavformat/utils.c | 41 ------------------------------------ libavformat/wavdec.c | 1 + 9 files changed, 60 insertions(+), 57 deletions(-) diff --git a/libavformat/demux.h b/libavformat/demux.h index ff8d998d56..d857e4dafb 100644 --- a/libavformat/demux.h +++ b/libavformat/demux.h @@ -173,4 +173,18 @@ void ff_rescale_interval(AVRational tb_in, AVRational tb_out, void avpriv_stream_set_need_parsing(AVStream *st, enum AVStreamParseType type); +/** + * Add a new chapter. + * + * @param s media file handle + * @param id unique ID for this chapter + * @param start chapter start time in time_base units + * @param end chapter end time in time_base units + * @param title chapter title + * + * @return AVChapter or NULL on error + */ +AVChapter *avpriv_new_chapter(AVFormatContext *s, int64_t id, AVRational time_base, + int64_t start, int64_t end, const char *title); + #endif /* AVFORMAT_DEMUX_H */ diff --git a/libavformat/demux_utils.c b/libavformat/demux_utils.c index 10ae887359..cfd6084d54 100644 --- a/libavformat/demux_utils.c +++ b/libavformat/demux_utils.c @@ -32,3 +32,44 @@ void avpriv_stream_set_need_parsing(AVStream *st, enum AVStreamParseType type) { ffstream(st)->need_parsing = type; } + +AVChapter *avpriv_new_chapter(AVFormatContext *s, int64_t id, AVRational time_base, + int64_t start, int64_t end, const char *title) +{ + FFFormatContext *const si = ffformatcontext(s); + AVChapter *chapter = NULL; + int ret; + + if (end != AV_NOPTS_VALUE && start > end) { + av_log(s, AV_LOG_ERROR, "Chapter end time %"PRId64" before start %"PRId64"\n", end, start); + return NULL; + } + + if (!s->nb_chapters) { + si->chapter_ids_monotonic = 1; + } else if (!si->chapter_ids_monotonic || s->chapters[s->nb_chapters-1]->id >= id) { + for (unsigned i = 0; i < s->nb_chapters; i++) + if (s->chapters[i]->id == id) + chapter = s->chapters[i]; + if (!chapter) + si->chapter_ids_monotonic = 0; + } + + if (!chapter) { + chapter = av_mallocz(sizeof(*chapter)); + if (!chapter) + return NULL; + ret = av_dynarray_add_nofree(&s->chapters, &s->nb_chapters, chapter); + if (ret < 0) { + av_free(chapter); + return NULL; + } + } + av_dict_set(&chapter->metadata, "title", title, 0); + chapter->id = id; + chapter->time_base = time_base; + chapter->start = start; + chapter->end = end; + + return chapter; +} diff --git a/libavformat/ffmetadec.c b/libavformat/ffmetadec.c index 93ec6f5899..90f2e2b861 100644 --- a/libavformat/ffmetadec.c +++ b/libavformat/ffmetadec.c @@ -22,8 +22,8 @@ #include "libavutil/bprint.h" #include "libavutil/mathematics.h" #include "avformat.h" +#include "demux.h" #include "ffmeta.h" -#include "internal.h" #include "libavutil/dict.h" static int probe(const AVProbeData *p) diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c index bfae5a2af1..12328f03de 100644 --- a/libavformat/flacdec.c +++ b/libavformat/flacdec.c @@ -22,6 +22,7 @@ #include "libavutil/channel_layout.h" #include "libavcodec/flac.h" #include "avformat.h" +#include "demux.h" #include "flac_picture.h" #include "internal.h" #include "rawdec.h" diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index 0f9bedea02..191a305ffb 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -38,7 +38,7 @@ #include "libavutil/intreadwrite.h" #include "libavcodec/png.h" #include "avio_internal.h" -#include "internal.h" +#include "demux.h" #include "id3v1.h" #include "id3v2.h" diff --git a/libavformat/internal.h b/libavformat/internal.h index cbd8b2170d..1a51c0dc97 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -564,20 +564,6 @@ void ff_parse_key_value(const char *str, ff_parse_key_val_cb callback_get_buf, */ int ff_find_stream_index(const AVFormatContext *s, int id); -/** - * Add a new chapter. - * - * @param s media file handle - * @param id unique ID for this chapter - * @param start chapter start time in time_base units - * @param end chapter end time in time_base units - * @param title chapter title - * - * @return AVChapter or NULL on error - */ -AVChapter *avpriv_new_chapter(AVFormatContext *s, int64_t id, AVRational time_base, - int64_t start, int64_t end, const char *title); - enum AVCodecID ff_guess_image2_codec(const char *filename); const AVCodec *ff_find_decoder(AVFormatContext *s, const AVStream *st, diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c index 289900f7cf..ddf3a7b82e 100644 --- a/libavformat/oggparsevorbis.c +++ b/libavformat/oggparsevorbis.c @@ -33,6 +33,7 @@ #include "libavcodec/vorbis_parser.h" #include "avformat.h" +#include "demux.h" #include "flac_picture.h" #include "internal.h" #include "oggdec.h" diff --git a/libavformat/utils.c b/libavformat/utils.c index 2d5ee8f7bc..1235315986 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -694,47 +694,6 @@ AVProgram *av_new_program(AVFormatContext *ac, int id) return program; } -AVChapter *avpriv_new_chapter(AVFormatContext *s, int64_t id, AVRational time_base, - int64_t start, int64_t end, const char *title) -{ - FFFormatContext *const si = ffformatcontext(s); - AVChapter *chapter = NULL; - int ret; - - if (end != AV_NOPTS_VALUE && start > end) { - av_log(s, AV_LOG_ERROR, "Chapter end time %"PRId64" before start %"PRId64"\n", end, start); - return NULL; - } - - if (!s->nb_chapters) { - si->chapter_ids_monotonic = 1; - } else if (!si->chapter_ids_monotonic || s->chapters[s->nb_chapters-1]->id >= id) { - for (unsigned i = 0; i < s->nb_chapters; i++) - if (s->chapters[i]->id == id) - chapter = s->chapters[i]; - if (!chapter) - si->chapter_ids_monotonic = 0; - } - - if (!chapter) { - chapter = av_mallocz(sizeof(AVChapter)); - if (!chapter) - return NULL; - ret = av_dynarray_add_nofree(&s->chapters, &s->nb_chapters, chapter); - if (ret < 0) { - av_free(chapter); - return NULL; - } - } - av_dict_set(&chapter->metadata, "title", title, 0); - chapter->id = id; - chapter->time_base = time_base; - chapter->start = start; - chapter->end = end; - - return chapter; -} - void av_program_add_stream_index(AVFormatContext *ac, int progid, unsigned idx) { AVProgram *program = NULL; diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c index 51216bfbe6..ee72746b4c 100644 --- a/libavformat/wavdec.c +++ b/libavformat/wavdec.c @@ -38,6 +38,7 @@ #include "avformat.h" #include "avio.h" #include "avio_internal.h" +#include "demux.h" #include "id3v2.h" #include "internal.h" #include "metadata.h"