|
 |
ecdf9b |
From 4740659c6092018a35bb820dfefac545b23c5dc2 Mon Sep 17 00:00:00 2001
|
|
|
ecdf9b |
From: Hans de Goede <hdegoede@redhat.com>
|
|
|
ecdf9b |
Date: Sun, 9 Jun 2013 17:14:00 +0200
|
|
|
ecdf9b |
Subject: [PATCH 02/35] cheese-camera: remove extranous csp_post_balance
|
|
|
ecdf9b |
videoconvert element
|
|
|
ecdf9b |
|
|
|
ecdf9b |
camerabin2 already has a videoconvert element both before and after its
|
|
|
ecdf9b |
video-source-filter element, so ending our own video-source-filter bin with
|
|
|
ecdf9b |
a videoconvert element puts 2 videoconvert elements behind each other, which
|
|
|
ecdf9b |
is not really useful.
|
|
|
ecdf9b |
|
|
|
ecdf9b |
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
|
ecdf9b |
---
|
|
|
ecdf9b |
libcheese/cheese-camera.c | 15 ++++-----------
|
|
|
ecdf9b |
1 file changed, 4 insertions(+), 11 deletions(-)
|
|
|
ecdf9b |
|
|
|
ecdf9b |
diff --git a/libcheese/cheese-camera.c b/libcheese/cheese-camera.c
|
|
|
ecdf9b |
index c42d896..7737209 100644
|
|
|
ecdf9b |
--- a/libcheese/cheese-camera.c
|
|
|
ecdf9b |
+++ b/libcheese/cheese-camera.c
|
|
|
ecdf9b |
@@ -89,7 +89,7 @@ struct _CheeseCameraPrivate
|
|
|
ecdf9b |
ClutterTexture *video_texture;
|
|
|
ecdf9b |
|
|
|
ecdf9b |
GstElement *effect_filter;
|
|
|
ecdf9b |
- GstElement *video_balance, *csp_post_balance;
|
|
|
ecdf9b |
+ GstElement *video_balance;
|
|
|
ecdf9b |
GstElement *camera_tee, *effects_tee;
|
|
|
ecdf9b |
GstElement *main_valve, *effects_valve;
|
|
|
ecdf9b |
|
|
|
ecdf9b |
@@ -608,29 +608,22 @@ cheese_camera_create_video_filter_bin (CheeseCamera *camera, GError **error)
|
|
|
ecdf9b |
cheese_camera_set_error_element_not_found (error, "videobalance");
|
|
|
ecdf9b |
return FALSE;
|
|
|
ecdf9b |
}
|
|
|
ecdf9b |
- if ((priv->csp_post_balance = gst_element_factory_make ("videoconvert", "csp_post_balance")) == NULL)
|
|
|
ecdf9b |
- {
|
|
|
ecdf9b |
- cheese_camera_set_error_element_not_found (error, "videoconvert");
|
|
|
ecdf9b |
- return FALSE;
|
|
|
ecdf9b |
- }
|
|
|
ecdf9b |
|
|
|
ecdf9b |
if (error != NULL && *error != NULL)
|
|
|
ecdf9b |
return FALSE;
|
|
|
ecdf9b |
|
|
|
ecdf9b |
gst_bin_add_many (GST_BIN (priv->video_filter_bin), priv->camera_tee,
|
|
|
ecdf9b |
priv->main_valve, priv->effect_filter,
|
|
|
ecdf9b |
- priv->video_balance, priv->csp_post_balance,
|
|
|
ecdf9b |
- priv->effects_preview_bin, NULL);
|
|
|
ecdf9b |
+ priv->video_balance, priv->effects_preview_bin, NULL);
|
|
|
ecdf9b |
|
|
|
ecdf9b |
ok &= gst_element_link_many (priv->camera_tee, priv->main_valve,
|
|
|
ecdf9b |
- priv->effect_filter, priv->video_balance,
|
|
|
ecdf9b |
- priv->csp_post_balance, NULL);
|
|
|
ecdf9b |
+ priv->effect_filter, priv->video_balance, NULL);
|
|
|
ecdf9b |
gst_pad_link (gst_element_get_request_pad (priv->camera_tee, "src_%u"),
|
|
|
ecdf9b |
gst_element_get_static_pad (priv->effects_preview_bin, "sink"));
|
|
|
ecdf9b |
|
|
|
ecdf9b |
/* add ghostpads */
|
|
|
ecdf9b |
|
|
|
ecdf9b |
- pad = gst_element_get_static_pad (priv->csp_post_balance, "src");
|
|
|
ecdf9b |
+ pad = gst_element_get_static_pad (priv->video_balance, "src");
|
|
|
ecdf9b |
gst_element_add_pad (priv->video_filter_bin, gst_ghost_pad_new ("src", pad));
|
|
|
ecdf9b |
gst_object_unref (GST_OBJECT (pad));
|
|
|
ecdf9b |
|
|
|
ecdf9b |
--
|
|
|
ecdf9b |
1.8.2.1
|
|
|
ecdf9b |
|