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

Unified Diff: media/cast/sender/size_adaptable_video_encoder_base.h

Issue 2133223003: Revert of Refactoring: Merge VideoSenderConfig and AudioSenderConfig. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/sender/h264_vt_encoder.cc ('k') | media/cast/sender/size_adaptable_video_encoder_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/sender/size_adaptable_video_encoder_base.h
diff --git a/media/cast/sender/size_adaptable_video_encoder_base.h b/media/cast/sender/size_adaptable_video_encoder_base.h
index 8443e2c09f66388b4cafd05a88fe8206594f8e97..ac2fd23507075976f9056b764069eef7f5dffad5 100644
--- a/media/cast/sender/size_adaptable_video_encoder_base.h
+++ b/media/cast/sender/size_adaptable_video_encoder_base.h
@@ -30,7 +30,7 @@
public:
SizeAdaptableVideoEncoderBase(
const scoped_refptr<CastEnvironment>& cast_environment,
- const FrameSenderConfig& video_config,
+ const VideoSenderConfig& video_config,
const StatusChangeCallback& status_change_cb);
~SizeAdaptableVideoEncoderBase() override;
@@ -50,7 +50,9 @@
CastEnvironment* cast_environment() const {
return cast_environment_.get();
}
- const FrameSenderConfig& video_config() const { return video_config_; }
+ const VideoSenderConfig& video_config() const {
+ return video_config_;
+ }
const gfx::Size& frame_size() const {
return frame_size_;
}
@@ -91,7 +93,7 @@
// This is not const since |video_config_.starting_bitrate| is modified by
// SetBitRate(), for when a replacement encoder is spawned.
- FrameSenderConfig video_config_;
+ VideoSenderConfig video_config_;
// Run whenever the underlying encoder reports a status change.
const StatusChangeCallback status_change_cb_;
« no previous file with comments | « media/cast/sender/h264_vt_encoder.cc ('k') | media/cast/sender/size_adaptable_video_encoder_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698