[FFmpeg-cvslog] fftools/ffmpeg_mux: move bsf_ctx from OutputStream to MuxStream

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Fri Oct 14 11:34:26 2022 +0200| [f0cd68eea0e6383049a0c4f80e4eb14c18d225b5] | committer: Anton Khirnov

fftools/ffmpeg_mux: move bsf_ctx from OutputStream to MuxStream

It is private to the muxer and does not need to be visible outside of
it.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f0cd68eea0e6383049a0c4f80e4eb14c18d225b5
---

 fftools/ffmpeg.h          |  2 --
 fftools/ffmpeg_mux.c      | 17 ++++++++++-------
 fftools/ffmpeg_mux.h      |  2 ++
 fftools/ffmpeg_mux_init.c |  2 +-
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h
index 0af824b9b9..b98bb45331 100644
--- a/fftools/ffmpeg.h
+++ b/fftools/ffmpeg.h
@@ -510,8 +510,6 @@ typedef struct OutputStream {
     AVRational mux_timebase;
     AVRational enc_timebase;
 
-    AVBSFContext            *bsf_ctx;
-
     AVCodecContext *enc_ctx;
     int64_t max_frames;
     AVFrame *filtered_frame;
diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c
index 4ad69a149a..525c15b4ae 100644
--- a/fftools/ffmpeg_mux.c
+++ b/fftools/ffmpeg_mux.c
@@ -318,6 +318,7 @@ static int submit_packet(Muxer *mux, AVPacket *pkt, OutputStream *ost)
 void of_output_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost, int eof)
 {
     Muxer *mux = mux_from_of(of);
+    MuxStream *ms = ms_from_ost(ost);
     const char *err_msg;
     int ret = 0;
 
@@ -325,17 +326,17 @@ void of_output_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost, int eof)
         ost->last_mux_dts = av_rescale_q(pkt->dts, ost->mux_timebase, AV_TIME_BASE_Q);
 
     /* apply the output bitstream filters */
-    if (ost->bsf_ctx) {
+    if (ms->bsf_ctx) {
         int bsf_eof = 0;
 
-        ret = av_bsf_send_packet(ost->bsf_ctx, eof ? NULL : pkt);
+        ret = av_bsf_send_packet(ms->bsf_ctx, eof ? NULL : pkt);
         if (ret < 0) {
             err_msg = "submitting a packet for bitstream filtering";
             goto fail;
         }
 
         while (!bsf_eof) {
-            ret = av_bsf_receive_packet(ost->bsf_ctx, pkt);
+            ret = av_bsf_receive_packet(ms->bsf_ctx, pkt);
             if (ret == AVERROR(EAGAIN))
                 return;
             else if (ret == AVERROR_EOF)
@@ -541,9 +542,10 @@ int mux_check_init(Muxer *mux)
     return 0;
 }
 
-static int bsf_init(OutputStream *ost)
+static int bsf_init(MuxStream *ms)
 {
-    AVBSFContext *ctx = ost->bsf_ctx;
+    OutputStream *ost = &ms->ost;
+    AVBSFContext *ctx = ms->bsf_ctx;
     int ret;
 
     if (!ctx)
@@ -573,6 +575,7 @@ static int bsf_init(OutputStream *ost)
 int of_stream_init(OutputFile *of, OutputStream *ost)
 {
     Muxer *mux = mux_from_of(of);
+    MuxStream *ms = ms_from_ost(ost);
     int ret;
 
     if (ost->sq_idx_mux >= 0)
@@ -581,7 +584,7 @@ int of_stream_init(OutputFile *of, OutputStream *ost)
     /* initialize bitstream filters for the output stream
      * needs to be done here, because the codec id for streamcopy is not
      * known until now */
-    ret = bsf_init(ost);
+    ret = bsf_init(ms);
     if (ret < 0)
         return ret;
 
@@ -652,7 +655,7 @@ static void ost_free(OutputStream **post)
         av_fifo_freep2(&ms->muxing_queue);
     }
 
-    av_bsf_free(&ost->bsf_ctx);
+    av_bsf_free(&ms->bsf_ctx);
 
     av_frame_free(&ost->filtered_frame);
     av_frame_free(&ost->sq_frame);
diff --git a/fftools/ffmpeg_mux.h b/fftools/ffmpeg_mux.h
index 45daeb3591..8470f971cc 100644
--- a/fftools/ffmpeg_mux.h
+++ b/fftools/ffmpeg_mux.h
@@ -40,6 +40,8 @@ typedef struct MuxStream {
     /* the packets are buffered here until the muxer is ready to be initialized */
     AVFifo *muxing_queue;
 
+    AVBSFContext *bsf_ctx;
+
     /*
      * The size of the AVPackets' buffers in queue.
      * Updated when a packet is either pushed or pulled from the queue.
diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c
index d6bae92513..3f2db04f52 100644
--- a/fftools/ffmpeg_mux_init.c
+++ b/fftools/ffmpeg_mux_init.c
@@ -304,7 +304,7 @@ static OutputStream *new_output_stream(Muxer *mux, OptionsContext *o,
 
     MATCH_PER_STREAM_OPT(bitstream_filters, str, bsfs, oc, st);
     if (bsfs && *bsfs) {
-        ret = av_bsf_list_parse_str(bsfs, &ost->bsf_ctx);
+        ret = av_bsf_list_parse_str(bsfs, &ms->bsf_ctx);
         if (ret < 0) {
             av_log(NULL, AV_LOG_ERROR, "Error parsing bitstream filter sequence '%s': %s\n", bsfs, av_err2str(ret));
             exit_program(1);