diff mbox series

[FFmpeg-devel,1/4] avformat: add av_program_copy()

Message ID 20230207145850.25485-1-ffmpeg@gyani.pro
State New
Headers show
Series [FFmpeg-devel,1/4] avformat: add av_program_copy() | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Gyan Doshi Feb. 7, 2023, 2:58 p.m. UTC 
Needed to transfer programs in parent muxing contexts to child muxers,
like in hls, segment, tee muxers.
---
 doc/APIchanges         |  3 +++
 libavformat/avformat.c | 52 ++++++++++++++++++++++++++++++++++++++++++
 libavformat/avformat.h |  2 ++
 libavformat/version.h  |  2 +-
 4 files changed, 58 insertions(+), 1 deletion(-)

Comments

Anton Khirnov Feb. 8, 2023, 3:17 p.m. UTC | #1 
Quoting Gyan Doshi (2023-02-07 15:58:47)
> Needed to transfer programs in parent muxing contexts to child muxers,
> like in hls, segment, tee muxers.

If it's only intended for use in muxers, why is it public?
Gyan Doshi Feb. 8, 2023, 4:03 p.m. UTC | #2 
On 2023-02-08 08:47 pm, Anton Khirnov wrote:
> Quoting Gyan Doshi (2023-02-07 15:58:47)
>> Needed to transfer programs in parent muxing contexts to child muxers,
>> like in hls, segment, tee muxers.
> If it's only intended for use in muxers, why is it public?

Could have worded the msg better. The intention wasn't to limit this 
internally.

The fn is motivated by a CLI HLS user's troubleshhoting but it is useful 
to any API user who uses
the public av_new_program and then copies the data manually.

That reminds me, I should update this to check for existing programs.

Regards,
Gyan
diff mbox series

Patch

diff --git a/doc/APIchanges b/doc/APIchanges
index 6baf914760..4916d1abe8 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -14,6 +14,9 @@  libavutil:     2021-04-27
 
 API changes, most recent first:
 
+2023-02-xx - xxxxxxxxxx - lavf 59.39.100 - avformat.h
+  Add av_program_copy()
+
 2023-0x-xx - xxxxxxxxxx - lavc 59.63.100
   Allow AV_CODEC_FLAG_COPY_OPAQUE to be used with decoders.
 
diff --git a/libavformat/avformat.c b/libavformat/avformat.c
index 19c7219471..ddea692cee 100644
--- a/libavformat/avformat.c
+++ b/libavformat/avformat.c
@@ -359,6 +359,58 @@  void av_program_add_stream_index(AVFormatContext *ac, int progid, unsigned idx)
     }
 }
 
+int av_program_copy(AVFormatContext *dst, AVFormatContext *src, int progid)
+{
+    AVProgram *src_prog = NULL;
+    AVProgram *dst_prog = NULL;
+    int i, j, ret;
+
+    for (i = 0; i < src->nb_programs; i++)
+        if (src->programs[i]->id == progid)
+            src_prog = src->programs[i];
+
+    if (!src_prog) {
+        av_log(src, AV_LOG_ERROR, "program not found: id=0x%04x\n", progid);
+        return AVERROR(EINVAL);
+    }
+
+    av_log(src, AV_LOG_TRACE, "copying program: id=0x%04x\n", progid);
+
+    dst_prog = av_mallocz(sizeof(*dst_prog));
+    if (!dst_prog)
+        return AVERROR(ENOMEM);
+    ret = av_dynarray_add_nofree(&dst->programs, &dst->nb_programs, dst_prog);
+    if (ret < 0) {
+        av_free(dst_prog);
+        return AVERROR(ENOMEM);
+    }
+
+    /* public fields */
+    dst_prog->id          = src_prog->id;
+    dst_prog->flags       = src_prog->flags;
+    dst_prog->discard     = src_prog->discard;
+    dst_prog->program_num = src_prog->program_num;
+    dst_prog->pmt_pid     = src_prog->pmt_pid;
+    dst_prog->pcr_pid     = src_prog->pcr_pid;
+    dst_prog->pmt_version = src_prog->pmt_version;
+
+    for (i = 0; i < dst->nb_streams; i++) {
+        for (j = 0; j < src_prog->nb_stream_indexes; j++)
+            if (dst->streams[i]->id == src->streams[src_prog->stream_index[j]]->id)
+                av_program_add_stream_index(dst, dst_prog->id, i);
+    }
+
+    av_dict_copy(&dst_prog->metadata, src_prog->metadata, 0);
+
+    /* private fields */
+    dst_prog->start_time         = src_prog->start_time;
+    dst_prog->end_time           = src_prog->end_time;
+    dst_prog->pts_wrap_reference = src_prog->pts_wrap_reference;
+    dst_prog->pts_wrap_behavior  = src_prog->pts_wrap_behavior;
+
+    return 0;
+}
+
 AVProgram *av_find_program_from_stream(AVFormatContext *ic, AVProgram *last, int s)
 {
     for (unsigned i = 0; i < ic->nb_programs; i++) {
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 1d97d56ac5..db1d8c4fba 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1996,6 +1996,8 @@  uint8_t *av_stream_get_side_data(const AVStream *stream,
 
 AVProgram *av_new_program(AVFormatContext *s, int id);
 
+int av_program_copy(AVFormatContext *dst, AVFormatContext *src, int progid);
+
 /**
  * @}
  */
diff --git a/libavformat/version.h b/libavformat/version.h
index 134cdb2b89..9aba356e09 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -31,7 +31,7 @@ 
 
 #include "version_major.h"
 
-#define LIBAVFORMAT_VERSION_MINOR  38
+#define LIBAVFORMAT_VERSION_MINOR  39
 #define LIBAVFORMAT_VERSION_MICRO 100
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \