| Index: media/filters/video_renderer_base.h
|
| diff --git a/media/filters/video_renderer_base.h b/media/filters/video_renderer_base.h
|
| index d48c97ccc74106475119f2b974b1b99f5a865494..d4a064c84732479c1e78a197bbcaedadda331868 100644
|
| --- a/media/filters/video_renderer_base.h
|
| +++ b/media/filters/video_renderer_base.h
|
| @@ -36,15 +36,6 @@ class VideoRendererBase
|
| VideoRendererBase();
|
| virtual ~VideoRendererBase();
|
|
|
| - // Helper method to parse out video-related information from a MediaFormat.
|
| - // Returns true all the required parameters are existent in |media_format|.
|
| - // |surface_format_out|, |width_out|, |height_out| can be NULL where the
|
| - // result is not needed.
|
| - static bool ParseMediaFormat(
|
| - const MediaFormat& media_format,
|
| - VideoFrame::Format* surface_format_out,
|
| - int* width_out, int* height_out);
|
| -
|
| // Filter implementation.
|
| virtual void Play(FilterCallback* callback);
|
| virtual void Pause(FilterCallback* callback);
|
| @@ -76,7 +67,7 @@ class VideoRendererBase
|
| // class takes place.
|
| //
|
| // Implementors typically use the media format of |decoder| to create their
|
| - // output surfaces. Implementors should NOT call InitializationComplete().
|
| + // output surfaces.
|
| virtual bool OnInitialize(VideoDecoder* decoder) = 0;
|
|
|
| // Subclass interface. Called after all other stopping actions take place.
|
| @@ -97,12 +88,6 @@ class VideoRendererBase
|
| // class executes on.
|
| virtual void OnFrameAvailable() = 0;
|
|
|
| - virtual VideoDecoder* GetDecoder();
|
| -
|
| - int width() { return width_; }
|
| - int height() { return height_; }
|
| - VideoFrame::Format surface_format() { return surface_format_; }
|
| -
|
| void ReadInput(scoped_refptr<VideoFrame> frame);
|
|
|
| private:
|
| @@ -141,10 +126,6 @@ class VideoRendererBase
|
|
|
| scoped_refptr<VideoDecoder> decoder_;
|
|
|
| - int width_;
|
| - int height_;
|
| - VideoFrame::Format surface_format_;
|
| -
|
| // Queue of incoming frames as well as the current frame since the last time
|
| // OnFrameAvailable() was called.
|
| typedef std::deque< scoped_refptr<VideoFrame> > VideoFrameQueue;
|
|
|