alpha, smpte: adjust to removed color-matrix caps field

This commit is contained in:
Mark Nauwelaerts 2012-04-13 16:54:31 +02:00
parent 8c5d8b52ea
commit 8bf26fa7dc
3 changed files with 8 additions and 7 deletions

View file

@ -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)

View file

@ -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:

View file

@ -571,7 +571,7 @@ gst_smpte_alpha_transform_caps (GstBaseTransform * trans,
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_caps, structure);