media/cast/sender/video_sender.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/sender/video_sender.cc

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

Patch Set: 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

« media/cast/sender/fake_software_video_encoder.cc ('K') | « media/cast/sender/video_sender.h ('k') | media/cast/sender/video_sender_unittest.cc » ('j') | media/cast/test/cast_benchmarks.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/cast/sender/video_sender.cc

diff --git a/media/cast/sender/video_sender.cc b/media/cast/sender/video_sender.cc

index 3bf616f71ab8fad221ae3f45a7eb331628405e39..5c57dcfe623ff8500c51eaff3a79ab5235274192 100644

--- a/media/cast/sender/video_sender.cc

+++ b/media/cast/sender/video_sender.cc

@@ -89,7 +89,7 @@ void LogVideoCaptureTimestamps(CastEnvironment* cast_environment,

// See details: crbug.com/392086.

VideoSender::VideoSender(

scoped_refptr<CastEnvironment> cast_environment,

- const VideoSenderConfig& video_config,

+ const FrameSenderConfig& video_config,

const StatusChangeCallback& status_change_cb,

const CreateVideoEncodeAcceleratorCallback& create_vea_cb,

const CreateVideoEncodeMemoryCallback& create_video_encode_mem_cb,

@@ -100,7 +100,7 @@ VideoSender::VideoSender(

false,

transport_sender,

kVideoFrequency,

- video_config.ssrc,

+ video_config.sender_ssrc,

video_config.max_frame_rate,

video_config.min_playout_delay,

video_config.max_playout_delay,

@@ -133,7 +133,7 @@ VideoSender::VideoSender(

}

media::cast::CastTransportRtpConfig transport_config;

- transport_config.ssrc = video_config.ssrc;

+ transport_config.ssrc = video_config.sender_ssrc;

transport_config.feedback_ssrc = video_config.receiver_ssrc;

transport_config.rtp_payload_type = video_config.rtp_payload_type;

transport_config.aes_key = video_config.aes_key;