diff options
author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-22 17:27:58 +0000 |
---|---|---|
committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-22 17:27:58 +0000 |
commit | 050b99242c2c385ff6b25658bc65b81b5576c12a (patch) | |
tree | bbb372f87f80ad93f7ab4a0c435b1089d5ceaa9d /content | |
parent | 83b62fe1a28679e8f325069d42474079e476675b (diff) | |
download | chromium_src-050b99242c2c385ff6b25658bc65b81b5576c12a.zip chromium_src-050b99242c2c385ff6b25658bc65b81b5576c12a.tar.gz chromium_src-050b99242c2c385ff6b25658bc65b81b5576c12a.tar.bz2 |
Remove VideoDecoder::ProvidesBuffer() and corresponding changes in VideoDecodeEngine.
Every implementation returned true so no reason to complicate client code.
Added OVERRIDE for relevant classes.
BUG=none
TEST=media_unittests, unit_tests
Review URL: http://codereview.chromium.org/7482007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93666 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r-- | content/renderer/media/capture_video_decoder.cc | 4 | ||||
-rw-r--r-- | content/renderer/media/capture_video_decoder.h | 1 | ||||
-rw-r--r-- | content/renderer/media/rtc_video_decoder.cc | 4 | ||||
-rw-r--r-- | content/renderer/media/rtc_video_decoder.h | 23 |
4 files changed, 12 insertions, 20 deletions
diff --git a/content/renderer/media/capture_video_decoder.cc b/content/renderer/media/capture_video_decoder.cc index e1d2db4..0ceb1ac 100644 --- a/content/renderer/media/capture_video_decoder.cc +++ b/content/renderer/media/capture_video_decoder.cc @@ -50,10 +50,6 @@ void CaptureVideoDecoder::ProduceVideoFrame( &CaptureVideoDecoder::ProduceVideoFrameOnDecoderThread, video_frame)); } -bool CaptureVideoDecoder::ProvidesBuffer() { - return true; -} - int CaptureVideoDecoder::width() { return capability_.width; } diff --git a/content/renderer/media/capture_video_decoder.h b/content/renderer/media/capture_video_decoder.h index 5391481..6176807 100644 --- a/content/renderer/media/capture_video_decoder.h +++ b/content/renderer/media/capture_video_decoder.h @@ -43,7 +43,6 @@ class CaptureVideoDecoder media::StatisticsCallback* stat_callback) OVERRIDE; virtual void ProduceVideoFrame( scoped_refptr<media::VideoFrame> video_frame) OVERRIDE; - virtual bool ProvidesBuffer() OVERRIDE; virtual int width() OVERRIDE; virtual int height() OVERRIDE; diff --git a/content/renderer/media/rtc_video_decoder.cc b/content/renderer/media/rtc_video_decoder.cc index 77be5c5..684e9ee 100644 --- a/content/renderer/media/rtc_video_decoder.cc +++ b/content/renderer/media/rtc_video_decoder.cc @@ -148,10 +148,6 @@ void RTCVideoDecoder::ProduceVideoFrame( frame_queue_available_.push_back(video_frame); } -bool RTCVideoDecoder::ProvidesBuffer() { - return true; -} - int RTCVideoDecoder::width() { return width_; } diff --git a/content/renderer/media/rtc_video_decoder.h b/content/renderer/media/rtc_video_decoder.h index a242b40..3575ab3 100644 --- a/content/renderer/media/rtc_video_decoder.h +++ b/content/renderer/media/rtc_video_decoder.h @@ -23,23 +23,24 @@ class RTCVideoDecoder virtual ~RTCVideoDecoder(); // Filter implementation. - virtual void Play(media::FilterCallback* callback); - virtual void Seek(base::TimeDelta time, const media::FilterStatusCB& cb); - virtual void Pause(media::FilterCallback* callback); - virtual void Stop(media::FilterCallback* callback); + virtual void Play(media::FilterCallback* callback) OVERRIDE; + virtual void Seek(base::TimeDelta time, + const media::FilterStatusCB& cb) OVERRIDE; + virtual void Pause(media::FilterCallback* callback) OVERRIDE; + virtual void Stop(media::FilterCallback* callback) OVERRIDE; // Decoder implementation. virtual void Initialize(media::DemuxerStream* demuxer_stream, media::FilterCallback* filter_callback, - media::StatisticsCallback* stat_callback); - virtual void ProduceVideoFrame(scoped_refptr<media::VideoFrame> video_frame); - virtual bool ProvidesBuffer(); - virtual int width(); - virtual int height(); + media::StatisticsCallback* stat_callback) OVERRIDE; + virtual void ProduceVideoFrame( + scoped_refptr<media::VideoFrame> video_frame) OVERRIDE; + virtual int width() OVERRIDE; + virtual int height() OVERRIDE; // cricket::VideoRenderer implementation - virtual bool SetSize(int width, int height, int reserved); - virtual bool RenderFrame(const cricket::VideoFrame* frame); + virtual bool SetSize(int width, int height, int reserved) OVERRIDE; + virtual bool RenderFrame(const cricket::VideoFrame* frame) OVERRIDE; private: friend class RTCVideoDecoderTest; |