avformat/utils: Move avpriv_new_chapter to demux_utils.c

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@outlook.com>

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 */

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;
+}

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)

libavformat/flacdec.c

@@ -22,11 +22,11 @@
 #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"
 #include "oggdec.h"
-#include "vorbiscomment.h"
 #include "replaygain.h"
 
 #define SEEKPOINT_SIZE 18

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"
 

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,

libavformat/oggparsevorbis.c

@@ -26,13 +26,13 @@
 
 #include "libavutil/avstring.h"
 #include "libavutil/base64.h"
-#include "libavutil/bswap.h"
 #include "libavutil/dict.h"
 
 #include "libavcodec/bytestream.h"
 #include "libavcodec/vorbis_parser.h"
 
 #include "avformat.h"
+#include "demux.h"
 #include "flac_picture.h"
 #include "internal.h"
 #include "oggdec.h"

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;

libavformat/wavdec.c

@@ -27,7 +27,6 @@
 
 #include <stdint.h>
 
-#include "config.h"
 #include "config_components.h"
 #include "libavutil/avassert.h"
 #include "libavutil/dict.h"
@@ -38,6 +37,7 @@
 #include "avformat.h"
 #include "avio.h"
 #include "avio_internal.h"
+#include "demux.h"
 #include "id3v2.h"
 #include "internal.h"
 #include "metadata.h"