[FFmpeg-devel] [PATCH v4 1/5] avformat: add av_program_add_stream_index2()

[FFmpeg-devel] [PATCH v4 1/5] avformat: add av_program_add_stream_index2()

[Gyan Doshi]

av_program_add_stream_index() added in 526efa10534
may fail to carry out its purpose but the lack of
a return value stops callers from catching any error.

Fixed in new function.
---
As suggested by Andreas in
https://ffmpeg.org/pipermail/ffmpeg-devel/2023-February/306645.html

 doc/APIchanges         |  3 +++
 libavformat/avformat.c | 21 +++++++++++++++------
 libavformat/avformat.h | 13 +++++++++++++
 libavformat/version.h  |  2 +-
 4 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/doc/APIchanges b/doc/APIchanges
index 29161e30bf..889f9925b1 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -2,6 +2,9 @@ The last version increases of all libraries were on 2023-02-09
 
 API changes, most recent first:
 
+2023-02-xx - xxxxxxxxxx - lavf 60.3.100 - avformat.h
+  Add av_program_add_stream_index2().
+
 2023-02-16 - xxxxxxxxxx - lavf 60.2.100 - avformat.h
   Deprecate AVFormatContext io_close callback.
   The superior io_close2 callback should be used instead.
diff --git a/libavformat/avformat.c b/libavformat/avformat.c
index 708d90b38c..0f203e4f86 100644
--- a/libavformat/avformat.c
+++ b/libavformat/avformat.c
@@ -333,14 +333,14 @@ AVProgram *av_new_program(AVFormatContext *ac, int id)
     return program;
 }
 
-void av_program_add_stream_index(AVFormatContext *ac, int progid, unsigned idx)
+int av_program_add_stream_index2(AVFormatContext *ac, int progid, unsigned idx)
 {
     AVProgram *program = NULL;
     void *tmp;
 
     if (idx >= ac->nb_streams) {
-        av_log(ac, AV_LOG_ERROR, "stream index %d is not valid\n", idx);
-        return;
+        av_log(ac, AV_LOG_ERROR, "stream index %d is greater than stream count %d\n", idx, ac->nb_streams);
+        return AVERROR(EINVAL);
     }
 
     for (unsigned i = 0; i < ac->nb_programs; i++) {
@@ -349,15 +349,24 @@ void av_program_add_stream_index(AVFormatContext *ac, int progid, unsigned idx)
         program = ac->programs[i];
         for (unsigned j = 0; j < program->nb_stream_indexes; j++)
             if (program->stream_index[j] == idx)
-                return;
+                return 0;
 
         tmp = av_realloc_array(program->stream_index, program->nb_stream_indexes+1, sizeof(unsigned int));
         if (!tmp)
-            return;
+            return AVERROR(ENOMEM);
         program->stream_index = tmp;
         program->stream_index[program->nb_stream_indexes++] = idx;
-        return;
+        return 0;
     }
+
+    av_log(ac, AV_LOG_ERROR, "No program with id %d found\n", progid);
+    return AVERROR(EINVAL);
+}
+
+void av_program_add_stream_index(AVFormatContext *ac, int progid, unsigned idx)
+{
+    av_program_add_stream_index2(ac, progid, idx);
+    return;
 }
 
 AVProgram *av_find_program_from_stream(AVFormatContext *ic, AVProgram *last, int s)
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 1916aa2dc5..33ab0bc8ba 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -2046,6 +2046,19 @@ AVProgram *av_find_program_from_stream(AVFormatContext *ic, AVProgram *last, int
 
 void av_program_add_stream_index(AVFormatContext *ac, int progid, unsigned int idx);
 
+/**
+ * Add the supplied index of a stream to the AVProgram with matching id.
+ *
+ * @param ac      the format context which contains the target AVProgram
+ * @param progid  the ID of the AVProgram whose stream index is to be updated
+ * @param idx     the index of the stream to be added
+ *
+ * @return >=0 upon successful addition or if index was already present,
+ *         AVERROR if no matching program is found or stream index is invalid or
+ *         the stream index array reallocation failed.
+ */
+int av_program_add_stream_index2(AVFormatContext *ac, int progid, unsigned int idx);
+
 /**
  * Find the "best" stream in the file.
  * The best stream is determined according to various heuristics as the most
diff --git a/libavformat/version.h b/libavformat/version.h
index 904e7f06aa..7ff1483912 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -31,7 +31,7 @@
 
 #include "version_major.h"
 
-#define LIBAVFORMAT_VERSION_MINOR   2
+#define LIBAVFORMAT_VERSION_MINOR   3
 #define LIBAVFORMAT_VERSION_MICRO 100
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
-- 
2.39.1

_______________________________________________
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".

[FFmpeg-devel] [PATCH v4 2/5] avformat: add av_program_copy()

[Gyan Doshi]

Helper to transfer programs from one muxing context to another.
---
 doc/APIchanges         |  3 ++
 libavformat/avformat.c | 66 ++++++++++++++++++++++++++++++++++++++++++
 libavformat/avformat.h | 22 ++++++++++++++
 libavformat/version.h  |  3 +-
 4 files changed, 93 insertions(+), 1 deletion(-)

diff --git a/doc/APIchanges b/doc/APIchanges
index 889f9925b1..2588c17560 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -2,6 +2,9 @@ The last version increases of all libraries were on 2023-02-09
 
 API changes, most recent first:
 
+2023-02-xx - xxxxxxxxxx - lavf 60.4.100 - avformat.h
+  Add av_program_copy()
+
 2023-02-xx - xxxxxxxxxx - lavf 60.3.100 - avformat.h
   Add av_program_add_stream_index2().
 
diff --git a/libavformat/avformat.c b/libavformat/avformat.c
index 0f203e4f86..64741b6f4a 100644
--- a/libavformat/avformat.c
+++ b/libavformat/avformat.c
@@ -369,6 +369,72 @@ void av_program_add_stream_index(AVFormatContext *ac, int progid, unsigned idx)
     return;
 }
 
+int av_program_copy(AVFormatContext *dst, const AVFormatContext *src, int progid, int overwrite)
+{
+    const AVProgram *src_prog = NULL;
+    AVProgram *dst_prog = NULL;
+    int ret, idx = -1;
+
+    for (unsigned i = 0; i < src->nb_programs; i++)
+        if (src->programs[i]->id == progid)
+            src_prog = src->programs[i];
+
+    if (!src_prog) {
+        av_log(dst, AV_LOG_ERROR, "source program not found: id=0x%04x\n", progid);
+        return AVERROR(EINVAL);
+    }
+
+    for (unsigned i = 0; i < dst->nb_programs; i++) {
+        if (dst->programs[i]->id == progid)
+            idx = i;
+    }
+
+    if (idx >= 0 && !overwrite) {
+        av_log(dst, AV_LOG_WARNING, "target muxer already has program with id=0x%04x; not overwriting\n", progid);
+        return 0;
+    }
+
+    av_log(dst, AV_LOG_TRACE, "%s program: id=0x%04x\n", idx >= 0 ? "overwriting" : "copying", progid);
+
+    if (idx >= 0) {
+        dst_prog = dst->programs[idx];
+        av_dict_free(&dst_prog->metadata);
+        av_freep(&dst_prog->stream_index);
+        dst_prog->nb_stream_indexes = 0;
+    } else {
+        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 ret;
+        }
+    }
+
+    /* 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 (unsigned i = 0; i < dst->nb_streams; i++) {
+        for (unsigned j = 0; j < src_prog->nb_stream_indexes; j++)
+            if (dst->streams[i]->id == src->streams[src_prog->stream_index[j]]->id) {
+                if (ret = av_program_add_stream_index2(dst, dst_prog->id, i) < 0)
+                    return ret;
+            }
+    }
+
+    if (ret = av_dict_copy(&dst_prog->metadata, src_prog->metadata, 0) < 0)
+        return ret;
+
+    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 33ab0bc8ba..46b4d177c3 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1886,6 +1886,28 @@ uint8_t *av_stream_get_side_data(const AVStream *stream,
 
 AVProgram *av_new_program(AVFormatContext *s, int id);
 
+/**
+ * Copy an AVProgram from one AVFormatContext to another.
+ *
+ * Streams in the destination context whose IDs match the IDs of the streams in the
+ * source AVProgram index are added to the stream index of the copied AVProgram.
+ *
+ * If a new program has to be added, the function expects and requires any existing buffer
+ * holding the array of pointers to AVPrograms in the destination context to have its size
+ * be a power-of-two value. This should be the case if all earlier programs were created
+ * using av_new_program or this function. 
+ *
+ * @param dst           pointer to the target muxer context
+ * @param src           pointer to the source muxer context
+ * @param progid        ID of the program to be copied
+ * @param overwrite     whether to overwrite if target muxer already
+ *                      contains a program with the same ID
+ *
+ * @return  >= 0 in case of success, a negative AVERROR code in case of
+ *          failure
+ */
+int av_program_copy(AVFormatContext *dst, const AVFormatContext *src, int progid, int overwrite);
+
 /**
  * @}
  */
diff --git a/libavformat/version.h b/libavformat/version.h
index 7ff1483912..62fa908659 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -31,7 +31,8 @@
 
 #include "version_major.h"
 
-#define LIBAVFORMAT_VERSION_MINOR   3
+#define LIBAVFORMAT_VERSION_MINOR   4
+
 #define LIBAVFORMAT_VERSION_MICRO 100
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
-- 
2.39.1

_______________________________________________
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".

Re: [FFmpeg-devel] [PATCH v4 2/5] avformat: add av_program_copy()

[Anton Khirnov]

Quoting Gyan Doshi (2023-02-18 05:49:46)
> diff --git a/libavformat/avformat.h b/libavformat/avformat.h
> index 33ab0bc8ba..46b4d177c3 100644
> --- a/libavformat/avformat.h
> +++ b/libavformat/avformat.h
> @@ -1886,6 +1886,28 @@ uint8_t *av_stream_get_side_data(const AVStream *stream,
>  
>  AVProgram *av_new_program(AVFormatContext *s, int id);
>  
> +/**
> + * Copy an AVProgram from one AVFormatContext to another.
> + *
> + * Streams in the destination context whose IDs match the IDs of the streams in the
> + * source AVProgram index are added to the stream index of the copied AVProgram.
> + *
> + * If a new program has to be added, the function expects and requires any existing buffer
> + * holding the array of pointers to AVPrograms in the destination context to have its size
> + * be a power-of-two value. This should be the case if all earlier programs were created
> + * using av_new_program or this function. 
> + *
> + * @param dst           pointer to the target muxer context
> + * @param src           pointer to the source muxer context
> + * @param progid        ID of the program to be copied
> + * @param overwrite     whether to overwrite if target muxer already
> + *                      contains a program with the same ID
> + *
> + * @return  >= 0 in case of success, a negative AVERROR code in case of
> + *          failure
> + */
> +int av_program_copy(AVFormatContext *dst, const AVFormatContext *src, int progid, int overwrite);

Why identify source programs by id rather than the structure itself?

Also, overwrite should really be a more generic flags field for future
extension.

Overall I remain uneasy about this being public - the semantics are
rather tricky and fragile unless the streams between src and dst match
exactly.

-- 
Anton Khirnov
_______________________________________________
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".

[FFmpeg-devel] [PATCH v4 3/5] avformat/hls: relay programs to child muxers

[Gyan Doshi]

---
 libavformat/hlsenc.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index e1f96feda3..74db447085 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -911,6 +911,14 @@ FF_ENABLE_DEPRECATION_WARNINGS
         st->id = vs->streams[i]->id;
     }
 
+    for (i = 0; i < s->nb_programs; i++) {
+        ret = av_program_copy(oc, (const AVFormatContext *)s, s->programs[i]->id, 0);
+        if (ret < 0) {
+            av_log(s, AV_LOG_ERROR, "unable to transfer program %d to child muxer\n", s->programs[i]->id);
+            return ret;
+        }
+    }
+
     vs->start_pos = 0;
     vs->new_start = 1;
 
-- 
2.39.1

_______________________________________________
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".

Re: [FFmpeg-devel] [PATCH v4 3/5] avformat/hls: relay programs to child muxers

[Anton Khirnov]

Quoting Gyan Doshi (2023-02-18 05:49:47)
> ---
>  libavformat/hlsenc.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
> index e1f96feda3..74db447085 100644
> --- a/libavformat/hlsenc.c
> +++ b/libavformat/hlsenc.c
> @@ -911,6 +911,14 @@ FF_ENABLE_DEPRECATION_WARNINGS
>          st->id = vs->streams[i]->id;
>      }
>  
> +    for (i = 0; i < s->nb_programs; i++) {
> +        ret = av_program_copy(oc, (const AVFormatContext *)s, s->programs[i]->id, 0);

are the casts really needed?

-- 
Anton Khirnov
_______________________________________________
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".

[FFmpeg-devel] [PATCH v4 4/5] avformat/segment: relay programs to child muxers

[Gyan Doshi]

---
 libavformat/segment.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/libavformat/segment.c b/libavformat/segment.c
index 2a82f39f31..d7f3fb5deb 100644
--- a/libavformat/segment.c
+++ b/libavformat/segment.c
@@ -186,6 +186,14 @@ FF_ENABLE_DEPRECATION_WARNINGS
         }
     }
 
+    for (i = 0; i < s->nb_programs; i++) {
+        ret = av_program_copy(oc, (const AVFormatContext *)s, s->programs[i]->id, 0);
+        if (ret < 0) {
+            av_log(s, AV_LOG_ERROR, "unable to transfer program %d to child muxer\n", s->programs[i]->id);
+            return ret;
+        }
+    }
+
     return 0;
 }
 
-- 
2.39.1

_______________________________________________
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".

[FFmpeg-devel] [PATCH v4 5/5] avformat/tee: relay programs to child muxers

[Gyan Doshi]

---
 libavformat/tee.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/libavformat/tee.c b/libavformat/tee.c
index cb555f52fd..e81f9ba706 100644
--- a/libavformat/tee.c
+++ b/libavformat/tee.c
@@ -295,6 +295,14 @@ FF_ENABLE_DEPRECATION_WARNINGS
         }
     }
 
+    for (i = 0; i < avf->nb_programs; i++) {
+        ret = av_program_copy(avf2, (const AVFormatContext *)avf, avf->programs[i]->id, 0);
+        if (ret < 0) {
+            av_log(avf, AV_LOG_ERROR, "unable to transfer program %d to child muxer\n", avf->programs[i]->id);
+            return ret;
+        }
+    }
+
     ret = ff_format_output_open(avf2, filename, &options);
     if (ret < 0) {
         av_log(avf, AV_LOG_ERROR, "Slave '%s': error opening: %s\n", slave,
-- 
2.39.1

_______________________________________________
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".

Re: [FFmpeg-devel] [PATCH v4 1/5] avformat: add av_program_add_stream_index2()

[Anton Khirnov]

Quoting Gyan Doshi (2023-02-18 05:49:45)
> av_program_add_stream_index() added in 526efa10534
> may fail to carry out its purpose but the lack of
> a return value stops callers from catching any error.

av_program_add_stream_index() should be deprecated then

-- 
Anton Khirnov
_______________________________________________
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".