[Cast] Repurpose CastInitializationStatus for variable frame size support.

media/cast/cast_sender_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/cast/cast_sender_impl.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 89 matching lines @@
     scoped_refptr<CastEnvironment> cast_environment,
     CastTransportSender* const transport_sender)
     : cast_environment_(cast_environment),
       transport_sender_(transport_sender),
       weak_factory_(this) {
   CHECK(cast_environment.get());
 }
 
 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());
 
   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());
   }
 }
 
 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));
 
   VLOG(1) << "CastSenderImpl@" << this << "::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_,
       base::Bind(&CastSenderImpl::SetTargetPlayoutDelay,
                  weak_factory_.GetWeakPtr())));
   if (audio_sender_) {
     DCHECK(audio_sender_->GetTargetPlayoutDelay() ==
            video_sender_->GetTargetPlayoutDelay());
   }
 }
@@ skipping 15 matching lines @@
   VLOG(1) << "CastSenderImpl@" << this << "::SetTargetPlayoutDelay("
           << new_target_playout_delay.InMilliseconds() << " ms)";
   if (audio_sender_) {
     audio_sender_->SetTargetPlayoutDelay(new_target_playout_delay);
   }
   if (video_sender_) {
     video_sender_->SetTargetPlayoutDelay(new_target_playout_delay);
   }
 }
 
-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 (result == STATUS_VIDEO_INITIALIZED) {
+  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 (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
 }  // namespace media