[ekiga/ds-fix-boost-leaks] Revert "VideOutput-Clutter: Display the logo a few microseconds on open."
- From: Damien Sandras <dsandras src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga/ds-fix-boost-leaks] Revert "VideOutput-Clutter: Display the logo a few microseconds on open."
- Date: Sun, 1 Nov 2015 14:50:01 +0000 (UTC)
commit d187f936538fb729629223978ba9944a2136f6d6
Author: Damien Sandras <dsandras seconix com>
Date: Sun Nov 1 15:12:04 2015 +0100
Revert "VideOutput-Clutter: Display the logo a few microseconds on open."
This reverts commit cc3d78be833c1a32956c10efbb67762be91e66ef.
.../videooutput-manager-clutter-gst.cpp | 7 -------
.../videooutput-manager-clutter-gst.h | 1 -
2 files changed, 0 insertions(+), 8 deletions(-)
---
diff --git a/lib/engine/components/clutter-gst-videooutput/videooutput-manager-clutter-gst.cpp
b/lib/engine/components/clutter-gst-videooutput/videooutput-manager-clutter-gst.cpp
index 96dc4ac..4ce527c 100644
--- a/lib/engine/components/clutter-gst-videooutput/videooutput-manager-clutter-gst.cpp
+++ b/lib/engine/components/clutter-gst-videooutput/videooutput-manager-clutter-gst.cpp
@@ -52,7 +52,6 @@
GMVideoOutputManager_clutter_gst::GMVideoOutputManager_clutter_gst (G_GNUC_UNUSED Ekiga::ServiceCore & _core)
{
devices_nbr = 0;
- frame = 0;
for (int i = 0 ; i < 3 ; i++) {
texture[i] = NULL;
@@ -150,7 +149,6 @@ GMVideoOutputManager_clutter_gst::close ()
current_width[i] = 0;
}
devices_nbr = 0;
- frame = 0;
Ekiga::Runtime::run_in_main (boost::bind (&GMVideoOutputManager_clutter_gst::device_closed_in_main,
this));
@@ -178,10 +176,6 @@ GMVideoOutputManager_clutter_gst::set_frame_data (const char *data,
PWaitAndSignal m(device_mutex);
- frame++;
- if (frame < 5)
- return;
-
if (!pipeline[i]) {
PTRACE (1, "GMVideoOutputManager_clutter_gst\tTrying to upload frame to closed pipeline " << i);
return;
@@ -225,7 +219,6 @@ GMVideoOutputManager_clutter_gst::set_frame_data (const char *data,
i,
width,
height));
- return;
}
buffer = gst_buffer_new_and_alloc (buffer_size);
diff --git a/lib/engine/components/clutter-gst-videooutput/videooutput-manager-clutter-gst.h
b/lib/engine/components/clutter-gst-videooutput/videooutput-manager-clutter-gst.h
index c89cbc3..def97e1 100644
--- a/lib/engine/components/clutter-gst-videooutput/videooutput-manager-clutter-gst.h
+++ b/lib/engine/components/clutter-gst-videooutput/videooutput-manager-clutter-gst.h
@@ -95,7 +95,6 @@ private:
GstElement *pipeline[3];
ClutterActor *texture[3];
- unsigned int frame;
int devices_nbr;
};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]