media/cast/receiver/frame_receiver.cc - Issue 2113783002: Refactoring: Merge VideoSenderConfig and AudioSenderConfig.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2113783002: Refactoring: Merge VideoSenderConfig and AudioSenderConfig. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressed comments and rebased. Created 4 years, 6 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

« chrome/renderer/extensions/cast_streaming_native_handler.cc ('K') | « media/cast/cast_sender_impl.cc ('k') | media/cast/receiver/video_decoder_unittest.cc » ('j') | media/cast/test/cast_benchmarks.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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..ac00e5cb65cbd92f73d4fba386e4463d8e4315b6 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::FromSeconds(1.0 / config.target_frame_rate)),

miu 2016/07/06 21:20:26 s/FromSeconds/FromSecondsD/

xjz 2016/07/06 23:57:39 Done.

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),