diff options
| author | jiesun@google.com <jiesun@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-10 19:31:00 +0000 |
|---|---|---|
| committer | jiesun@google.com <jiesun@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-10 19:31:00 +0000 |
| commit | 76951557d48f011a54c4f30852a69da172af194e (patch) | |
| tree | fc5ceeb48d8e420f8cf16fd9b24675710207de15 /media/base/mock_filters.h | |
| parent | 2fb73f5686e56dc2deed016d851bc456c15732b6 (diff) | |
| download | chromium_src-76951557d48f011a54c4f30852a69da172af194e.zip chromium_src-76951557d48f011a54c4f30852a69da172af194e.tar.gz chromium_src-76951557d48f011a54c4f30852a69da172af194e.tar.bz2 | |
preparation for recycling buffer, patch 2
1. add ProvidesBuffer in Filter interface, not used yet.
2. add Flush stage in pipeline. not used. Render's pause work is moved to Renderer's flush().
3. merge decoder_base with ffmpeg_video_decoder. because it is shared by audio.
Review URL: http://codereview.chromium.org/3030013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55603 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/mock_filters.h')
| -rw-r--r-- | media/base/mock_filters.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/base/mock_filters.h b/media/base/mock_filters.h index ac9aab6..7f1bdaf 100644 --- a/media/base/mock_filters.h +++ b/media/base/mock_filters.h @@ -172,6 +172,7 @@ class MockVideoDecoder : public VideoDecoder { FilterCallback* callback)); MOCK_METHOD0(media_format, const MediaFormat&()); MOCK_METHOD1(FillThisBuffer, void(scoped_refptr<VideoFrame>)); + MOCK_METHOD0(ProvidesBuffer, bool()); protected: virtual ~MockVideoDecoder() {} @@ -222,6 +223,7 @@ class MockVideoRenderer : public VideoRenderer { MOCK_METHOD2(Initialize, void(VideoDecoder* decoder, FilterCallback* callback)); MOCK_METHOD0(HasEnded, bool()); + MOCK_METHOD1(FillThisBufferDone, void(scoped_refptr<VideoFrame> frame)); protected: virtual ~MockVideoRenderer() {} |