fftools/ffmpeg_filter: pass enc_timebase through OutputFilterOptions

Reduces the need to access OutputStream, which will allow decoupling filtering from encoding in future commits.

Anton Khirnov committed 2 years ago

Commit 9d5bf2d1 parent 606c71b3 files · +9 −4Browse files

Unified · Split

3 files

     int64_t             ts_offset;
+    /* Desired output timebase.
+     * Numerator can be one of EncTimeBase values, or 0 when no preference.
+     */
+    AVRational          output_tb;
     // A combination of OFilterFlags.
     unsigned            flags;
 } OutputFilterOptions;
     AVStream *st;            /* stream in the output file */
-    AVRational enc_timebase;
     Encoder *enc;
     AVCodecContext *enc_ctx;

@@ -780,7 +780,7 @@ int ofilter_bind_ost(OutputFilter ofilter, OutputStream ost, · 779 unmodified lines
780		780
781	ofp->flags = opts->flags;	781	ofp->flags = opts->flags;
782	ofp->ts_offset = opts->ts_offset;	782	ofp->ts_offset = opts->ts_offset;
783	ofp->enc_timebase = ost->enc_timebase;	783	ofp->enc_timebase = opts->output_tb;
784		784
785	switch (ost->enc_ctx->codec_type) {	785	switch (ost->enc_ctx->codec_type) {
786	case AVMEDIA_TYPE_VIDEO:	786	case AVMEDIA_TYPE_VIDEO:

     const AVCodec *enc;
     AVStream *st;
     int ret = 0, keep_pix_fmt = 0;
+    AVRational enc_tb = { 0, 0 };
     const char *bsfs = NULL, *time_base = NULL;
     char *filters = NULL, *next, *codec_tag = NULL;
     double qscale = -1;
 #endif
             }
-            ost->enc_timebase = q;
+            enc_tb = q;
         }
     } else {
         ret = filter_codec_opts(o->g->codec_opts, AV_CODEC_ID_NONE, oc, st,
         (type == AVMEDIA_TYPE_VIDEO || type == AVMEDIA_TYPE_AUDIO)) {
         OutputFilterOptions opts = {
             .enc = enc,
+            .output_tb = enc_tb,
             .ts_offset = mux->of.start_time == AV_NOPTS_VALUE ?
                          0 : mux->of.start_time,
             .flags = OFILTER_FLAG_DISABLE_CONVERT * !!keep_pix_fmt,

Keyboard shortcuts