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

Unified Diff: media/cast/receiver/frame_receiver.cc

Issue 2133903002: RELAND: Merge VideoSenderConfig and AudioSenderConfig. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Disabled two unittests. Created 4 years, 5 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 | « media/cast/cast_testing.gypi ('k') | media/cast/receiver/video_decoder_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/receiver/frame_receiver.cc
diff --git a/media/cast/receiver/frame_receiver.cc b/media/cast/receiver/frame_receiver.cc
index 0e5d2581ed90de032b80861005c35673285b9edd..8787f09dbd1a938eb5027f88386d1798ee6df0ab 100644
--- a/media/cast/receiver/frame_receiver.cc
+++ b/media/cast/receiver/frame_receiver.cc
@@ -48,14 +48,15 @@ FrameReceiver::FrameReceiver(
rtp_timebase_(config.rtp_timebase),
target_playout_delay_(
base::TimeDelta::FromMilliseconds(config.rtp_max_delay_ms)),
- expected_frame_duration_(base::TimeDelta::FromSeconds(1) /
- config.target_frame_rate),
+ expected_frame_duration_(
+ base::TimeDelta::FromSecondsD(1.0 / config.target_frame_rate)),
reports_are_scheduled_(false),
framer_(cast_environment->Clock(),
this,
config.sender_ssrc,
true,
- config.rtp_max_delay_ms * config.target_frame_rate / 1000),
+ static_cast<int>(
+ config.rtp_max_delay_ms * config.target_frame_rate / 1000)),
rtcp_(cast_environment_->Clock(),
config.receiver_ssrc,
config.sender_ssrc),
« no previous file with comments | « media/cast/cast_testing.gypi ('k') | media/cast/receiver/video_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698