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

Unified Diff: media/cast/video_receiver/video_receiver.cc

Issue 100823015: Cast: move net->transport (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Updating transport callback Created 7 years 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 | « media/cast/video_receiver/video_receiver.h ('k') | media/cast/video_receiver/video_receiver_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/video_receiver/video_receiver.cc
diff --git a/media/cast/video_receiver/video_receiver.cc b/media/cast/video_receiver/video_receiver.cc
index f72851684ecc1e8f5f43985c6e88532bd3d3d766..4ba3cc767d5b1de0ebc16013cfc9535ecf752f4f 100644
--- a/media/cast/video_receiver/video_receiver.cc
+++ b/media/cast/video_receiver/video_receiver.cc
@@ -85,7 +85,7 @@ class LocalRtpReceiverStatistics : public RtpReceiverStatistics {
VideoReceiver::VideoReceiver(scoped_refptr<CastEnvironment> cast_environment,
const VideoReceiverConfig& video_config,
- PacedPacketSender* const packet_sender)
+ transport::PacedPacketSender* const packet_sender)
: cast_environment_(cast_environment),
codec_(video_config.codec),
target_delay_delta_(
@@ -340,6 +340,7 @@ base::TimeTicks VideoReceiver::GetRenderTime(base::TimeTicks now,
// Senders time in ms when this frame was captured.
// Note: the senders clock and our local clock might not be synced.
base::TimeTicks rtp_timestamp_in_ticks;
+
if (time_offset_.InMilliseconds() == 0) {
if (!rtcp_->RtpTimestampInSenderTime(kVideoFrequency,
incoming_rtp_timestamp_,
@@ -369,7 +370,7 @@ base::TimeTicks VideoReceiver::GetRenderTime(base::TimeTicks now,
return now;
}
base::TimeTicks render_time =
- (rtp_timestamp_in_ticks + time_offset_ + target_delay_delta_);
+ rtp_timestamp_in_ticks + time_offset_ + target_delay_delta_;
if (last_render_time_ > render_time)
render_time = last_render_time_;
last_render_time_ = render_time;
« no previous file with comments | « media/cast/video_receiver/video_receiver.h ('k') | media/cast/video_receiver/video_receiver_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698