[Cast] Repurpose CastInitializationStatus for variable frame size support.

media/cast/cast_sender_impl.cc

Index: media/cast/cast_sender_impl.cc
diff --git a/media/cast/cast_sender_impl.cc b/media/cast/cast_sender_impl.cc
index 83048d7c9c55e6fc30e518dbf4e5af1a34e23312..b47ae9c30220e13096a290fd600a50a55ee34848 100644
--- a/media/cast/cast_sender_impl.cc
+++ b/media/cast/cast_sender_impl.cc
@@ -107,7 +107,7 @@ CastSenderImpl::CastSenderImpl(
 
 void CastSenderImpl::InitializeAudio(
     const AudioSenderConfig& audio_config,
-    const CastInitializationCallback& cast_initialization_cb) {
+    const StatusChangeCallback& status_change_cb) {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
   CHECK(audio_config.use_external_encoder ||
         cast_environment_->HasAudioThread());
@@ -115,14 +115,12 @@ void CastSenderImpl::InitializeAudio(
   VLOG(1) << "CastSenderImpl@" << this << "::InitializeAudio()";
 
   audio_sender_.reset(
-      new AudioSender(cast_environment_, audio_config, transport_sender_));
-
-  const CastInitializationStatus status = audio_sender_->InitializationResult();
-  if (status == STATUS_AUDIO_INITIALIZED) {
-    audio_frame_input_ =
-        new LocalAudioFrameInput(cast_environment_, audio_sender_->AsWeakPtr());
-  }
-  cast_initialization_cb.Run(status);
+      new AudioSender(cast_environment_,
+                      audio_config,
+                      base::Bind(&CastSenderImpl::OnAudioStatusChange,
+                                 weak_factory_.GetWeakPtr(),
+                                 status_change_cb),
+                      transport_sender_));
   if (video_sender_) {
     DCHECK(audio_sender_->GetTargetPlayoutDelay() ==
            video_sender_->GetTargetPlayoutDelay());
@@ -131,7 +129,7 @@ void CastSenderImpl::InitializeAudio(
 
 void CastSenderImpl::InitializeVideo(
     const VideoSenderConfig& video_config,
-    const CastInitializationCallback& cast_initialization_cb,
+    const StatusChangeCallback& status_change_cb,
     const CreateVideoEncodeAcceleratorCallback& create_vea_cb,
     const CreateVideoEncodeMemoryCallback& create_video_encode_mem_cb) {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
@@ -141,8 +139,9 @@ void CastSenderImpl::InitializeVideo(
   video_sender_.reset(new VideoSender(
       cast_environment_,
       video_config,
-      base::Bind(&CastSenderImpl::OnVideoInitialized,
-                 weak_factory_.GetWeakPtr(), cast_initialization_cb),
+      base::Bind(&CastSenderImpl::OnVideoStatusChange,
+                 weak_factory_.GetWeakPtr(),
+                 status_change_cb),
       create_vea_cb,
       create_video_encode_mem_cb,
       transport_sender_,
@@ -178,16 +177,27 @@ void CastSenderImpl::SetTargetPlayoutDelay(
   }
 }
 
-void CastSenderImpl::OnVideoInitialized(
-    const CastInitializationCallback& initialization_cb,
-    media::cast::CastInitializationStatus result) {
+void CastSenderImpl::OnAudioStatusChange(
+    const StatusChangeCallback& status_change_cb,
+    OperationalStatus status) {
+  DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
+  if (status == STATUS_INITIALIZED && !audio_frame_input_) {
+    audio_frame_input_ =
+        new LocalAudioFrameInput(cast_environment_, audio_sender_->AsWeakPtr());
+  }
+  status_change_cb.Run(status);
+}
+
+void CastSenderImpl::OnVideoStatusChange(
+    const StatusChangeCallback& status_change_cb,
+    OperationalStatus status) {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
-  if (result == STATUS_VIDEO_INITIALIZED) {
+  if (status == STATUS_INITIALIZED && !video_frame_input_) {
     video_frame_input_ =
         new LocalVideoFrameInput(cast_environment_, video_sender_->AsWeakPtr(),
                                  video_sender_->CreateVideoFrameFactory());
   }
-  initialization_cb.Run(result);
+  status_change_cb.Run(status);
 }
 
 }  // namespace cast