diff options
| author | mlloyd@chromium.org <mlloyd@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-17 14:13:05 +0000 |
|---|---|---|
| committer | mlloyd@chromium.org <mlloyd@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-17 14:13:05 +0000 |
| commit | 425bbb99f4faa4bdf90d9bca09174baa467aeaae (patch) | |
| tree | 381893ee554de8b10f377bdd7bf7a4037f0183f1 /chrome/renderer/media | |
| parent | 6d0593200cd191372b5fefe26fedb1dea2b15a64 (diff) | |
| download | chromium_src-425bbb99f4faa4bdf90d9bca09174baa467aeaae.zip chromium_src-425bbb99f4faa4bdf90d9bca09174baa467aeaae.tar.gz chromium_src-425bbb99f4faa4bdf90d9bca09174baa467aeaae.tar.bz2 | |
Revert 59785 - Implement FakeGlVideoDecodeEngine using FakeGlVideoDecodeContext
Defines UploadToVideoFrame in VideoDecodeContext.
FakeGlVideoDecodeEngine now uses FakeGlVideoDecodeContext to video frame
allocation and uploading.
BUG=53714
TEST=Tree is green
Review URL: http://codereview.chromium.org/3312022
TBR=hclam@chromium.org
Review URL: http://codereview.chromium.org/3436014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59789 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/media')
| -rw-r--r-- | chrome/renderer/media/gles2_video_decode_context.cc | 5 | ||||
| -rw-r--r-- | chrome/renderer/media/gles2_video_decode_context.h | 5 |
2 files changed, 1 insertions, 9 deletions
diff --git a/chrome/renderer/media/gles2_video_decode_context.cc b/chrome/renderer/media/gles2_video_decode_context.cc index b7eec02..2c04282 100644 --- a/chrome/renderer/media/gles2_video_decode_context.cc +++ b/chrome/renderer/media/gles2_video_decode_context.cc @@ -29,11 +29,6 @@ void Gles2VideoDecodeContext::ReleaseAllVideoFrames() { // TODO(hclam): Implement. } -void Gles2VideoDecodeContext::UploadToVideoFrame( - void* buffer, scoped_refptr<media::VideoFrame> frame, Task* task) { - // TODO(hclam): Implement. -} - void Gles2VideoDecodeContext::Destroy(Task* task) { // TODO(hclam): Implement. } diff --git a/chrome/renderer/media/gles2_video_decode_context.h b/chrome/renderer/media/gles2_video_decode_context.h index 4f556ab..35958b6 100644 --- a/chrome/renderer/media/gles2_video_decode_context.h +++ b/chrome/renderer/media/gles2_video_decode_context.h @@ -99,10 +99,7 @@ class Gles2VideoDecodeContext : public media::VideoDecodeContext { int n, size_t width, size_t height, media::VideoFrame::Format format, std::vector<scoped_refptr<media::VideoFrame> >* frames, Task* task); virtual void ReleaseAllVideoFrames(); - virtual void UploadToVideoFrame(void* buffer, - scoped_refptr<media::VideoFrame> frame, - Task* task); - virtual void Destroy(Task* task); + virtual void Destroy(Task* task) = 0; //-------------------------------------------------------------------------- // Any thread |