x264enc: add 'insert-vui' property for users to choose

VUI(Video Usability Information) parameters should be set
according to the specification. However, some of the existing
hardware decoders refuse to decode in certain combinations of
the resolution and VUI parameters. To support the legacy
decoders, this patch provides 'insert-vui' to skip the settings.

https://bugzilla.gnome.org/show_bug.cgi?id=791331

2 files changed, 19 insertions, 0 deletions

diff --git a/ext/x264/gstx264enc.c b/ext/x264/gstx264enc.c
index b836dfacff..3d3e0be834 100644
--- a/ext/x264/gstx264enc.c
+++ b/ext/x264/gstx264enc.c
@@ -367,6 +367,7 @@ enum
   ARG_PSY_TUNE,
   ARG_TUNE,
   ARG_FRAME_PACKING,
+  ARG_INSERT_VUI,
 };
 
 #define ARG_THREADS_DEFAULT            0        /* 0 means 'auto' which is 1.5x number of CPU cores */
@@ -408,6 +409,7 @@ static GString *x264enc_defaults;
 #define ARG_PSY_TUNE_DEFAULT           0        /* no psy tuning */
 #define ARG_TUNE_DEFAULT               0        /* no tuning */
 #define ARG_FRAME_PACKING_DEFAULT      -1       /* automatic (none, or from input caps) */
+#define ARG_INSERT_VUI_DEFAULT         TRUE
 
 enum
 {
@@ -938,6 +940,11 @@ gst_x264_enc_class_init (GstX264EncClass * klass)
           GST_X264_ENC_FRAME_PACKING_TYPE, ARG_FRAME_PACKING_DEFAULT,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
+  g_object_class_install_property (gobject_class, ARG_INSERT_VUI,
+      g_param_spec_boolean ("insert-vui", "Insert VUI",
+          "Insert VUI NAL in stream",
+          ARG_INSERT_VUI_DEFAULT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
   /* options for which we _do_ use string equivalents */
   g_object_class_install_property (gobject_class, ARG_THREADS,
       g_param_spec_uint ("threads", "Threads",
@@ -1223,6 +1230,7 @@ gst_x264_enc_init (GstX264Enc * encoder)
   encoder->psy_tune = ARG_PSY_TUNE_DEFAULT;
   encoder->tune = ARG_TUNE_DEFAULT;
   encoder->frame_packing = ARG_FRAME_PACKING_DEFAULT;
+  encoder->insert_vui = ARG_INSERT_VUI_DEFAULT;
 }
 
 typedef struct
@@ -1586,6 +1594,9 @@ gst_x264_enc_init_encoder (GstX264Enc * encoder)
     encoder->x264param.vui.i_vidformat = 5;     /* unspecified */
   }
 
+  if (!encoder->insert_vui)
+    goto skip_vui_parameters;
+
   switch (info->colorimetry.primaries) {
     case GST_VIDEO_COLOR_PRIMARIES_BT709:
       encoder->x264param.vui.i_colorprim = 1;
@@ -1689,6 +1700,7 @@ gst_x264_enc_init_encoder (GstX264Enc * encoder)
       break;
   }
 
+skip_vui_parameters:
 
   encoder->x264param.analyse.b_psnr = 0;
 
@@ -2748,6 +2760,9 @@ gst_x264_enc_set_property (GObject * object, guint prop_id,
     case ARG_FRAME_PACKING:
       encoder->frame_packing = g_value_get_enum (value);
       break;
+    case ARG_INSERT_VUI:
+      encoder->insert_vui = g_value_get_boolean (value);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -2887,6 +2902,9 @@ gst_x264_enc_get_property (GObject * object, guint prop_id,
     case ARG_FRAME_PACKING:
       g_value_set_enum (value, encoder->frame_packing);
       break;
+    case ARG_INSERT_VUI:
+      g_value_set_boolean (value, encoder->insert_vui);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
diff --git a/ext/x264/gstx264enc.h b/ext/x264/gstx264enc.h
index 6f4ad4839e..e8291a31d8 100644
--- a/ext/x264/gstx264enc.h
+++ b/ext/x264/gstx264enc.h
@@ -111,6 +111,7 @@ struct _GstX264Enc
   GString *option_string_prop; /* option-string property */
   GString *option_string; /* used by set prop */
   gint frame_packing;
+  gboolean insert_vui;
 
   /* input description */
   GstVideoCodecState *input_state;