avfilter/setparams : merge setfield and setrange filter to setparams filter

[ffmpeg] / libavfilter / vf_setparams.c

diff --git a/libavfilter/vf_setparams.c b/libavfilter/vf_setparams.c
index 8427f98ba824a71264016b4c9e80c35fa69365ec..5426d887777b64dff9b3d392d019eaf1ab4d4034 100644 (file)
--- a/libavfilter/vf_setparams.c
+++ b/libavfilter/vf_setparams.c
@@ -1,4 +1,6 @@
 /*
+ * Copyright (c) 2012 Stefano Sabatini
+ *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
@@ -22,15 +24,29 @@
 #include "internal.h"
 #include "video.h"
 
+enum SetFieldMode {
+    MODE_AUTO = -1,
+    MODE_BFF,
+    MODE_TFF,
+    MODE_PROG,
+};
+
 typedef struct SetParamsContext {
     const AVClass *class;
+    int field_mode;
     int color_range;
 } SetParamsContext;
 
 #define OFFSET(x) offsetof(SetParamsContext, x)
 #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
 
-static const AVOption setrange_options[] = {
+static const AVOption setparams_options[] = {
+    {"field_mode", "select interlace mode", OFFSET(field_mode), AV_OPT_TYPE_INT, {.i64=MODE_AUTO}, -1, MODE_PROG, FLAGS, "mode"},
+    {"auto", "keep the same input field",  0, AV_OPT_TYPE_CONST, {.i64=MODE_AUTO}, INT_MIN, INT_MAX, FLAGS, "mode"},
+    {"bff",  "mark as bottom-field-first", 0, AV_OPT_TYPE_CONST, {.i64=MODE_BFF},  INT_MIN, INT_MAX, FLAGS, "mode"},
+    {"tff",  "mark as top-field-first",    0, AV_OPT_TYPE_CONST, {.i64=MODE_TFF},  INT_MIN, INT_MAX, FLAGS, "mode"},
+    {"prog", "mark as progressive",        0, AV_OPT_TYPE_CONST, {.i64=MODE_PROG}, INT_MIN, INT_MAX, FLAGS, "mode"},
+
     {"range", "select color range", OFFSET(color_range), AV_OPT_TYPE_INT, {.i64=-1},-1, AVCOL_RANGE_NB-1, FLAGS, "range"},
     {"auto",  "keep the same color range",   0, AV_OPT_TYPE_CONST, {.i64=-1},                       0, 0, FLAGS, "range"},
     {"unspecified",                  NULL,   0, AV_OPT_TYPE_CONST, {.i64=AVCOL_RANGE_UNSPECIFIED},  0, 0, FLAGS, "range"},
@@ -44,13 +60,22 @@ static const AVOption setrange_options[] = {
     {NULL}
 };
 
-AVFILTER_DEFINE_CLASS(setrange);
+AVFILTER_DEFINE_CLASS(setparams);
 
 static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
 {
     AVFilterContext *ctx = inlink->dst;
     SetParamsContext *s = ctx->priv;
 
+    /* set field */
+    if (s->field_mode == MODE_PROG) {
+        frame->interlaced_frame = 0;
+    } else if (s->field_mode != MODE_AUTO) {
+        frame->interlaced_frame = 1;
+        frame->top_field_first = s->field_mode;
+    }
+
+    /* set range */
     if (s->color_range >= 0)
         frame->color_range = s->color_range;
     return ff_filter_frame(ctx->outputs[0], frame);
@@ -73,11 +98,79 @@ static const AVFilterPad outputs[] = {
     { NULL }
 };
 
+AVFilter ff_vf_setparams = {
+    .name        = "setparams",
+    .description = NULL_IF_CONFIG_SMALL("Force field, or color range for the output video frame."),
+    .priv_size   = sizeof(SetParamsContext),
+    .priv_class  = &setparams_class,
+    .inputs      = inputs,
+    .outputs     = outputs,
+};
+
+#if CONFIG_SETRANGE_FILTER
+
+static const AVOption setrange_options[] = {
+    {"range", "select color range", OFFSET(color_range), AV_OPT_TYPE_INT, {.i64=-1},-1, AVCOL_RANGE_NB-1, FLAGS, "range"},
+    {"auto",  "keep the same color range",   0, AV_OPT_TYPE_CONST, {.i64=-1},                       0, 0, FLAGS, "range"},
+    {"unspecified",                  NULL,   0, AV_OPT_TYPE_CONST, {.i64=AVCOL_RANGE_UNSPECIFIED},  0, 0, FLAGS, "range"},
+    {"unknown",                      NULL,   0, AV_OPT_TYPE_CONST, {.i64=AVCOL_RANGE_UNSPECIFIED},  0, 0, FLAGS, "range"},
+    {"limited",                      NULL,   0, AV_OPT_TYPE_CONST, {.i64=AVCOL_RANGE_MPEG},         0, 0, FLAGS, "range"},
+    {"tv",                           NULL,   0, AV_OPT_TYPE_CONST, {.i64=AVCOL_RANGE_MPEG},         0, 0, FLAGS, "range"},
+    {"mpeg",                         NULL,   0, AV_OPT_TYPE_CONST, {.i64=AVCOL_RANGE_MPEG},         0, 0, FLAGS, "range"},
+    {"full",                         NULL,   0, AV_OPT_TYPE_CONST, {.i64=AVCOL_RANGE_JPEG},         0, 0, FLAGS, "range"},
+    {"pc",                           NULL,   0, AV_OPT_TYPE_CONST, {.i64=AVCOL_RANGE_JPEG},         0, 0, FLAGS, "range"},
+    {"jpeg",                         NULL,   0, AV_OPT_TYPE_CONST, {.i64=AVCOL_RANGE_JPEG},         0, 0, FLAGS, "range"},
+    {NULL}
+};
+
+AVFILTER_DEFINE_CLASS(setrange);
+
+static av_cold int init_setrange(AVFilterContext *ctx)
+{
+    SetParamsContext *s = ctx->priv;
+
+    s->field_mode = MODE_AUTO;/* set field mode to auto */
+    return 0;
+}
+
 AVFilter ff_vf_setrange = {
     .name        = "setrange",
     .description = NULL_IF_CONFIG_SMALL("Force color range for the output video frame."),
     .priv_size   = sizeof(SetParamsContext),
+    .init        = init_setrange,
     .priv_class  = &setrange_class,
     .inputs      = inputs,
     .outputs     = outputs,
 };
+#endif /* CONFIG_SETRANGE_FILTER */
+
+#if CONFIG_SETFIELD_FILTER
+static const AVOption setfield_options[] = {
+    {"mode", "select interlace mode", OFFSET(field_mode), AV_OPT_TYPE_INT, {.i64=MODE_AUTO}, -1, MODE_PROG, FLAGS, "mode"},
+    {"auto", "keep the same input field",  0, AV_OPT_TYPE_CONST, {.i64=MODE_AUTO}, INT_MIN, INT_MAX, FLAGS, "mode"},
+    {"bff",  "mark as bottom-field-first", 0, AV_OPT_TYPE_CONST, {.i64=MODE_BFF},  INT_MIN, INT_MAX, FLAGS, "mode"},
+    {"tff",  "mark as top-field-first",    0, AV_OPT_TYPE_CONST, {.i64=MODE_TFF},  INT_MIN, INT_MAX, FLAGS, "mode"},
+    {"prog", "mark as progressive",        0, AV_OPT_TYPE_CONST, {.i64=MODE_PROG}, INT_MIN, INT_MAX, FLAGS, "mode"},
+    {NULL}
+};
+
+AVFILTER_DEFINE_CLASS(setfield);
+
+static av_cold int init_setfield(AVFilterContext *ctx)
+{
+    SetParamsContext *s = ctx->priv;
+
+    s->color_range = -1;/* set range mode to auto */
+    return 0;
+}
+
+AVFilter ff_vf_setfield = {
+    .name        = "setfield",
+    .description = NULL_IF_CONFIG_SMALL("Force field for the output video frame."),
+    .priv_size   = sizeof(SetParamsContext),
+    .init        = init_setfield,
+    .priv_class  = &setfield_class,
+    .inputs      = inputs,
+    .outputs     = outputs,
+};
+#endif /* CONFIG_SETFIELD_FILTER */