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

Unified Diff: media/cast/sender/video_encoder_impl.cc

Issue 901833004: [Cast] Repurpose CastInitializationStatus for variable frame size support. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Compile fixes. Created 5 years, 10 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
Index: media/cast/sender/video_encoder_impl.cc
diff --git a/media/cast/sender/video_encoder_impl.cc b/media/cast/sender/video_encoder_impl.cc
index 4efe32044a80c2d299691bbe6cb570e379935500..a2b0da9075253213ac1396224fd15b4b9f41f9eb 100644
--- a/media/cast/sender/video_encoder_impl.cc
+++ b/media/cast/sender/video_encoder_impl.cc
@@ -55,9 +55,11 @@ void EncodeVideoFrameOnEncoderThread(
VideoEncoderImpl::VideoEncoderImpl(
scoped_refptr<CastEnvironment> cast_environment,
const VideoSenderConfig& video_config,
- const CastInitializationCallback& initialization_cb)
+ const StatusChangeCallback& status_change_cb)
: cast_environment_(cast_environment) {
CHECK(cast_environment_->HasVideoThread());
+ DCHECK(!status_change_cb.is_null());
+
if (video_config.codec == CODEC_VIDEO_VP8) {
encoder_.reset(new Vp8Encoder(video_config));
cast_environment_->PostTask(CastEnvironment::VIDEO,
@@ -77,14 +79,12 @@ VideoEncoderImpl::VideoEncoderImpl(
dynamic_config_.latest_frame_id_to_reference = kStartFrameId;
dynamic_config_.bit_rate = video_config.start_bitrate;
- if (!initialization_cb.is_null()) {
- cast_environment_->PostTask(
- CastEnvironment::MAIN,
- FROM_HERE,
- base::Bind(initialization_cb,
- encoder_.get() ? STATUS_VIDEO_INITIALIZED :
- STATUS_UNSUPPORTED_VIDEO_CODEC));
- }
+ cast_environment_->PostTask(
+ CastEnvironment::MAIN,
+ FROM_HERE,
+ base::Bind(status_change_cb,
+ encoder_.get() ? STATUS_INITIALIZED :
+ STATUS_UNSUPPORTED_CODEC));
}
VideoEncoderImpl::~VideoEncoderImpl() {

Powered by Google App Engine
This is Rietveld 408576698