Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7)

Side by Side Diff: media/video/video_decode_accelerator.cc

Issue 317083003: Merge VideoDecodeAcceleratorImpl with VideoDecodeAccelerator (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add logging include Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « media/video/video_decode_accelerator.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/video/video_decode_accelerator.h" 5 #include "media/video/video_decode_accelerator.h"
6 6
7 #include "base/logging.h"
8
7 namespace media { 9 namespace media {
8 10
9 VideoDecodeAccelerator::~VideoDecodeAccelerator() {} 11 VideoDecodeAccelerator::~VideoDecodeAccelerator() {}
10 12
13 bool VideoDecodeAccelerator::CanDecodeOnIOThread() {
14 // GPU process subclasses must override this.
15 LOG(FATAL) << "This should only get called in the GPU process";
16 return false; // not reached
11 } 17 }
12 18
19 } // namespace media
20
13 namespace base { 21 namespace base {
14 22
15 void DefaultDeleter<media::VideoDecodeAccelerator>::operator()( 23 void DefaultDeleter<media::VideoDecodeAccelerator>::operator()(
16 void* video_decode_accelerator) const { 24 void* video_decode_accelerator) const {
17 static_cast<media::VideoDecodeAccelerator*>(video_decode_accelerator)-> 25 static_cast<media::VideoDecodeAccelerator*>(video_decode_accelerator)->
18 Destroy(); 26 Destroy();
19 } 27 }
20 28
21 } // namespace base 29 } // namespace base
22 30
23 31
OLDNEW
« no previous file with comments | « media/video/video_decode_accelerator.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698