Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / webrtc / video_engine / stream_synchronization.cc

diff --git a/src/third_party/webrtc/video_engine/stream_synchronization.cc b/src/third_party/webrtc/video_engine/stream_synchronization.cc
index 6192dfa..8f72fa9 100644 (file)
--- a/src/third_party/webrtc/video_engine/stream_synchronization.cc
+++ b/src/third_party/webrtc/video_engine/stream_synchronization.cc
@@ -16,7 +16,7 @@
 
 #include <algorithm>
 
-#include "webrtc/system_wrappers/interface/trace.h"
+#include "webrtc/system_wrappers/interface/logging.h"
 
 namespace webrtc {
 
@@ -64,15 +64,15 @@ bool StreamSynchronization::ComputeRelativeDelay(
     return false;
   }
   int64_t audio_last_capture_time_ms;
-  if (!synchronization::RtpToNtpMs(audio_measurement.latest_timestamp,
-                                   audio_measurement.rtcp,
-                                   &audio_last_capture_time_ms)) {
+  if (!RtpToNtpMs(audio_measurement.latest_timestamp,
+                  audio_measurement.rtcp,
+                  &audio_last_capture_time_ms)) {
     return false;
   }
   int64_t video_last_capture_time_ms;
-  if (!synchronization::RtpToNtpMs(video_measurement.latest_timestamp,
-                                   video_measurement.rtcp,
-                                   &video_last_capture_time_ms)) {
+  if (!RtpToNtpMs(video_measurement.latest_timestamp,
+                  video_measurement.rtcp,
+                  &video_last_capture_time_ms)) {
     return false;
   }
   if (video_last_capture_time_ms < 0) {
@@ -96,18 +96,12 @@ bool StreamSynchronization::ComputeDelays(int relative_delay_ms,
   assert(total_audio_delay_target_ms && total_video_delay_target_ms);
 
   int current_video_delay_ms = *total_video_delay_target_ms;
-  WEBRTC_TRACE(webrtc::kTraceInfo, webrtc::kTraceVideo, video_channel_id_,
-               "Audio delay is: %d for voice channel: %d",
-               current_audio_delay_ms, audio_channel_id_);
-  WEBRTC_TRACE(webrtc::kTraceInfo, webrtc::kTraceVideo, video_channel_id_,
-               "Network delay diff is: %d for voice channel: %d",
-               channel_delay_->network_delay, audio_channel_id_);
+  LOG(LS_VERBOSE) << "Audio delay: " << current_audio_delay_ms
+                  << ", network delay diff: " << channel_delay_->network_delay
+                  << " current diff: " << relative_delay_ms
+                  << " for channel " << audio_channel_id_;
   // Calculate the difference between the lowest possible video delay and
   // the current audio delay.
-  WEBRTC_TRACE(webrtc::kTraceInfo, webrtc::kTraceVideo, video_channel_id_,
-               "Current diff is: %d for audio channel: %d",
-               relative_delay_ms, audio_channel_id_);
-
   int current_diff_ms = current_video_delay_ms - current_audio_delay_ms +
       relative_delay_ms;
 
@@ -198,11 +192,10 @@ bool StreamSynchronization::ComputeDelays(int relative_delay_ms,
   channel_delay_->last_video_delay_ms = new_video_delay_ms;
   channel_delay_->last_audio_delay_ms = new_audio_delay_ms;
 
-  WEBRTC_TRACE(webrtc::kTraceInfo, webrtc::kTraceVideo, video_channel_id_,
-      "Sync video delay %d ms for video channel and audio delay %d for audio "
-      "channel %d",
-      new_video_delay_ms, channel_delay_->extra_audio_delay_ms,
-      audio_channel_id_);
+  LOG(LS_VERBOSE) << "Sync video delay " << new_video_delay_ms
+                  << " and audio delay " << channel_delay_->extra_audio_delay_ms
+                  << " for video channel " << video_channel_id_
+                  << " for audio channel " << audio_channel_id_;
 
   // Return values.
   *total_video_delay_target_ms = new_video_delay_ms;