RELAND: [Cast] Software encoder support for varying video frame sizes.

media/cast/sender/video_sender.cc

 // Copyright 2014 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/sender/video_sender.h"
 
 #include <algorithm>
 #include <cstring>
 
 #include "base/bind.h"
@@ skipping 82 matching lines @@
     video_encoder_.reset(new ExternalVideoEncoder(
         cast_environment,
         video_config,
         gfx::Size(video_config.width, video_config.height),
         base::Bind(&VideoSender::OnEncoderInitialized,
                    weak_factory_.GetWeakPtr(), initialization_cb),
         create_vea_cb,
         create_video_encode_mem_cb));
   } else if (!video_encoder_) {
     // Software encoder is initialized immediately.
-    video_encoder_.reset(new VideoEncoderImpl(cast_environment, video_config));
+    video_encoder_.reset(new VideoEncoderImpl(
+        cast_environment, video_config, initialization_cb));
     cast_initialization_status_ = STATUS_VIDEO_INITIALIZED;
   }
 #endif  // !defined(OS_IOS)
 
-  if (cast_initialization_status_ == STATUS_VIDEO_INITIALIZED) {
-    cast_environment->PostTask(
-        CastEnvironment::MAIN,
-        FROM_HERE,
-        base::Bind(initialization_cb, cast_initialization_status_));
-  }
-
   media::cast::CastTransportRtpConfig transport_config;
   transport_config.ssrc = video_config.ssrc;
   transport_config.feedback_ssrc = video_config.receiver_ssrc;
   transport_config.rtp_payload_type = video_config.rtp_payload_type;
   transport_config.aes_key = video_config.aes_key;
   transport_config.aes_iv_mask = video_config.aes_iv_mask;
 
   transport_sender->InitializeVideo(
       transport_config,
       base::Bind(&VideoSender::OnReceivedCastFeedback,
@@ skipping 138 matching lines @@
   DCHECK_GE(frames_in_encoder_, 0);
 
   duration_in_encoder_ =
       last_enqueued_frame_reference_time_ - encoded_frame->reference_time;
 
   SendEncodedFrame(encoder_bitrate, encoded_frame.Pass());
 }
 
 }  // namespace cast
 }  // namespace media