Cast: Make receiver use cast_transport

media/cast/test/utility/in_process_receiver.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/test/utility/in_process_receiver.h"
 
 #include "base/bind_helpers.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/time/time.h"
+#include "base/values.h"
 #include "media/base/video_frame.h"
 #include "media/cast/cast_config.h"
 #include "media/cast/cast_environment.h"
 #include "media/cast/cast_receiver.h"
 #include "media/cast/net/cast_transport_config.h"
 #include "media/cast/net/udp_transport.h"
 
 using media::cast::CastTransportStatus;
 using media::cast::UdpTransport;
 
@@ skipping 49 matching lines @@
 void InProcessReceiver::UpdateCastTransportStatus(CastTransportStatus status) {
   LOG_IF(ERROR, status == media::cast::TRANSPORT_SOCKET_ERROR)
       << "Transport socket error occurred.  InProcessReceiver is likely dead.";
   VLOG(1) << "CastTransportStatus is now " << status;
 }
 
 void InProcessReceiver::StartOnMainThread() {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
 
   DCHECK(!transport_ && !cast_receiver_);
-  transport_.reset(
-      new UdpTransport(NULL,
-                       cast_environment_->GetTaskRunner(CastEnvironment::MAIN),
-                       local_end_point_,
-                       remote_end_point_,
-                       65536,
-                       base::Bind(&InProcessReceiver::UpdateCastTransportStatus,
-                                  base::Unretained(this))));
+
+  transport_ = CastTransportSender::Create(
+      NULL,
+      cast_environment_->Clock(),
+      local_end_point_,
+      remote_end_point_,
+      scoped_ptr<base::DictionaryValue>(new base::DictionaryValue),
+      base::Bind(&InProcessReceiver::UpdateCastTransportStatus,
+                 base::Unretained(this)),
+      BulkRawEventsCallback(),
+      base::TimeDelta(),
+      base::Bind(&InProcessReceiver::ReceivePacket,
+                 base::Unretained(this)),
+      cast_environment_->GetTaskRunner(CastEnvironment::MAIN));
+
   cast_receiver_ = CastReceiver::Create(
       cast_environment_, audio_config_, video_config_, transport_.get());
 
-  // TODO(hubbe): Make the cast receiver do this automatically.
-  transport_->StartReceiving(cast_receiver_->packet_receiver());
-
   PullNextAudioFrame();
   PullNextVideoFrame();
 }
 
 void InProcessReceiver::GotAudioFrame(scoped_ptr<AudioBus> audio_frame,
                                       const base::TimeTicks& playout_time,
                                       bool is_continuous) {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
   if (audio_frame.get())
     OnAudioFrame(audio_frame.Pass(), playout_time, is_continuous);
@@ skipping 16 matching lines @@
       base::Bind(&InProcessReceiver::GotAudioFrame,
                  weak_factory_.GetWeakPtr()));
 }
 
 void InProcessReceiver::PullNextVideoFrame() {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
   cast_receiver_->RequestDecodedVideoFrame(base::Bind(
       &InProcessReceiver::GotVideoFrame, weak_factory_.GetWeakPtr()));
 }
 
+void InProcessReceiver::ReceivePacket(scoped_ptr<Packet> packet) {
+  // TODO(Hubbe): Make an InsertPacket method instead.
+  cast_receiver_->ReceivePacket(packet.Pass());
+}
+
 }  // namespace cast
 }  // namespace media