v4l2: Make use of gst_video_interlace_mode_to_string()

Instead of a custom map to translate the interlace modes to strings, let's
make use of the base API provided.

diff --git a/sys/v4l2/gstv4l2object.c b/sys/v4l2/gstv4l2object.c
index 81e0ad2f1010769648c4e1efa056b674bfcb3e76..061eefd5ee8cfdb9d172ab324e072ea6495488c8 100644 (file)
--- a/sys/v4l2/gstv4l2object.c
+++ b/sys/v4l2/gstv4l2object.c
@@ -1923,8 +1923,6 @@ static gboolean
 gst_v4l2_object_get_interlace_mode (enum v4l2_field field,
     GstVideoInterlaceMode * interlace_mode)
 {
-  /* NB: If you add new return values, please fix mode_strings in
-   * gst_v4l2_object_add_interlace_mode */
   switch (field) {
     case V4L2_FIELD_ANY:
       GST_ERROR
@@ -2170,11 +2168,6 @@ gst_v4l2_object_add_interlace_mode (GstV4l2Object * v4l2object,
   GValue interlace_formats = { 0, };
   GstVideoInterlaceMode interlace_mode, prev = -1;
 
-  const gchar *mode_strings[] = { "progressive",
-    "interleaved",
-    "mixed"
-  };
-
   if (!g_str_equal (gst_structure_get_name (s), "video/x-raw"))
     return;
 
@@ -2196,8 +2189,10 @@ gst_v4l2_object_add_interlace_mode (GstV4l2Object * v4l2object,
   if (gst_v4l2_object_try_fmt (v4l2object, &fmt) == 0 &&
       gst_v4l2_object_get_interlace_mode (fmt.fmt.pix.field, &interlace_mode)) {
     GValue interlace_enum = { 0, };
+    const gchar *mode_string;
     g_value_init (&interlace_enum, G_TYPE_STRING);
-    g_value_set_string (&interlace_enum, mode_strings[interlace_mode]);
+    mode_string = gst_video_interlace_mode_to_string (interlace_mode);
+    g_value_set_string (&interlace_enum, mode_string);
     gst_value_list_append_and_take_value (&interlace_formats, &interlace_enum);
     prev = interlace_mode;
   }
@@ -2213,8 +2208,10 @@ gst_v4l2_object_add_interlace_mode (GstV4l2Object * v4l2object,
       gst_v4l2_object_get_interlace_mode (fmt.fmt.pix.field, &interlace_mode) &&
       prev != interlace_mode) {
     GValue interlace_enum = { 0, };
+    const gchar *mode_string;
     g_value_init (&interlace_enum, G_TYPE_STRING);
-    g_value_set_string (&interlace_enum, mode_strings[interlace_mode]);
+    mode_string = gst_video_interlace_mode_to_string (interlace_mode);
+    g_value_set_string (&interlace_enum, mode_string);
     gst_value_list_append_and_take_value (&interlace_formats, &interlace_enum);
   }