Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(42)

Side by Side Diff: talk/media/webrtc/webrtcvideoengine2.cc

Issue 1333483002: Wire up PacketTime to ReceiveStreams. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « talk/media/webrtc/fakewebrtccall.cc ('k') | talk/media/webrtc/webrtcvoiceengine.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2014 Google Inc. 3 * Copyright 2014 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 1417 matching lines...) Expand 10 before | Expand all | Expand 10 after
1428 1428
1429 bool WebRtcVideoChannel2::RequestIntraFrame() { 1429 bool WebRtcVideoChannel2::RequestIntraFrame() {
1430 // TODO(pbos): Implement. 1430 // TODO(pbos): Implement.
1431 LOG(LS_VERBOSE) << "SendIntraFrame()."; 1431 LOG(LS_VERBOSE) << "SendIntraFrame().";
1432 return true; 1432 return true;
1433 } 1433 }
1434 1434
1435 void WebRtcVideoChannel2::OnPacketReceived( 1435 void WebRtcVideoChannel2::OnPacketReceived(
1436 rtc::Buffer* packet, 1436 rtc::Buffer* packet,
1437 const rtc::PacketTime& packet_time) { 1437 const rtc::PacketTime& packet_time) {
1438 const webrtc::PacketTime webrtc_packet_time(packet_time.timestamp,
1439 packet_time.not_before);
1438 const webrtc::PacketReceiver::DeliveryStatus delivery_result = 1440 const webrtc::PacketReceiver::DeliveryStatus delivery_result =
1439 call_->Receiver()->DeliverPacket(webrtc::MediaType::VIDEO, 1441 call_->Receiver()->DeliverPacket(
1440 reinterpret_cast<const uint8_t*>(packet->data()), packet->size()); 1442 webrtc::MediaType::VIDEO,
1443 reinterpret_cast<const uint8_t*>(packet->data()), packet->size(),
1444 webrtc_packet_time);
1441 switch (delivery_result) { 1445 switch (delivery_result) {
1442 case webrtc::PacketReceiver::DELIVERY_OK: 1446 case webrtc::PacketReceiver::DELIVERY_OK:
1443 return; 1447 return;
1444 case webrtc::PacketReceiver::DELIVERY_PACKET_ERROR: 1448 case webrtc::PacketReceiver::DELIVERY_PACKET_ERROR:
1445 return; 1449 return;
1446 case webrtc::PacketReceiver::DELIVERY_UNKNOWN_SSRC: 1450 case webrtc::PacketReceiver::DELIVERY_UNKNOWN_SSRC:
1447 break; 1451 break;
1448 } 1452 }
1449 1453
1450 uint32 ssrc = 0; 1454 uint32 ssrc = 0;
(...skipping 19 matching lines...) Expand all
1470 } 1474 }
1471 } 1475 }
1472 1476
1473 switch (unsignalled_ssrc_handler_->OnUnsignalledSsrc(this, ssrc)) { 1477 switch (unsignalled_ssrc_handler_->OnUnsignalledSsrc(this, ssrc)) {
1474 case UnsignalledSsrcHandler::kDropPacket: 1478 case UnsignalledSsrcHandler::kDropPacket:
1475 return; 1479 return;
1476 case UnsignalledSsrcHandler::kDeliverPacket: 1480 case UnsignalledSsrcHandler::kDeliverPacket:
1477 break; 1481 break;
1478 } 1482 }
1479 1483
1480 if (call_->Receiver()->DeliverPacket(webrtc::MediaType::VIDEO, 1484 if (call_->Receiver()->DeliverPacket(
1481 reinterpret_cast<const uint8_t*>(packet->data()), packet->size()) != 1485 webrtc::MediaType::VIDEO,
1482 webrtc::PacketReceiver::DELIVERY_OK) { 1486 reinterpret_cast<const uint8_t*>(packet->data()), packet->size(),
1487 webrtc_packet_time) != webrtc::PacketReceiver::DELIVERY_OK) {
1483 LOG(LS_WARNING) << "Failed to deliver RTP packet on re-delivery."; 1488 LOG(LS_WARNING) << "Failed to deliver RTP packet on re-delivery.";
1484 return; 1489 return;
1485 } 1490 }
1486 } 1491 }
1487 1492
1488 void WebRtcVideoChannel2::OnRtcpReceived( 1493 void WebRtcVideoChannel2::OnRtcpReceived(
1489 rtc::Buffer* packet, 1494 rtc::Buffer* packet,
1490 const rtc::PacketTime& packet_time) { 1495 const rtc::PacketTime& packet_time) {
1491 if (call_->Receiver()->DeliverPacket(webrtc::MediaType::VIDEO, 1496 const webrtc::PacketTime webrtc_packet_time(packet_time.timestamp,
1492 reinterpret_cast<const uint8_t*>(packet->data()), packet->size()) != 1497 packet_time.not_before);
1493 webrtc::PacketReceiver::DELIVERY_OK) { 1498 if (call_->Receiver()->DeliverPacket(
1499 webrtc::MediaType::VIDEO,
1500 reinterpret_cast<const uint8_t*>(packet->data()), packet->size(),
1501 webrtc_packet_time) != webrtc::PacketReceiver::DELIVERY_OK) {
1494 LOG(LS_WARNING) << "Failed to deliver RTCP packet."; 1502 LOG(LS_WARNING) << "Failed to deliver RTCP packet.";
1495 } 1503 }
1496 } 1504 }
1497 1505
1498 void WebRtcVideoChannel2::OnReadyToSend(bool ready) { 1506 void WebRtcVideoChannel2::OnReadyToSend(bool ready) {
1499 LOG(LS_VERBOSE) << "OnReadyToSend: " << (ready ? "Ready." : "Not ready."); 1507 LOG(LS_VERBOSE) << "OnReadyToSend: " << (ready ? "Ready." : "Not ready.");
1500 call_->SignalNetworkState(ready ? webrtc::kNetworkUp : webrtc::kNetworkDown); 1508 call_->SignalNetworkState(ready ? webrtc::kNetworkUp : webrtc::kNetworkDown);
1501 } 1509 }
1502 1510
1503 bool WebRtcVideoChannel2::MuteStream(uint32 ssrc, bool mute) { 1511 bool WebRtcVideoChannel2::MuteStream(uint32 ssrc, bool mute) {
(...skipping 1245 matching lines...) Expand 10 before | Expand all | Expand 10 after
2749 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; 2757 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id];
2750 } 2758 }
2751 } 2759 }
2752 2760
2753 return video_codecs; 2761 return video_codecs;
2754 } 2762 }
2755 2763
2756 } // namespace cricket 2764 } // namespace cricket
2757 2765
2758 #endif // HAVE_WEBRTC_VIDEO 2766 #endif // HAVE_WEBRTC_VIDEO
OLDNEW
« no previous file with comments | « talk/media/webrtc/fakewebrtccall.cc ('k') | talk/media/webrtc/webrtcvoiceengine.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698