From 4e545cc24478df6dec0f73cb8f5b9e5720fbce59 Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Wed, 14 May 2014 13:58:13 +0000 Subject: [PATCH] Update webrtcvideoengine2.cc to use DeliveryStatus. talk/ changes corresponding to https://review.webrtc.org/12289005/. BUG=3228 R=perkj@webrtc.org Review URL: https://webrtc-codereview.appspot.com/19479004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6151 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/media/webrtc/webrtcvideoengine2.cc | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/talk/media/webrtc/webrtcvideoengine2.cc b/talk/media/webrtc/webrtcvideoengine2.cc index 68492ce190..16b741cef5 100644 --- a/talk/media/webrtc/webrtcvideoengine2.cc +++ b/talk/media/webrtc/webrtcvideoengine2.cc @@ -1180,16 +1180,21 @@ bool WebRtcVideoChannel2::RequestIntraFrame() { void WebRtcVideoChannel2::OnPacketReceived( talk_base::Buffer* packet, const talk_base::PacketTime& packet_time) { - if (call_->Receiver()->DeliverPacket( - reinterpret_cast(packet->data()), packet->length())) { - return; + const webrtc::PacketReceiver::DeliveryStatus delivery_result = + call_->Receiver()->DeliverPacket( + reinterpret_cast(packet->data()), packet->length()); + switch (delivery_result) { + case webrtc::PacketReceiver::DELIVERY_OK: + return; + case webrtc::PacketReceiver::DELIVERY_PACKET_ERROR: + return; + case webrtc::PacketReceiver::DELIVERY_UNKNOWN_SSRC: + break; } - // Packet ignored most likely because there's no receiver for it, try to - // create one unless it already exists. uint32 ssrc = 0; if (default_recv_ssrc_ != 0) { // Already one default stream. - LOG(LS_WARNING) << "Default receive stream already set."; + LOG(LS_WARNING) << "Unknown SSRC, but default receive stream already set."; return; }