Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / webrtc / modules / video_coding / main / source / receiver.cc

diff --git a/src/third_party/webrtc/modules/video_coding/main/source/receiver.cc b/src/third_party/webrtc/modules/video_coding/main/source/receiver.cc
index e959746..e179423 100644 (file)
--- a/src/third_party/webrtc/modules/video_coding/main/source/receiver.cc
+++ b/src/third_party/webrtc/modules/video_coding/main/source/receiver.cc
@@ -18,7 +18,7 @@
 #include "webrtc/modules/video_coding/main/source/internal_defines.h"
 #include "webrtc/modules/video_coding/main/source/media_opt_util.h"
 #include "webrtc/system_wrappers/interface/clock.h"
-#include "webrtc/system_wrappers/interface/trace.h"
+#include "webrtc/system_wrappers/interface/logging.h"
 #include "webrtc/system_wrappers/interface/trace_event.h"
 
 namespace webrtc {
@@ -28,15 +28,11 @@ enum { kMaxReceiverDelayMs = 10000 };
 VCMReceiver::VCMReceiver(VCMTiming* timing,
                          Clock* clock,
                          EventFactory* event_factory,
-                         int32_t vcm_id,
-                         int32_t receiver_id,
                          bool master)
     : crit_sect_(CriticalSectionWrapper::CreateCriticalSection()),
-      vcm_id_(vcm_id),
       clock_(clock),
-      receiver_id_(receiver_id),
       master_(master),
-      jitter_buffer_(clock_, event_factory, vcm_id, receiver_id, master),
+      jitter_buffer_(clock_, event_factory),
       timing_(timing),
       render_wait_event_(event_factory->CreateEvent()),
       state_(kPassive),
@@ -78,13 +74,6 @@ void VCMReceiver::UpdateRtt(uint32_t rtt) {
 int32_t VCMReceiver::InsertPacket(const VCMPacket& packet,
                                   uint16_t frame_width,
                                   uint16_t frame_height) {
-  if (packet.frameType == kVideoFrameKey) {
-    WEBRTC_TRACE(webrtc::kTraceInfo, webrtc::kTraceVideoCoding,
-                 VCMId(vcm_id_, receiver_id_),
-                 "Inserting key frame packet seqnum=%u, timestamp=%u",
-                 packet.seqNum, packet.timestamp);
-  }
-
   // Insert the packet into the jitter buffer. The packet can either be empty or
   // contain media at this point.
   bool retransmitted = false;
@@ -95,10 +84,6 @@ int32_t VCMReceiver::InsertPacket(const VCMPacket& packet,
   } else if (ret == kFlushIndicator) {
     return VCM_FLUSH_INDICATOR;
   } else if (ret < 0) {
-    WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceVideoCoding,
-                 VCMId(vcm_id_, receiver_id_),
-                 "Error inserting packet seqnum=%u, timestamp=%u",
-                 packet.seqNum, packet.timestamp);
     return VCM_JITTER_BUFFER_ERROR;
   }
   if (ret == kCompleteSession && !retransmitted) {
@@ -107,15 +92,6 @@ int32_t VCMReceiver::InsertPacket(const VCMPacket& packet,
     // delay within the jitter estimate.
     timing_->IncomingTimestamp(packet.timestamp, clock_->TimeInMilliseconds());
   }
-  if (master_) {
-    // Only trace the primary receiver to make it possible to parse and plot
-    // the trace file.
-    WEBRTC_TRACE(webrtc::kTraceDebug, webrtc::kTraceVideoCoding,
-                 VCMId(vcm_id_, receiver_id_),
-                 "Packet seqnum=%u timestamp=%u inserted at %u",
-                 packet.seqNum, packet.timestamp,
-                 MaskWord64ToUWord32(clock_->TimeInMilliseconds()));
-  }
   return VCM_OK;
 }
 
@@ -159,19 +135,16 @@ VCMEncodedFrame* VCMReceiver::FrameForDecoding(
   if (next_render_time_ms < 0) {
     timing_error = true;
   } else if (std::abs(next_render_time_ms - now_ms) > max_video_delay_ms_) {
-    WEBRTC_TRACE(webrtc::kTraceWarning, webrtc::kTraceVideoCoding,
-                 VCMId(vcm_id_, receiver_id_),
-                 "This frame is out of our delay bounds, resetting jitter "
-                 "buffer: %d > %d",
-                 static_cast<int>(std::abs(next_render_time_ms - now_ms)),
-                 max_video_delay_ms_);
+    int frame_delay = static_cast<int>(std::abs(next_render_time_ms - now_ms));
+    LOG(LS_WARNING) << "A frame about to be decoded is out of the configured "
+                    << "delay bounds (" << frame_delay << " > "
+                    << max_video_delay_ms_
+                    << "). Resetting the video jitter buffer.";
     timing_error = true;
   } else if (static_cast<int>(timing_->TargetVideoDelay()) >
              max_video_delay_ms_) {
-    WEBRTC_TRACE(webrtc::kTraceWarning, webrtc::kTraceVideoCoding,
-                 VCMId(vcm_id_, receiver_id_),
-                 "More than %u ms target delay. Flushing jitter buffer and"
-                 "resetting timing.", max_video_delay_ms_);
+    LOG(LS_WARNING) << "The video target delay has grown larger than "
+                    << max_video_delay_ms_ << " ms. Resetting jitter buffer.";
     timing_error = true;
   }
 
@@ -280,10 +253,7 @@ VCMNackStatus VCMReceiver::NackList(uint16_t* nack_list,
   bool request_key_frame = false;
   uint16_t* internal_nack_list = jitter_buffer_.GetNackList(
       nack_list_length, &request_key_frame);
-  if (*nack_list_length > size) {
-    *nack_list_length = 0;
-    return kNackNeedMoreMemory;
-  }
+  assert(*nack_list_length <= size);
   if (internal_nack_list != NULL && *nack_list_length > 0) {
     memcpy(nack_list, internal_nack_list, *nack_list_length * sizeof(uint16_t));
   }