Simplify interface for media/cast: CastTransportSenderImpl

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 <utility>
 
 #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;
 
 namespace media {
 namespace cast {
 
+void InProcessReceiver::TransportClient::OnStatusChanged(
+    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::TransportClient::ProcessRtpPacket(
+    scoped_ptr<Packet> packet) {
+  in_process_receiver_->ReceivePacket(std::move(packet));
+}
+
 InProcessReceiver::InProcessReceiver(
     const scoped_refptr<CastEnvironment>& cast_environment,
     const net::IPEndPoint& local_end_point,
     const net::IPEndPoint& remote_end_point,
     const FrameReceiverConfig& audio_config,
     const FrameReceiverConfig& video_config)
     : cast_environment_(cast_environment),
       local_end_point_(local_end_point),
       remote_end_point_(remote_end_point),
       audio_config_(audio_config),
@@ skipping 20 matching lines @@
                                 FROM_HERE,
                                 base::Bind(&InProcessReceiver::StopOnMainThread,
                                            base::Unretained(this),
                                            &event));
     event.Wait();
   }
 }
 
 void InProcessReceiver::StopOnMainThread(base::WaitableEvent* event) {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
-  cast_receiver_.reset(NULL);
-  transport_.reset(NULL);
+  cast_receiver_.reset(nullptr);
+  transport_.reset(nullptr);
   weak_factory_.InvalidateWeakPtrs();
   event->Signal();
 }
 
 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_ = 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_->Clock(), base::TimeDelta(),
+      make_scoped_ptr(new InProcessReceiver::TransportClient(this)),
+      make_scoped_ptr(new UdpTransport(
+          nullptr, cast_environment_->GetTaskRunner(CastEnvironment::MAIN),
+          local_end_point_, remote_end_point_,
+          base::Bind(&InProcessReceiver::UpdateCastTransportStatus,
+                     base::Unretained(this)))),
       cast_environment_->GetTaskRunner(CastEnvironment::MAIN));
 
   cast_receiver_ = CastReceiver::Create(
       cast_environment_, audio_config_, video_config_, transport_.get());
 
   PullNextAudioFrame();
   PullNextVideoFrame();
 }
 
 void InProcessReceiver::GotAudioFrame(scoped_ptr<AudioBus> audio_frame,
@@ skipping 28 matching lines @@
       &InProcessReceiver::GotVideoFrame, weak_factory_.GetWeakPtr()));
 }
 
 void InProcessReceiver::ReceivePacket(scoped_ptr<Packet> packet) {
   // TODO(Hubbe): Make an InsertPacket method instead.
   cast_receiver_->ReceivePacket(std::move(packet));
 }
 
 }  // namespace cast
 }  // namespace media