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

Unified Diff: webrtc/video/call.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/video/audio_receive_stream.cc ('k') | webrtc/video/call_perf_tests.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video/call.cc
diff --git a/webrtc/video/call.cc b/webrtc/video/call.cc
index 928828f32a12e559618f38325e70ed60db7070cb..4bc8e8f9a74d095f8750c220f45df41efa2323ed 100644
--- a/webrtc/video/call.cc
+++ b/webrtc/video/call.cc
@@ -93,8 +93,10 @@ class Call : public webrtc::Call, public PacketReceiver {
Stats GetStats() const override;
- DeliveryStatus DeliverPacket(MediaType media_type, const uint8_t* packet,
- size_t length) override;
+ DeliveryStatus DeliverPacket(MediaType media_type,
+ const uint8_t* packet,
+ size_t length,
+ const PacketTime& packet_time) override;
void SetBitrateConfig(
const webrtc::Call::Config::BitrateConfig& bitrate_config) override;
@@ -103,8 +105,10 @@ class Call : public webrtc::Call, public PacketReceiver {
private:
DeliveryStatus DeliverRtcp(MediaType media_type, const uint8_t* packet,
size_t length);
- DeliveryStatus DeliverRtp(MediaType media_type, const uint8_t* packet,
- size_t length);
+ DeliveryStatus DeliverRtp(MediaType media_type,
+ const uint8_t* packet,
+ size_t length,
+ const PacketTime& packet_time);
void SetBitrateControllerConfig(
const webrtc::Call::Config::BitrateConfig& bitrate_config);
@@ -507,7 +511,8 @@ PacketReceiver::DeliveryStatus Call::DeliverRtcp(MediaType media_type,
PacketReceiver::DeliveryStatus Call::DeliverRtp(MediaType media_type,
const uint8_t* packet,
- size_t length) {
+ size_t length,
+ const PacketTime& packet_time) {
// Minimum RTP header size.
if (length < 12)
return DELIVERY_PACKET_ERROR;
@@ -518,27 +523,31 @@ PacketReceiver::DeliveryStatus Call::DeliverRtp(MediaType media_type,
if (media_type == MediaType::ANY || media_type == MediaType::AUDIO) {
auto it = audio_receive_ssrcs_.find(ssrc);
if (it != audio_receive_ssrcs_.end()) {
- return it->second->DeliverRtp(packet, length) ? DELIVERY_OK
- : DELIVERY_PACKET_ERROR;
+ return it->second->DeliverRtp(packet, length, packet_time)
+ ? DELIVERY_OK
+ : DELIVERY_PACKET_ERROR;
}
}
if (media_type == MediaType::ANY || media_type == MediaType::VIDEO) {
auto it = video_receive_ssrcs_.find(ssrc);
if (it != video_receive_ssrcs_.end()) {
- return it->second->DeliverRtp(packet, length) ? DELIVERY_OK
- : DELIVERY_PACKET_ERROR;
+ return it->second->DeliverRtp(packet, length, packet_time)
+ ? DELIVERY_OK
+ : DELIVERY_PACKET_ERROR;
}
}
return DELIVERY_UNKNOWN_SSRC;
}
-PacketReceiver::DeliveryStatus Call::DeliverPacket(MediaType media_type,
- const uint8_t* packet,
- size_t length) {
+PacketReceiver::DeliveryStatus Call::DeliverPacket(
+ MediaType media_type,
+ const uint8_t* packet,
+ size_t length,
+ const PacketTime& packet_time) {
if (RtpHeaderParser::IsRtcp(packet, length))
return DeliverRtcp(media_type, packet, length);
- return DeliverRtp(media_type, packet, length);
+ return DeliverRtp(media_type, packet, length, packet_time);
}
} // namespace internal
« no previous file with comments | « webrtc/video/audio_receive_stream.cc ('k') | webrtc/video/call_perf_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698