media/cast/sender/size_adaptable_video_encoder_base.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/size_adaptable_video_encoder_base.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/size_adaptable_video_encoder_base.h ('k') | media/cast/sender/video_encoder.h » ('j') | media/cast/test/cast_benchmarks.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/cast/sender/size_adaptable_video_encoder_base.cc

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

index a803347f6dd9da24359fc0fc48f6d06690808f16..ced450efbc2d4c6e2f6eaa016e18185fd51f08ef 100644

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

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

@@ -15,7 +15,7 @@ namespace cast {

SizeAdaptableVideoEncoderBase::SizeAdaptableVideoEncoderBase(

const scoped_refptr<CastEnvironment>& cast_environment,

- const VideoSenderConfig& video_config,

+ const FrameSenderConfig& video_config,

const StatusChangeCallback& status_change_cb)

: cast_environment_(cast_environment),

video_config_(video_config),

@@ -68,7 +68,7 @@ bool SizeAdaptableVideoEncoderBase::EncodeVideoFrame(

void SizeAdaptableVideoEncoderBase::SetBitRate(int new_bit_rate) {

DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));

- video_config_.start_bitrate = new_bit_rate;

+ video_config_.codec_specific_params.start_bitrate = new_bit_rate;

if (encoder_)

encoder_->SetBitRate(new_bit_rate);

}