diff options
| author | spang@chromium.org <spang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-07 05:12:19 +0000 |
|---|---|---|
| committer | spang@chromium.org <spang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-07 05:12:19 +0000 |
| commit | 66580239c269aa4bab91f7832fb46f78a9b9b2c0 (patch) | |
| tree | b17ce48877548710f6689f7312ef258b58407c83 /media/video/video_decode_accelerator.cc | |
| parent | 4a4a9a3456e7bca681e043b2ba90e9b24fb3ceab (diff) | |
| download | chromium_src-66580239c269aa4bab91f7832fb46f78a9b9b2c0.zip chromium_src-66580239c269aa4bab91f7832fb46f78a9b9b2c0.tar.gz chromium_src-66580239c269aa4bab91f7832fb46f78a9b9b2c0.tar.bz2 | |
Merge VideoDecodeAcceleratorImpl with VideoDecodeAccelerator
This moves the single method CanDecodeOnIOThread on
VideoDecodeAcceleratorImpl to VideoDecodeAccelerator. The
implementations that were subclasses of VideoDecodeAcceleratorImpl now
get an override for CanDecodeOnIOThread that returns false.
TEST=linux desktop build
BUG=380884
Review URL: https://codereview.chromium.org/317083003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275621 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/video/video_decode_accelerator.cc')
| -rw-r--r-- | media/video/video_decode_accelerator.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/media/video/video_decode_accelerator.cc b/media/video/video_decode_accelerator.cc index 142dab3..a72912c 100644 --- a/media/video/video_decode_accelerator.cc +++ b/media/video/video_decode_accelerator.cc @@ -4,12 +4,20 @@ #include "media/video/video_decode_accelerator.h" +#include "base/logging.h" + namespace media { VideoDecodeAccelerator::~VideoDecodeAccelerator() {} +bool VideoDecodeAccelerator::CanDecodeOnIOThread() { + // GPU process subclasses must override this. + LOG(FATAL) << "This should only get called in the GPU process"; + return false; // not reached } +} // namespace media + namespace base { void DefaultDeleter<media::VideoDecodeAccelerator>::operator()( |