[FFmpeg-devel] [PATCH 19/44] avformat/utils: Move avpriv_new_chapter to demux_utils.c
Andreas Rheinhardt
andreas.rheinhardt at outlook.com
Sat May 7 14:28:05 EEST 2022
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 <andreas.rheinhardt at outlook.com>
---
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"
--
2.32.0
More information about the ffmpeg-devel
mailing list