iff: replace av_abort by av_assert0

[ffmpeg] / libavfilter / vf_setfield.c

diff --git a/libavfilter/vf_setfield.c b/libavfilter/vf_setfield.c
index bfb8006acff7224674b0bbf0903a3b82eb13f1a4..93d30c7b0b2f407cae47fe2ff39801876b5a19d6 100644 (file)
--- a/libavfilter/vf_setfield.c
+++ b/libavfilter/vf_setfield.c
@@ -24,50 +24,63 @@
  */
 
 #include "avfilter.h"
+#include "video.h"
+
+enum SetFieldMode {
+    MODE_AUTO = -1,
+    MODE_BFF,
+    MODE_TFF,
+    MODE_PROG,
+};
 
 typedef struct {
-    int top_field_first;
+    enum SetFieldMode mode;
 } SetFieldContext;
 
-static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init(AVFilterContext *ctx, const char *args)
 {
     SetFieldContext *setfield = ctx->priv;
 
-    setfield->top_field_first = -1;
+    setfield->mode = MODE_AUTO;
 
     if (args) {
         char c;
-        if (sscanf(args, "%d%c", &setfield->top_field_first, &c) != 1) {
-            if      (!strcmp("tff",  args)) setfield->top_field_first = 1;
-            else if (!strcmp("bff",  args)) setfield->top_field_first = 0;
-            else if (!strcmp("auto", args)) setfield->top_field_first = -1;
+        if (sscanf(args, "%d%c", &setfield->mode, &c) != 1) {
+            if      (!strcmp("tff",  args)) setfield->mode = MODE_TFF;
+            else if (!strcmp("bff",  args)) setfield->mode = MODE_BFF;
+            else if (!strcmp("prog", args)) setfield->mode = MODE_PROG;
+            else if (!strcmp("auto", args)) setfield->mode = MODE_AUTO;
             else {
                 av_log(ctx, AV_LOG_ERROR, "Invalid argument '%s'\n", args);
                 return AVERROR(EINVAL);
             }
+        } else {
+            if (setfield->mode < -1 || setfield->mode > 1) {
+                av_log(ctx, AV_LOG_ERROR,
+                       "Provided integer value %d must be included between -1 and +1\n",
+                       setfield->mode);
+                return AVERROR(EINVAL);
+            }
+            av_log(ctx, AV_LOG_WARNING,
+                   "Using -1/0/1 is deprecated, use auto/tff/bff/prog\n");
         }
     }
 
-    if (setfield->top_field_first < -1 || setfield->top_field_first > 1) {
-        av_log(ctx, AV_LOG_ERROR,
-               "Provided integer value %d must be included between -1 and +1\n",
-               setfield->top_field_first);
-        return AVERROR(EINVAL);
-    }
-
     return 0;
 }
 
-static void start_frame(AVFilterLink *inlink, AVFilterBufferRef *inpicref)
+static int start_frame(AVFilterLink *inlink, AVFilterBufferRef *inpicref)
 {
     SetFieldContext *setfield = inlink->dst->priv;
     AVFilterBufferRef *outpicref = avfilter_ref_buffer(inpicref, ~0);
 
-    if (setfield->top_field_first != -1) {
+    if (setfield->mode == MODE_PROG) {
+        outpicref->video->interlaced = 0;
+    } else if (setfield->mode != MODE_AUTO) {
         outpicref->video->interlaced = 1;
-        outpicref->video->top_field_first = setfield->top_field_first;
+        outpicref->video->top_field_first = setfield->mode;
     }
-    avfilter_start_frame(inlink->dst->outputs[0], outpicref);
+    return ff_start_frame(inlink->dst->outputs[0], outpicref);
 }
 
 AVFilter avfilter_vf_setfield = {
@@ -80,7 +93,7 @@ AVFilter avfilter_vf_setfield = {
     .inputs = (const AVFilterPad[]) {
         { .name             = "default",
           .type             = AVMEDIA_TYPE_VIDEO,
-          .get_video_buffer = avfilter_null_get_video_buffer,
+          .get_video_buffer = ff_null_get_video_buffer,
           .start_frame      = start_frame, },
         { .name = NULL }
     },