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

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

Issue 12212079: Update Cdm Wrapper and ClearKeyCdm to work with CDM interface version 4. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 10 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
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_FAKE_CDM_VIDEO_DECODER_H_ 5 #ifndef WEBKIT_MEDIA_CRYPTO_PPAPI_FAKE_CDM_VIDEO_DECODER_H_
6 #define WEBKIT_MEDIA_CRYPTO_PPAPI_FAKE_CDM_VIDEO_DECODER_H_ 6 #define WEBKIT_MEDIA_CRYPTO_PPAPI_FAKE_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/content_decryption_module.h"
(...skipping 13 matching lines...) Expand all
24 virtual cdm::Status DecodeFrame(const uint8_t* compressed_frame, 24 virtual cdm::Status DecodeFrame(const uint8_t* compressed_frame,
25 int32_t compressed_frame_size, 25 int32_t compressed_frame_size,
26 int64_t timestamp, 26 int64_t timestamp,
27 cdm::VideoFrame* decoded_frame) OVERRIDE; 27 cdm::VideoFrame* decoded_frame) OVERRIDE;
28 virtual bool is_initialized() const OVERRIDE { return is_initialized_; } 28 virtual bool is_initialized() const OVERRIDE { return is_initialized_; }
29 29
30 private: 30 private:
31 bool is_initialized_; 31 bool is_initialized_;
32 cdm::Size video_size_; 32 cdm::Size video_size_;
33 33
34 cdm::Allocator* const allocator_; 34 cdm::Host* const host_;
35 35
36 DISALLOW_COPY_AND_ASSIGN(FakeCdmVideoDecoder); 36 DISALLOW_COPY_AND_ASSIGN(FakeCdmVideoDecoder);
37 }; 37 };
38 38
39 } // namespace webkit_media 39 } // namespace webkit_media
40 40
41 #endif // WEBKIT_MEDIA_CRYPTO_PPAPI_FAKE_CDM_VIDEO_DECODER_H_ 41 #endif // WEBKIT_MEDIA_CRYPTO_PPAPI_FAKE_CDM_VIDEO_DECODER_H_
OLDNEW
« no previous file with comments | « webkit/media/crypto/ppapi/clear_key_cdm.cc ('k') | webkit/media/crypto/ppapi/fake_cdm_video_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698