Simplify interface for media/cast: CastTransportSenderImpl

chrome/browser/media/cast_transport_host_filter.h

 // 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.
 
 #ifndef CHROME_BROWSER_MEDIA_CAST_TRANSPORT_HOST_FILTER_H_
 #define CHROME_BROWSER_MEDIA_CAST_TRANSPORT_HOST_FILTER_H_
 
 #include "base/id_map.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/default_tick_clock.h"
 #include "content/public/browser/browser_message_filter.h"
 #include "media/cast/cast_sender.h"
 #include "media/cast/logging/logging_defines.h"
 #include "media/cast/net/cast_transport_sender.h"
 
 namespace content {
 class PowerSaveBlocker;
 }  // namespace content
 
 namespace cast {
 
-class CastTransportHostFilter : public content::BrowserMessageFilter {
+class CastTransportHostFilter
+    : public content::BrowserMessageFilter,
+      media::cast::CastTransportSender::CastTransportClient {
  public:
   CastTransportHostFilter();
 
  private:
   ~CastTransportHostFilter() override;
 
-  void NotifyStatusChange(
-      int32 channel_id,
-      media::cast::CastTransportStatus result);
-  void SendRawEvents(
-      int32 channel_id,
-      scoped_ptr<std::vector<media::cast::FrameEvent>> frame_events,
-      scoped_ptr<std::vector<media::cast::PacketEvent>> packet_events);
   void SendRtt(int32 channel_id, uint32 ssrc, base::TimeDelta rtt);
   void SendCastMessage(int32 channel_id,
                        uint32 ssrc,
                        const media::cast::RtcpCastMessage& cast_message);
-  void ReceivedPacket(int32 channel_id, scoped_ptr<media::cast::Packet> packet);
 
   // BrowserMessageFilter implementation.
   bool OnMessageReceived(const IPC::Message& message) override;
 
+  // Override CastTransportSender::CastTransportClient.

[Irfan, 2015/12/16 19:44:34]

ha, my suggestion of "CastTransportEndPoint" was for CastTransportSender.

I am ok if you want to retain CastTransportClient here

[xjz, 2015/12/16 21:58:01]

The rename of "CastTransportSender" might in a later CL as Yuri suggested. I am
OK with either "Client" or "CastTransportClient". Rename it back to "Client" to
make it simpler for now :).

+  void OnStatusChange(media::cast::CastTransportStatus status) final;
+  void OnReceivedLoggingEvents(
+      scoped_ptr<std::vector<media::cast::FrameEvent>> frame_events,
+      scoped_ptr<std::vector<media::cast::PacketEvent>> packet_events) final;
+  void OnReceivedPackets(scoped_ptr<media::cast::Packet> packet) final;
+
   // Forwarding functions.
   void OnInitializeAudio(
       int32 channel_id,
       const media::cast::CastTransportRtpConfig& config);
   void OnInitializeVideo(
       int32 channel_id,
       const media::cast::CastTransportRtpConfig& config);
   void OnInsertFrame(
       int32 channel_id,
       uint32 ssrc,
@@ skipping 22 matching lines @@
   IDMap<media::cast::CastTransportSender, IDMapOwnPointer> id_map_;
 
   // Clock used by Cast transport.
   base::DefaultTickClock clock_;
 
   // While |id_map_| is non-empty, hold an instance of
   // content::PowerSaveBlocker.  This prevents Chrome from being suspended while
   // remoting content.
   scoped_ptr<content::PowerSaveBlocker> power_save_blocker_;
 
+  // Active channel id.
+  int32 channel_id_;
+
   base::WeakPtrFactory<CastTransportHostFilter> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CastTransportHostFilter);
 };
 
 }  // namespace cast
 
 #endif  // CHROME_BROWSER_MEDIA_CAST_TRANSPORT_HOST_FILTER_H_