Bug 951496 - Fix Stastistics typo in vie_codec. r=jesup
authorJan-Ivar Bruaroey <jib@mozilla.com>
Wed, 04 Jun 2014 23:57:02 -0400
changeset 206712 99dc3a6c843253ee0371704cbde4e04dfafc69a4
parent 206711 55f5561a23ec88ac035e25ef5a1e5a62dd64c13a
child 206713 6dd8777a4453b583b406b486e213aefc3da0967a
push id3741
push userasasaki@mozilla.com
push dateMon, 21 Jul 2014 20:25:18 +0000
treeherdermozilla-beta@4d6f46f5af68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup
bugs951496
milestone32.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 951496 - Fix Stastistics typo in vie_codec. r=jesup
media/webrtc/trunk/webrtc/video_engine/include/vie_codec.h
media/webrtc/trunk/webrtc/video_engine/test/auto_test/source/vie_autotest_custom_call.cc
media/webrtc/trunk/webrtc/video_engine/vie_codec_impl.cc
media/webrtc/trunk/webrtc/video_engine/vie_codec_impl.h
--- a/media/webrtc/trunk/webrtc/video_engine/include/vie_codec.h
+++ b/media/webrtc/trunk/webrtc/video_engine/include/vie_codec.h
@@ -125,22 +125,22 @@ class WEBRTC_DLLEXPORT ViECodec {
       unsigned char& config_parameters_size) const = 0;
 
   // Enables advanced scaling of the captured video stream if the stream
   // differs from the send codec settings.
   virtual int SetImageScaleStatus(const int video_channel,
                                   const bool enable) = 0;
 
   // Gets the number of sent key frames and number of sent delta frames.
-  virtual int GetSendCodecStastistics(const int video_channel,
+  virtual int GetSendCodecStatistics(const int video_channel,
                                       unsigned int& key_frames,
                                       unsigned int& delta_frames) const = 0;
 
   // Gets the number of decoded key frames and number of decoded delta frames.
-  virtual int GetReceiveCodecStastistics(const int video_channel,
+  virtual int GetReceiveCodecStatistics(const int video_channel,
                                          unsigned int& key_frames,
                                          unsigned int& delta_frames) const = 0;
 
   // Estimate of the min required buffer time from the expected arrival time
   // until rendering to get smooth playback.
   virtual int GetReceiveSideDelay(const int video_channel,
                                   int* delay_ms) const = 0;
 
--- a/media/webrtc/trunk/webrtc/video_engine/test/auto_test/source/vie_autotest_custom_call.cc
+++ b/media/webrtc/trunk/webrtc/video_engine/test/auto_test/source/vie_autotest_custom_call.cc
@@ -1620,28 +1620,28 @@ void PrintCodecStatistics(webrtc::ViECod
   int number_of_errors = 0;
   unsigned int key_frames = 0;
   unsigned int delta_frames = 0;
   switch (stat_type) {
     case kReceivedStatistic:
       std::cout << "Codec Receive statistics"
                 << std::endl;
       // Get and print the Receive Codec Statistics
-      error = vie_codec->GetReceiveCodecStastistics(video_channel, key_frames,
-                                                    delta_frames);
+      error = vie_codec->GetReceiveCodecStatistics(video_channel, key_frames,
+                                                   delta_frames);
       number_of_errors += ViETest::TestError(error == 0,
                                              "ERROR: %s at line %d",
                                              __FUNCTION__, __LINE__);
       break;
     case kSendStatistic:
       std::cout << "Codec Send statistics"
                 << std::endl;
       // Get and print the Send Codec Statistics
-      error = vie_codec->GetSendCodecStastistics(video_channel, key_frames,
-                                                 delta_frames);
+      error = vie_codec->GetSendCodecStatistics(video_channel, key_frames,
+                                                delta_frames);
       number_of_errors += ViETest::TestError(error == 0,
                                              "ERROR: %s at line %d",
                                              __FUNCTION__, __LINE__);
       break;
   }
   std::cout << "\tNumber of encoded key frames: "
             << key_frames << std::endl;
   std::cout << "\tNumber of encoded delta frames: "
--- a/media/webrtc/trunk/webrtc/video_engine/vie_codec_impl.cc
+++ b/media/webrtc/trunk/webrtc/video_engine/vie_codec_impl.cc
@@ -407,19 +407,19 @@ int ViECodecImpl::SetImageScaleStatus(co
 
   if (vie_encoder->ScaleInputImage(enable) != 0) {
     shared_data_->SetLastError(kViECodecUnknownError);
     return -1;
   }
   return 0;
 }
 
-int ViECodecImpl::GetSendCodecStastistics(const int video_channel,
-                                          unsigned int& key_frames,
-                                          unsigned int& delta_frames) const {
+int ViECodecImpl::GetSendCodecStatistics(const int video_channel,
+                                         unsigned int& key_frames,
+                                         unsigned int& delta_frames) const {
   WEBRTC_TRACE(kTraceApiCall, kTraceVideo,
                ViEId(shared_data_->instance_id(), video_channel),
                "%s(video_channel %d)", __FUNCTION__, video_channel);
 
   ViEChannelManagerScoped cs(*(shared_data_->channel_manager()));
   ViEEncoder* vie_encoder = cs.Encoder(video_channel);
   if (!vie_encoder) {
     WEBRTC_TRACE(kTraceError, kTraceVideo,
@@ -432,19 +432,19 @@ int ViECodecImpl::GetSendCodecStastistic
 
   if (vie_encoder->SendCodecStatistics(&key_frames, &delta_frames) != 0) {
     shared_data_->SetLastError(kViECodecUnknownError);
     return -1;
   }
   return 0;
 }
 
-int ViECodecImpl::GetReceiveCodecStastistics(const int video_channel,
-                                             unsigned int& key_frames,
-                                             unsigned int& delta_frames) const {
+int ViECodecImpl::GetReceiveCodecStatistics(const int video_channel,
+                                            unsigned int& key_frames,
+                                            unsigned int& delta_frames) const {
   WEBRTC_TRACE(kTraceApiCall, kTraceVideo,
                ViEId(shared_data_->instance_id(), video_channel),
                "%s(video_channel: %d)", __FUNCTION__,
                video_channel);
 
   ViEChannelManagerScoped cs(*(shared_data_->channel_manager()));
   ViEChannel* vie_channel = cs.Channel(video_channel);
   if (!vie_channel) {
--- a/media/webrtc/trunk/webrtc/video_engine/vie_codec_impl.h
+++ b/media/webrtc/trunk/webrtc/video_engine/vie_codec_impl.h
@@ -38,22 +38,22 @@ class ViECodecImpl
                               const VideoCodec& video_codec);
   virtual int GetReceiveCodec(const int video_channel,
                               VideoCodec& video_codec) const;
   virtual int GetCodecConfigParameters(
     const int video_channel,
     unsigned char config_parameters[kConfigParameterSize],
     unsigned char& config_parameters_size) const;
   virtual int SetImageScaleStatus(const int video_channel, const bool enable);
-  virtual int GetSendCodecStastistics(const int video_channel,
-                                      unsigned int& key_frames,
-                                      unsigned int& delta_frames) const;
-  virtual int GetReceiveCodecStastistics(const int video_channel,
-                                         unsigned int& key_frames,
-                                         unsigned int& delta_frames) const;
+  virtual int GetSendCodecStatistics(const int video_channel,
+                                     unsigned int& key_frames,
+                                     unsigned int& delta_frames) const;
+  virtual int GetReceiveCodecStatistics(const int video_channel,
+                                        unsigned int& key_frames,
+                                        unsigned int& delta_frames) const;
   virtual int GetReceiveSideDelay(const int video_channel,
                                   int* delay_ms) const;
   virtual int GetCodecTargetBitrate(const int video_channel,
                                     unsigned int* bitrate) const;
   virtual unsigned int GetDiscardedPackets(const int video_channel) const;
   virtual int SetKeyFrameRequestCallbackStatus(const int video_channel,
                                                const bool enable);
   virtual int SetSignalKeyPacketLossStatus(const int video_channel,