Make mojo renderer capable of supporting multiple streams/tracks

media/mojo/clients/mojo_renderer.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 MEDIA_MOJO_CLIENTS_MOJO_RENDERER_H_
 #define MEDIA_MOJO_CLIENTS_MOJO_RENDERER_H_
 
 #include <stdint.h>
 
 #include "base/macros.h"
@@ skipping 78 matching lines @@
   // DemuxerSteamProvider::Type::STREAM.
   void InitializeRendererFromStreams(media::RendererClient* client);
 
   // Initialize the remote renderer when |demuxer_stream_provider| is of type
   // DemuxerSteamProvider::Type::URL.
   void InitializeRendererFromUrl(media::RendererClient* client);
 
   // Callback for connection error on |remote_renderer_|.
   void OnConnectionError();
 
-  // Callback for connection error on |audio_stream_| and |video_stream_|.
-  void OnDemuxerStreamConnectionError(DemuxerStream::Type type);
+  // Callback for connection error on any of |streams_|.
+  void OnDemuxerStreamConnectionError(MojoDemuxerStreamImpl* stream);

[xhwang, 2017/01/31 00:15:21]

Add comment about what |stream| means in this API (e.g. the stream where the
error happened on..)

[servolk, 2017/01/31 01:10:40]

Done.

 
   // Callbacks for |remote_renderer_| methods.
   void OnInitialized(media::RendererClient* client, bool success);
   void OnFlushed();
   void OnCdmAttached(bool success);
 
   void CancelPendingCallbacks();
 
   // |task_runner| on which all methods are invoked, except for GetMediaTime(),
   // which can be called on any thread.
@@ skipping 13 matching lines @@
 
   // Client of |this| renderer passed in Initialize.
   media::RendererClient* client_ = nullptr;
 
   // Mojo demuxer streams.
   // Owned by MojoRenderer instead of remote mojom::Renderer
   // becuase these demuxer streams need to be destroyed as soon as |this| is
   // destroyed. The local demuxer streams returned by DemuxerStreamProvider
   // cannot be used after |this| is destroyed.
   // TODO(alokp): Add tests for MojoDemuxerStreamImpl.
-  std::unique_ptr<MojoDemuxerStreamImpl> audio_stream_;
-  std::unique_ptr<MojoDemuxerStreamImpl> video_stream_;
+  std::vector<std::unique_ptr<MojoDemuxerStreamImpl>> streams_;

[xhwang, 2017/01/31 00:15:21]

nit: include <vector> and <memory>

[servolk, 2017/01/31 01:10:40]

Done.

 
   // This class is constructed on one thread and used exclusively on another
   // thread. This member is used to safely pass the RendererPtr from one thread
   // to another. It is set in the constructor and is consumed in Initialize().
   mojom::RendererPtrInfo remote_renderer_info_;
 
   // Remote Renderer, bound to |task_runner_| during Initialize().
   mojom::RendererPtr remote_renderer_;
 
   // Binding for RendererClient, bound to the |task_runner_|.
   mojo::AssociatedBinding<RendererClient> client_binding_;
 
   bool encountered_error_ = false;
 
   PipelineStatusCB init_cb_;
   base::Closure flush_cb_;
   CdmAttachedCB cdm_attached_cb_;
 
   // Lock used to serialize access for |time_interpolator_|.
   mutable base::Lock lock_;
   base::DefaultTickClock media_clock_;
   media::TimeDeltaInterpolator media_time_interpolator_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoRenderer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_MOJO_CLIENTS_MOJO_RENDERER_H_