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

Side by Side Diff: webkit/media/crypto/ppapi/libvpx_cdm_video_decoder.h

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 #ifndef WEBKIT_MEDIA_CRYPTO_PPAPI_LIBVPX_CDM_VIDEO_DECODER_H_ 5 #ifndef WEBKIT_MEDIA_CRYPTO_PPAPI_LIBVPX_CDM_VIDEO_DECODER_H_
6 #define WEBKIT_MEDIA_CRYPTO_PPAPI_LIBVPX_CDM_VIDEO_DECODER_H_ 6 #define WEBKIT_MEDIA_CRYPTO_PPAPI_LIBVPX_CDM_VIDEO_DECODER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "webkit/media/crypto/ppapi/cdm/content_decryption_module.h"
10 #include "webkit/media/crypto/ppapi/cdm_video_decoder.h" 11 #include "webkit/media/crypto/ppapi/cdm_video_decoder.h"
11 #include "webkit/media/crypto/ppapi/content_decryption_module.h"
12 12
13 struct vpx_codec_ctx; 13 struct vpx_codec_ctx;
14 struct vpx_image; 14 struct vpx_image;
15 15
16 namespace webkit_media { 16 namespace webkit_media {
17 17
18 class LibvpxCdmVideoDecoder : public CdmVideoDecoder { 18 class LibvpxCdmVideoDecoder : public CdmVideoDecoder {
19 public: 19 public:
20 explicit LibvpxCdmVideoDecoder(cdm::Allocator* allocator); 20 explicit LibvpxCdmVideoDecoder(cdm::Allocator* allocator);
21 virtual ~LibvpxCdmVideoDecoder(); 21 virtual ~LibvpxCdmVideoDecoder();
(...skipping 24 matching lines...) Expand all
46 46
47 vpx_codec_ctx* vpx_codec_; 47 vpx_codec_ctx* vpx_codec_;
48 vpx_image* vpx_image_; 48 vpx_image* vpx_image_;
49 49
50 DISALLOW_COPY_AND_ASSIGN(LibvpxCdmVideoDecoder); 50 DISALLOW_COPY_AND_ASSIGN(LibvpxCdmVideoDecoder);
51 }; 51 };
52 52
53 } // namespace webkit_media 53 } // namespace webkit_media
54 54
55 #endif // WEBKIT_MEDIA_CRYPTO_PPAPI_LIBVPX_CDM_VIDEO_DECODER_H_ 55 #endif // WEBKIT_MEDIA_CRYPTO_PPAPI_LIBVPX_CDM_VIDEO_DECODER_H_
OLDNEW
« no previous file with comments | « webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.cc ('k') | webkit/media/crypto/ppapi/libvpx_cdm_video_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698