Move Pipeline permanent callbacks into Pipeline::Client interface.

media/base/pipeline_impl.h

 // Copyright (c) 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 MEDIA_BASE_PIPELINE_IMPL_H_
 #define MEDIA_BASE_PIPELINE_IMPL_H_
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ skipping 67 matching lines @@
   PipelineImpl(const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
                MediaLog* media_log);
   ~PipelineImpl() override;
 
   void SetErrorForTesting(PipelineStatus status);
   bool HasWeakPtrsForTesting() const;
 
   // Pipeline implementation.
   void Start(Demuxer* demuxer,
              scoped_ptr<Renderer> renderer,
-             const base::Closure& ended_cb,
-             const PipelineStatusCB& error_cb,
-             const PipelineStatusCB& seek_cb,
-             const PipelineMetadataCB& metadata_cb,
-             const BufferingStateCB& buffering_state_cb,
-             const base::Closure& duration_change_cb,
-             const AddTextTrackCB& add_text_track_cb,
-             const base::Closure& waiting_for_decryption_key_cb) override;
+             Client* client,

[xhwang, 2016/04/25 22:49:45]

Document that |client| call be called on any thread. See below for more
threading discussion.

+             const PipelineStatusCB& seek_cb) override;
   void Stop(const base::Closure& stop_cb) override;
   void Seek(base::TimeDelta time, const PipelineStatusCB& seek_cb) override;
   bool IsRunning() const override;
   double GetPlaybackRate() const override;
   void SetPlaybackRate(double playback_rate) override;
   void Suspend(const PipelineStatusCB& suspend_cb) override;
   void Resume(scoped_ptr<Renderer> renderer,
               base::TimeDelta timestamp,
               const PipelineStatusCB& seek_cb) override;
   float GetVolume() const override;
@@ skipping 43 matching lines @@
                      const TextTrackConfig& config) override;
   void RemoveTextStream(DemuxerStream* text_stream) override;
 
   // Callback executed when a rendering error happened, initiating the teardown
   // sequence.
   void OnError(PipelineStatus error);
 
   // Callback executed by filters to update statistics.
   void OnUpdateStatistics(const PipelineStatistics& stats_delta);
 
+  // Callback executed by renderer when waiting for decryption key.
+  void OnWaitingForDecryptionKey();
+
   // The following "task" methods correspond to the public methods, but these
   // methods are run as the result of posting a task to the Pipeline's
   // task runner.
   void StartTask();
 
   // Suspends the pipeline, discarding the current renderer.
   void SuspendTask(const PipelineStatusCB& suspend_cb);
 
   // Resumes the pipeline with a new renderer, and initializes it with a seek.
   void ResumeTask(scoped_ptr<Renderer> renderer,
@@ skipping 122 matching lines @@
 
   // Temporary callback used for Start(), Seek(), and Resume().
   PipelineStatusCB seek_cb_;
 
   // Temporary callback used for Stop().
   base::Closure stop_cb_;
 
   // Temporary callback used for Suspend().
   PipelineStatusCB suspend_cb_;
 
-  // Permanent callbacks passed in via Start().
-  base::Closure ended_cb_;
-  PipelineStatusCB error_cb_;
-  PipelineMetadataCB metadata_cb_;
-  BufferingStateCB buffering_state_cb_;
-  base::Closure duration_change_cb_;
-  AddTextTrackCB add_text_track_cb_;
-  base::Closure waiting_for_decryption_key_cb_;
-
   // Holds the initialized demuxer. Used for seeking. Owned by client.
   Demuxer* demuxer_;
 
   // Holds the initialized renderers. Used for setting the volume,
   // playback rate, and determining when playback has finished.
   scoped_ptr<Renderer> renderer_;
   scoped_ptr<TextRenderer> text_renderer_;
 
+  // Holds the client passed on Start().
+  Client* client_;
+
   PipelineStatistics statistics_;
 
   scoped_ptr<SerialRunner> pending_callbacks_;
 
   // The CdmContext to be used to decrypt (and decode) encrypted stream in this
   // pipeline. It is set when SetCdm() succeeds on the renderer (or when
   // SetCdm() is called before Start()), after which it is guaranteed to outlive
   // this pipeline. The saved value will be used to configure new renderers,
   // when starting or resuming.
   CdmContext* cdm_context_;
 
   base::ThreadChecker thread_checker_;
 
   // A weak pointer that can be safely copied on the media thread.
   base::WeakPtr<PipelineImpl> weak_this_;
 
   // Weak pointers must be created on the main thread, and must be dereferenced
   // on the media thread.
   //
   // Declared last so that weak pointers will be invalidated before all other
   // member variables.
   base::WeakPtrFactory<PipelineImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PipelineImpl);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_PIPELINE_IMPL_H_