avfilter/vf_waveform: add option to control strechness of waveform

Paul B Mahol committed 5 years ago

Commit ca788d11 parent e0de0aa2 files · +39 −1Browse files

Unified · Split

2 files

doc/filters.texi +13 −0
libavfilter/vf_waveform.c +26 −1

@@ -22115,6 +22115,19 @@ Set background opacity. · 22114 unmodified lines
22115	Set tint for output.	22115	Set tint for output.
22116	Only used with lowpass filter and when display is not overlay and input	22116	Only used with lowpass filter and when display is not overlay and input
22117	pixel formats are not RGB.	22117	pixel formats are not RGB.
		22118
		22119	@item fitmode, fm
		22120	Set sample aspect ratio of video output frames.
		22121	Can be used to configure waveform so it is not
		22122	streched too much in one of directions.
		22123
		22124	@table @samp
		22125	@item none
		22126	Set sample aspect ration to 1/1.
		22127	@item size
		22128	Set sample aspect ratio to match input size of video
		22129	@end table
		22130	Default is @samp{none}.
22118	@end table	22131	@end table
22119		22132
22120	@section weave, doubleweave	22133	@section weave, doubleweave

libavfilter/vf_waveform.c+26−1

     int offset_x;
 } ThreadData;
+enum FitMode {
+    FM_NONE,
+    FM_SIZE,
+    NB_FITMODES
+};
 enum FilterType {
     LOWPASS,
     FLAT,
     int            rgb;
     float          ftint[2];
     int            tint[2];
+    int            fitmode;
     int (*waveform_slice)(AVFilterContext *ctx, void *arg,
                           int jobnr, int nb_jobs);
     { "t0",    "set 1st tint", OFFSET(ftint[0]), AV_OPT_TYPE_FLOAT, {.dbl=0}, -1, 1, FLAGS},
     { "tint1", "set 2nd tint", OFFSET(ftint[1]), AV_OPT_TYPE_FLOAT, {.dbl=0}, -1, 1, FLAGS},
     { "t1",    "set 2nd tint", OFFSET(ftint[1]), AV_OPT_TYPE_FLOAT, {.dbl=0}, -1, 1, FLAGS},
+    { "fitmode", "set fit mode", OFFSET(fitmode), AV_OPT_TYPE_INT, {.i64=0}, 0, NB_FITMODES-1, FLAGS, "fitmode" },
+    { "fm", "set fit mode", OFFSET(fitmode), AV_OPT_TYPE_INT, {.i64=0}, 0, NB_FITMODES-1, FLAGS, "fitmode" },
+        { "none", NULL, 0, AV_OPT_TYPE_CONST, {.i64=FM_NONE}, 0, 0, FLAGS, "fitmode" },
+        { "size", NULL, 0, AV_OPT_TYPE_CONST, {.i64=FM_SIZE}, 0, 0, FLAGS, "fitmode" },
     { NULL }
 };
         }
     }
-    outlink->sample_aspect_ratio = (AVRational){1,1};
+    switch (s->fitmode) {
+    case FM_NONE:
+        outlink->sample_aspect_ratio = (AVRational){ 1, 1 };
+        break;
+    case FM_SIZE:
+        if (s->mode)
+            outlink->sample_aspect_ratio = (AVRational){ s->size * comp, inlink->h };
+        else
+            outlink->sample_aspect_ratio = (AVRational){ inlink->w, s->size * comp };
+        break;
+    }
+    av_reduce(&outlink->sample_aspect_ratio.num, &outlink->sample_aspect_ratio.den,
+               outlink->sample_aspect_ratio.num,  outlink->sample_aspect_ratio.den, INT_MAX);
     return 0;
 }
     s->graticulef(s, out);
     av_frame_free(&in);
+    out->sample_aspect_ratio = outlink->sample_aspect_ratio;
     return ff_filter_frame(outlink, out);
 }

avfilter/vf_waveform: add option to control strechness of waveform

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code