ekiga r5894 - in trunk: . lib/engine/protocol/skel src/devices src/endpoints src/gui

[mschneid svn gnome org]

Author: mschneid
Date: Wed Jan  9 06:59:40 2008
New Revision: 5894
URL: http://svn.gnome.org/viewvc/ekiga?rev=5894&view=rev

Log:
Removed depreciated FPS display.


Modified:
   trunk/ChangeLog
   trunk/lib/engine/protocol/skel/call.h
   trunk/src/devices/videooutput.cpp
   trunk/src/endpoints/opal-call.cpp
   trunk/src/endpoints/opal-call.h
   trunk/src/gui/main.cpp

Modified: trunk/lib/engine/protocol/skel/call.h
==============================================================================
--- trunk/lib/engine/protocol/skel/call.h	(original)
+++ trunk/lib/engine/protocol/skel/call.h	Wed Jan  9 06:59:40 2008
@@ -149,28 +149,6 @@
        */
       double get_transmitted_video_bandwidth () { return tr_v_bw; }
 
-      /** Return the transmitted video framerate
-       * @return the transmitted video framerate  in frames/s
-       */
-      unsigned get_transmitted_video_framerate () { return tr_v_fps; }
-
-      /** Return the received video framerate
-       * @return the received video framerate in frames/s
-       */
-      unsigned get_received_video_framerate () { return re_v_fps; }
-
-      /** Return the transmitted video resolution
-       * @param width contains the width in pixels
-       * @param height contains the height in pixels
-       */
-      void get_transmitted_video_resolution (unsigned & width, unsigned & height) { width = tr_width; height = tr_height; }
-
-      /** Return the received video resolution
-       * @param width contains the width in pixels
-       * @param height contains the height in pixels
-       */
-      void get_received_video_resolution (unsigned & width, unsigned & height) { width = re_width; height = re_height; }
-
       /** Return the jitter size
        * @return the jitter size in ms
        */

Modified: trunk/src/devices/videooutput.cpp
==============================================================================
--- trunk/src/devices/videooutput.cpp	(original)
+++ trunk/src/devices/videooutput.cpp	Wed Jan  9 06:59:40 2008
@@ -88,9 +88,6 @@
   /* Used to distinguish between input and output device. */
   device_id = 0; 
 
-  /* Internal stuff */
-  numberOfFrames = 0;
-
   if (!videoDisplay) 
 #ifdef WIN32
      videoDisplay = new GMVideoDisplay_DX(core);
@@ -149,8 +146,6 @@
 {
  PWaitAndSignal m(videoDisplay_mutex);
 
-  numberOfFrames++;
-
   if (x > 0 || y > 0)
     return FALSE;
 

Modified: trunk/src/endpoints/opal-call.cpp
==============================================================================
--- trunk/src/endpoints/opal-call.cpp	(original)
+++ trunk/src/endpoints/opal-call.cpp	Wed Jan  9 06:59:40 2008
@@ -67,10 +67,6 @@
     lost_v =
     too_late_v =
     out_of_order_v = 0;
-  re_v_frames = tr_v_frames = 0;
-  re_v_fps = tr_v_fps = 0;
-  tr_width = tr_height = 0;
-  re_width = re_height = 0;
 }
 
 
@@ -432,7 +428,7 @@
 }
 
 
-void Call::OnRTPStatistics (const OpalConnection & connection, 
+void Call::OnRTPStatistics (const OpalConnection & /* connection */, 
                             const RTP_Session & session)
 {
   PWaitAndSignal m(stats_mutex); // The stats are computed from two different threads
@@ -466,9 +462,6 @@
     if (t.GetMilliSeconds () < 500)
       return;
 
-    PVideoOutputDevice* device = NULL;
-    OpalMediaStreamPtr stream = NULL;
-
     unsigned elapsed_seconds = max ((unsigned long) t.GetMilliSeconds (), (unsigned long) 1);
     double octets_received = session.GetOctetsReceived ();
     double octets_sent = session.GetOctetsSent ();
@@ -485,41 +478,6 @@
     too_late_v = session.GetPacketsTooLate ();
     out_of_order_v = session.GetPacketsOutOfOrder ();
 
-    stream = connection.GetMediaStream (OpalMediaFormat::DefaultVideoSessionID, FALSE);
-    if (stream != NULL) {
-
-      // Get and calculate statistics for the Output Device
-      device = ((const OpalVideoMediaStream &) *stream).GetVideoOutputDevice ();
-      if (device) {
-
-        re_v_fps = (int)((device->GetNumberOfFrames() - re_v_frames) / elapsed_seconds);
-        re_v_frames = device->GetNumberOfFrames();
-        if (re_v_frames == 0) {
-
-          re_width = 0; 
-          re_height = 0;
-        }
-        else
-          device->GetFrameSize(re_width, re_height);
-      } 
-    }
-
-    stream = connection.GetMediaStream (OpalMediaFormat::DefaultVideoSessionID, TRUE);
-    if (stream != NULL) {
-
-      // Get and calculate statistics for the Preview Device
-      device = ((const OpalVideoMediaStream &) *stream).GetVideoOutputDevice ();
-      if (device) {
-        tr_v_fps = (int)((device->GetNumberOfFrames() - tr_v_frames) / elapsed_seconds);
-        tr_v_frames = device->GetNumberOfFrames();
-        if (tr_v_frames == 0) {
-          tr_width = 0; 
-          tr_height = 0;
-        }
-        else
-          device->GetFrameSize(tr_width, tr_height);
-      }
-    }
   }
 
   lost_packets = (lost_a + lost_v) / max (total_a + total_v, (DWORD) 1);

Modified: trunk/src/endpoints/opal-call.h
==============================================================================
--- trunk/src/endpoints/opal-call.h	(original)
+++ trunk/src/endpoints/opal-call.h	Wed Jan  9 06:59:40 2008
@@ -182,9 +182,6 @@
       unsigned too_late_v;
       unsigned out_of_order_v;
       unsigned total_v;
-
-      unsigned re_v_frames;
-      unsigned tr_v_frames;
    };
 };
 

Modified: trunk/src/gui/main.cpp
==============================================================================
--- trunk/src/gui/main.cpp	(original)
+++ trunk/src/gui/main.cpp	Wed Jan  9 06:59:40 2008
@@ -585,8 +585,8 @@
                            mw->current_call->get_received_audio_bandwidth (),
                            mw->current_call->get_transmitted_video_bandwidth (),
                            mw->current_call->get_received_video_bandwidth (),
-                           mw->current_call->get_transmitted_video_framerate (),
-                           mw->current_call->get_received_video_framerate ());
+                           0,
+                           0);
     gdk_threads_enter ();
     gm_main_window_push_info_message (GTK_WIDGET (self), msg);
     if (mw->current_call)