commit 60f0e44bf6b717047b9d38523a07148f2966123c
author Wim Taymans <wim.taymans@collabora.co.uk> Tue Aug 23 19:09:31 2011 +0200
committer Wim Taymans <wim.taymans@collabora.co.uk> Tue Aug 23 19:09:31 2011 +0200
tree 082cbfdd4b65b106b3f62dafdd9f5b9e97a3b71b
parent d6908f1a2daae4c6c1980a6fa74892deb8c24cb9

video: port to new colorimetry info

gst/alpha/gstalpha.c

diff --git a/gst/alpha/gstalpha.c b/gst/alpha/gstalpha.c
index 01af283..4ef2754 100644
--- a/gst/alpha/gstalpha.c
+++ b/gst/alpha/gstalpha.c
@@ -377,7 +377,7 @@
     case PROP_PREFER_PASSTHROUGH:{
       gboolean prefer_passthrough = g_value_get_boolean (value);
 
-      reconfigure = ((!!prefer_passthrough) != (!!alpha->prefer_passthrough))
+      reconfigure = ((! !prefer_passthrough) != (! !alpha->prefer_passthrough))
           && (alpha->method == ALPHA_METHOD_SET) && (alpha->alpha == 1.0);
       alpha->prefer_passthrough = prefer_passthrough;
       break;
@@ -532,11 +532,8 @@
 
   GST_ALPHA_LOCK (alpha);
 
-  alpha->in_sdtv =
-      in_info.color_matrix ? g_str_equal (in_info.color_matrix, "sdtv") : TRUE;
-  alpha->out_sdtv =
-      out_info.color_matrix ? g_str_equal (out_info.color_matrix,
-      "sdtv") : TRUE;
+  alpha->in_sdtv = in_info.colorimetry.matrix = GST_VIDEO_COLOR_MATRIX_BT601;
+  alpha->out_sdtv = out_info.colorimetry.matrix = GST_VIDEO_COLOR_MATRIX_BT601;
 
   passthrough = alpha->prefer_passthrough &&
       GST_VIDEO_INFO_FORMAT (&in_info) == GST_VIDEO_INFO_FORMAT (&out_info)