Chromium Code Reviews| Index: media/base/filters.h |
| diff --git a/media/base/filters.h b/media/base/filters.h |
| index 50dc686383d67729246b62e3f66bf9f54f7be1d6..756b69b746904bf7ca35364a05ed2365c009cfc1 100644 |
| --- a/media/base/filters.h |
| +++ b/media/base/filters.h |
| @@ -164,8 +164,16 @@ class MEDIA_EXPORT VideoDecoder : public Filter { |
| protected: |
| VideoDecoder(); |
| virtual ~VideoDecoder(); |
| -}; |
| + private: |
| + // These functions will be removed later. Declare here to make sure they are |
| + // not called from VideoDecoder interface anymore. |
| + // TODO(xhwang): Remove them when VideoDecoder is not a Filter any more. |
|
Ami GONE FROM CHROMIUM
2012/03/14 22:42:50
Include the crbug # in the TODO
xhwang
2012/03/14 22:59:42
Done.
|
| + virtual void Play(const base::Closure& callback) OVERRIDE; |
| + virtual void Pause(const base::Closure& callback) OVERRIDE; |
| + virtual void Seek(base::TimeDelta time, |
| + const FilterStatusCB& callback) OVERRIDE; |
| +}; |
| class MEDIA_EXPORT VideoRenderer : public Filter { |
| public: |
| @@ -175,8 +183,8 @@ class MEDIA_EXPORT VideoRenderer : public Filter { |
| // Initialize a VideoRenderer with the given VideoDecoder, executing the |
| // callback upon completion. |
| - virtual void Initialize(VideoDecoder* decoder, |
| - const PipelineStatusCB& callback, |
| + virtual void Initialize(const scoped_refptr<VideoDecoder>& decoder, |
| + const PipelineStatusCB& pipeline_status_cb, |
| const StatisticsCB& statistics_cb, |
| const VideoTimeCB& time_cb) = 0; |
| @@ -185,7 +193,6 @@ class MEDIA_EXPORT VideoRenderer : public Filter { |
| virtual bool HasEnded() = 0; |
| }; |
| - |
| class MEDIA_EXPORT AudioRenderer : public Filter { |
| public: |
| // Used to update the pipeline's clock time. The first parameter is the |