Cast: Refactoring Cast API's

media/cast/test/sender.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.
 
 // Test application that simulates a cast sender - Data can be either generated
 // or read from a file.
 
 #include "base/at_exit.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 279 matching lines @@
 };
 
 }  // namespace cast
 }  // namespace media
 
 namespace {
 void UpdateCastTransportStatus(
     media::cast::transport::CastTransportStatus status) {}
 
 void InitializationResult(media::cast::CastInitializationStatus result) {
-  CHECK_EQ(result, media::cast::STATUS_INITIALIZED);
+  bool end_result = result == media::cast::STATUS_AUDIO_INITIALIZED ||
+                    result == media::cast::STATUS_VIDEO_INITIALIZED;
+  CHECK(end_result);

[Ami GONE FROM CHROMIUM, 2014/02/13 18:02:14]

ditto

[mikhal1, 2014/02/14 18:03:16]

Probably an overkill here, as it's just a test app, and not an automated test.
On 2014/02/13 18:02:14, Ami Fischman wrote:

   VLOG(1) << "Cast Sender initialized";

[Ami GONE FROM CHROMIUM, 2014/02/13 18:02:14]

a bit of an overstatement now

[mikhal1, 2014/02/14 18:03:16]

Done.

 }
 
 net::IPEndPoint CreateUDPAddress(std::string ip_str, int port) {
   net::IPAddressNumber ip_number;
   CHECK(net::ParseIPLiteralToNumber(ip_str, &ip_number));
   return net::IPEndPoint(ip_number, port);
 }
 
 }  // namespace
 
@@ skipping 46 matching lines @@
           audio_thread.message_loop_proxy(),
           NULL,
           video_thread.message_loop_proxy(),
           NULL,
           io_message_loop.message_loop_proxy(),
           media::cast::GetDefaultCastSenderLoggingConfig()));
 
   scoped_ptr<media::cast::CastSender> cast_sender(
       media::cast::CastSender::CreateCastSender(
           cast_environment,
-          &audio_config,
-          &video_config,
-          NULL,  // gpu_factories.
           base::Bind(&InitializationResult),
           transport_sender.get()));
 
+  cast_sender->InitializeVideo(video_config, NULL);
+  cast_sender->InitializeAudio(audio_config);
+
   transport_sender->SetPacketReceiver(cast_sender->packet_receiver());
 
   media::cast::FrameInput* frame_input = cast_sender->frame_input();
   scoped_ptr<media::cast::SendProcess> send_process(
       new media::cast::SendProcess(test_thread.message_loop_proxy(),
                                    cast_environment->Clock(),
                                    video_config,
                                    frame_input));
 
   test_thread.message_loop_proxy()->PostTask(
       FROM_HERE,
       base::Bind(&media::cast::SendProcess::SendFrame,
                  base::Unretained(send_process.get())));
 
   io_message_loop.Run();
   return 0;
 }