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

Side by Side Diff: webkit/media/crypto/ppapi/fake_cdm_video_decoder.cc

Issue 11568045: Replace Chromium's content_decryption_module.h with the independent DEPS'd instance. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "webkit/media/crypto/ppapi/fake_cdm_video_decoder.h" 5 #include "webkit/media/crypto/ppapi/fake_cdm_video_decoder.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "webkit/media/crypto/ppapi/content_decryption_module.h" 8 #include "webkit/media/crypto/ppapi/cdm/content_decryption_module.h"
9 9
10 namespace webkit_media { 10 namespace webkit_media {
11 11
12 FakeCdmVideoDecoder::FakeCdmVideoDecoder(cdm::Allocator* allocator) 12 FakeCdmVideoDecoder::FakeCdmVideoDecoder(cdm::Allocator* allocator)
13 : is_initialized_(false), 13 : is_initialized_(false),
14 allocator_(allocator) { 14 allocator_(allocator) {
15 } 15 }
16 16
17 FakeCdmVideoDecoder::~FakeCdmVideoDecoder() { 17 FakeCdmVideoDecoder::~FakeCdmVideoDecoder() {
18 Deinitialize(); 18 Deinitialize();
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 static unsigned char color = 0; 83 static unsigned char color = 0;
84 color += 10; 84 color += 10;
85 85
86 memset(reinterpret_cast<void*>(decoded_frame->FrameBuffer()->Data()), 86 memset(reinterpret_cast<void*>(decoded_frame->FrameBuffer()->Data()),
87 color, frame_size); 87 color, frame_size);
88 88
89 return cdm::kSuccess; 89 return cdm::kSuccess;
90 } 90 }
91 91
92 } // namespace webkit_media 92 } // namespace webkit_media
OLDNEW
« no previous file with comments | « webkit/media/crypto/ppapi/fake_cdm_video_decoder.h ('k') | webkit/media/crypto/ppapi/ffmpeg_cdm_audio_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698