Allow media track switching.

media/renderers/renderer_impl.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_RENDERERS_RENDERER_IMPL_H_
 #define MEDIA_RENDERERS_RENDERER_IMPL_H_
 
 #include <list>
 #include <memory>
 #include <vector>
@@ skipping 88 matching lines @@
   void OnAudioRendererInitializeDone(PipelineStatus status);
   void InitializeVideoRenderer();
   void OnVideoRendererInitializeDone(PipelineStatus status);
 
   // Helper functions and callbacks for Flush().
   void FlushAudioRenderer();
   void OnAudioRendererFlushDone();
   void FlushVideoRenderer();
   void OnVideoRendererFlushDone();
 
-  void RestartAudioRenderer(base::TimeDelta time);
-  void RestartVideoRenderer(base::TimeDelta time);
+  void RestartAudioRenderer(DemuxerStream* stream, base::TimeDelta time);

[xhwang, 2017/03/22 22:31:12]

Please add a comment about what the |stream| is, and what the |time| is for.

[servolk, 2017/03/23 17:08:10]

Done.

+  void OnAudioRendererReinitCompleted(DemuxerStream* stream,
+                                      base::TimeDelta time,
+                                      PipelineStatus status);

[xhwang, 2017/03/22 22:31:12]

naming nit: Are "Restart" and "Reinit" the same thing? Let's pick one an be
consistent.

[servolk, 2017/03/23 17:08:10]

No restart and reinit are different things. Reinit completely reinitializes the
renderer with a different DemuxerStream, which includes re-creating audio
decoders and re-running the decoder selection. Whereas restart simply restarts
the playback in audio renderer, for example after the media track has been
disabled and became re-enabled. I've made the comments above more detailed to
explain this.

+  void RestartVideoRenderer(DemuxerStream* stream, base::TimeDelta time);
+  void OnVideoRendererReinitCompleted(DemuxerStream* stream,
+                                      base::TimeDelta time,
+                                      PipelineStatus status);
 
   // Callback executed by filters to update statistics.
   void OnStatisticsUpdate(const PipelineStatistics& stats);
 
   // Collection of callback methods and helpers for tracking changes in
   // buffering state and transition from paused/underflow states and playing
   // states.
   //
   // While in the kPlaying state:
   //   - A waiting to non-waiting transition indicates preroll has completed
@@ skipping 38 matching lines @@
 
   // Temporary callback used for Initialize() and Flush().
   PipelineStatusCB init_cb_;
   base::Closure flush_cb_;
 
   std::unique_ptr<RendererClientInternal> audio_renderer_client_;
   std::unique_ptr<RendererClientInternal> video_renderer_client_;
   std::unique_ptr<AudioRenderer> audio_renderer_;
   std::unique_ptr<VideoRenderer> video_renderer_;
 
+  DemuxerStream* current_audio_stream_;
+  DemuxerStream* current_video_stream_;
+
   // Renderer-provided time source used to control playback.
   TimeSource* time_source_;
   std::unique_ptr<WallClockTimeSource> wall_clock_time_source_;
   bool time_ticking_;
   double playback_rate_;
 
   // The time to start playback from after starting/seeking has completed.
   base::TimeDelta start_time_;
 
   BufferingState audio_buffering_state_;
@@ skipping 25 matching lines @@
 
   base::WeakPtr<RendererImpl> weak_this_;
   base::WeakPtrFactory<RendererImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RendererImpl);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_RENDERERS_RENDERER_IMPL_H_