diff options
| author | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2012-04-13 16:54:31 +0200 |
|---|---|---|
| committer | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2012-04-13 17:24:38 +0200 |
| commit | 8bf26fa7dc056083607911665618cfc6a3dd90cb (patch) | |
| tree | 93ac51ae1bea1c5b0677886e3c6b6f27571ede3f /gst/alpha | |
| parent | 8c5d8b52eadff08845d92b45c3fb20d0a9fbf40d (diff) | |
| download | gstreamer-plugins-good-8bf26fa7dc056083607911665618cfc6a3dd90cb.tar.gz | |
alpha, smpte: adjust to removed color-matrix caps field
Diffstat (limited to 'gst/alpha')
| -rw-r--r-- | gst/alpha/gstalpha.c | 7 | ||||
| -rw-r--r-- | gst/alpha/gstalphacolor.c | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/gst/alpha/gstalpha.c b/gst/alpha/gstalpha.c index cb934e565..1aa62ac40 100644 --- a/gst/alpha/gstalpha.c +++ b/gst/alpha/gstalpha.c @@ -457,7 +457,7 @@ gst_alpha_transform_caps (GstBaseTransform * btrans, structure = gst_structure_copy (gst_caps_get_structure (caps, i)); gst_structure_remove_field (structure, "format"); - gst_structure_remove_field (structure, "color-matrix"); + gst_structure_remove_field (structure, "colorimetry"); gst_structure_remove_field (structure, "chroma-site"); gst_caps_append_structure (tmp, structure); @@ -515,8 +515,9 @@ gst_alpha_set_info (GstVideoFilter * filter, GST_ALPHA_LOCK (alpha); - alpha->in_sdtv = in_info->colorimetry.matrix = GST_VIDEO_COLOR_MATRIX_BT601; - alpha->out_sdtv = out_info->colorimetry.matrix = GST_VIDEO_COLOR_MATRIX_BT601; + 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) diff --git a/gst/alpha/gstalphacolor.c b/gst/alpha/gstalphacolor.c index 84494339f..3cf63408e 100644 --- a/gst/alpha/gstalphacolor.c +++ b/gst/alpha/gstalphacolor.c @@ -123,7 +123,7 @@ gst_alpha_color_transform_caps (GstBaseTransform * btrans, /* Remove any specific parameter from the structure */ gst_structure_remove_field (structure, "format"); - gst_structure_remove_field (structure, "color-matrix"); + gst_structure_remove_field (structure, "colorimetry"); gst_structure_remove_field (structure, "chroma-site"); gst_structure_set_name (structure, "video/x-raw"); @@ -479,8 +479,8 @@ gst_alpha_color_set_info (GstVideoFilter * filter, GstCaps * incaps, GST_VIDEO_INFO_HEIGHT (in_info) != GST_VIDEO_INFO_HEIGHT (out_info)) goto invalid_caps; - in_sdtv = in_info->colorimetry.matrix = GST_VIDEO_COLOR_MATRIX_BT601; - out_sdtv = out_info->colorimetry.matrix = GST_VIDEO_COLOR_MATRIX_BT601; + in_sdtv = in_info->colorimetry.matrix == GST_VIDEO_COLOR_MATRIX_BT601; + out_sdtv = out_info->colorimetry.matrix == GST_VIDEO_COLOR_MATRIX_BT601; switch (GST_VIDEO_INFO_FORMAT (in_info)) { case GST_VIDEO_FORMAT_ARGB: |