Motown: Define MediaRenderer and make it the way we identify renderers.

services/media/factory_service/media_player_impl.h

 // Copyright 2016 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 MOJO_SERVICES_MEDIA_FACTORY_MEDIA_PLAYER_IMPL_H_
 #define MOJO_SERVICES_MEDIA_FACTORY_MEDIA_PLAYER_IMPL_H_
 
 #include <limits>
 #include <vector>
 
@@ skipping 10 matching lines @@
 
 namespace mojo {
 namespace media {
 
 // Mojo agent that renders streams from an origin specified by URL.
 class MediaPlayerImpl : public MediaFactoryService::Product<MediaPlayer>,
                         public MediaPlayer {
  public:
   static std::shared_ptr<MediaPlayerImpl> Create(
       InterfaceHandle<SeekingReader> reader,
+      InterfaceHandle<MediaRenderer> audio_renderer,
+      InterfaceHandle<MediaRenderer> video_renderer,
       InterfaceRequest<MediaPlayer> request,
       MediaFactoryService* owner);
 
   ~MediaPlayerImpl() override;
 
   // MediaPlayer implementation.
   void GetStatus(uint64_t version_last_seen,
                  const GetStatusCallback& callback) override;
 
   void Play() override;
@@ skipping 15 matching lines @@
   struct Stream {
     Stream();
     ~Stream();
     // TODO(dalesat): Have the sink enlist the decoder.
     MediaTypeConverterPtr decoder_;
     MediaSinkPtr sink_;
     // The following fields are just temporaries used to solve lambda capture
     // problems.
     MediaProducerPtr encoded_producer_;
     MediaProducerPtr decoded_producer_;
+    InterfaceHandle<MediaRenderer> renderer_;
   };
 
   MediaPlayerImpl(InterfaceHandle<SeekingReader> reader,
+                  InterfaceHandle<MediaRenderer> audio_renderer,
+                  InterfaceHandle<MediaRenderer> video_renderer,
                   InterfaceRequest<MediaPlayer> request,
                   MediaFactoryService* owner);
 
   // Takes action based on current state.
   void Update();
 
   // Handles seeking in paused state.
   void WhenPausedAndSeeking();
 
   // Handles seeking in paused state with flushed pipeline.
   void WhenFlushedAndSeeking();
 
   // Sets the timeline transform. transform_subject_time_ is used for the
   // subject_time, and the effective_reference_time is now plus
   // kMinimumLeadTime.
   void SetTimelineTransform(uint32_t reference_delta, uint32_t subject_delta);
 
   // Prepares a stream.
   void PrepareStream(Stream* stream,
                      size_t index,
                      const MediaTypePtr& input_media_type,
-                     const String& url,
                      const std::function<void()>& callback);
 
   // Creates a sink for a stream.
   void CreateSink(Stream* stream,
                   const MediaTypePtr& input_media_type,
-                  const String& url,
                   const std::function<void()>& callback);
 
   // Handles a metadata update from the demux. When called with the default
   // argument values, initiates demux metadata updates.
   void HandleDemuxMetadataUpdates(
       uint64_t version = MediaDemux::kInitialMetadata,
       MediaMetadataPtr metadata = nullptr);
 
   // Handles a status update from the control site. When called with the default
   // argument values, initiates control site. status updates.
@@ skipping 10 matching lines @@
   State state_ = State::kWaiting;
   State target_state_ = State::kPaused;
   bool flushed_ = true;
   bool end_of_stream_ = false;
   int64_t target_position_ = kUnspecifiedTime;
   int64_t transform_subject_time_ = kUnspecifiedTime;
   TimelineFunction timeline_function_;
   CallbackJoiner set_transform_joiner_;
   MediaMetadataPtr metadata_;
   MojoPublisher<GetStatusCallback> status_publisher_;
+  // The following fields are just temporaries used to solve lambda capture
+  // problems.
+  InterfaceHandle<MediaRenderer> audio_renderer_;
+  InterfaceHandle<MediaRenderer> video_renderer_;
 };
 
 }  // namespace media
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_MEDIA_FACTORY_MEDIA_PLAYER_IMPL_H_