summaryrefslogtreecommitdiff
path: root/session/media/channel.cc
diff options
context:
space:
mode:
Diffstat (limited to 'session/media/channel.cc')
-rw-r--r--session/media/channel.cc19
1 files changed, 12 insertions, 7 deletions
diff --git a/session/media/channel.cc b/session/media/channel.cc
index 8579db2..9a8559a 100644
--- a/session/media/channel.cc
+++ b/session/media/channel.cc
@@ -610,7 +610,9 @@ void BaseChannel::OnWritableState(TransportChannel* channel) {
}
void BaseChannel::OnChannelRead(TransportChannel* channel,
- const char* data, size_t len, int flags) {
+ const char* data, size_t len,
+ const talk_base::PacketTime& packet_time,
+ int flags) {
// OnChannelRead gets called from P2PSocket; now pass data to MediaEngine
ASSERT(worker_thread_ == talk_base::Thread::Current());
@@ -618,7 +620,7 @@ void BaseChannel::OnChannelRead(TransportChannel* channel,
// transport. We feed RTP traffic into the demuxer to determine if it is RTCP.
bool rtcp = PacketIsRtcp(channel, data, len);
talk_base::Buffer packet(data, len);
- HandlePacket(rtcp, &packet);
+ HandlePacket(rtcp, &packet, packet_time);
}
void BaseChannel::OnReadyToSend(TransportChannel* channel) {
@@ -774,7 +776,8 @@ bool BaseChannel::WantsPacket(bool rtcp, talk_base::Buffer* packet) {
return true;
}
-void BaseChannel::HandlePacket(bool rtcp, talk_base::Buffer* packet) {
+void BaseChannel::HandlePacket(bool rtcp, talk_base::Buffer* packet,
+ const talk_base::PacketTime& packet_time) {
if (!WantsPacket(rtcp, packet)) {
return;
}
@@ -843,9 +846,9 @@ void BaseChannel::HandlePacket(bool rtcp, talk_base::Buffer* packet) {
// Push it down to the media channel.
if (!rtcp) {
- media_channel_->OnPacketReceived(packet);
+ media_channel_->OnPacketReceived(packet, packet_time);
} else {
- media_channel_->OnRtcpReceived(packet);
+ media_channel_->OnRtcpReceived(packet, packet_time);
}
}
@@ -1645,8 +1648,10 @@ void VoiceChannel::GetActiveStreams_w(AudioInfo::StreamList* actives) {
}
void VoiceChannel::OnChannelRead(TransportChannel* channel,
- const char* data, size_t len, int flags) {
- BaseChannel::OnChannelRead(channel, data, len, flags);
+ const char* data, size_t len,
+ const talk_base::PacketTime& packet_time,
+ int flags) {
+ BaseChannel::OnChannelRead(channel, data, len, packet_time, flags);
// Set a flag when we've received an RTP packet. If we're waiting for early
// media, this will disable the timeout.