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

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

Issue 11189082: Update PluginInstance for audio support for content decryption. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix tests Created 8 years, 1 month 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 | « webkit/media/crypto/ppapi/cdm_wrapper.cc ('k') | webkit/media/crypto/ppapi/clear_key_cdm.cc » ('j') | 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) 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_CLEAR_KEY_CDM_H_ 5 #ifndef WEBKIT_MEDIA_CRYPTO_PPAPI_CLEAR_KEY_CDM_H_
6 #define WEBKIT_MEDIA_CRYPTO_PPAPI_CLEAR_KEY_CDM_H_ 6 #define WEBKIT_MEDIA_CRYPTO_PPAPI_CLEAR_KEY_CDM_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 const cdm::AudioDecoderConfig& audio_decoder_config) OVERRIDE; 57 const cdm::AudioDecoderConfig& audio_decoder_config) OVERRIDE;
58 virtual cdm::Status InitializeVideoDecoder( 58 virtual cdm::Status InitializeVideoDecoder(
59 const cdm::VideoDecoderConfig& video_decoder_config) OVERRIDE; 59 const cdm::VideoDecoderConfig& video_decoder_config) OVERRIDE;
60 virtual void DeinitializeDecoder(cdm::StreamType decoder_type) OVERRIDE; 60 virtual void DeinitializeDecoder(cdm::StreamType decoder_type) OVERRIDE;
61 virtual void ResetDecoder(cdm::StreamType decoder_type) OVERRIDE; 61 virtual void ResetDecoder(cdm::StreamType decoder_type) OVERRIDE;
62 virtual cdm::Status DecryptAndDecodeFrame( 62 virtual cdm::Status DecryptAndDecodeFrame(
63 const cdm::InputBuffer& encrypted_buffer, 63 const cdm::InputBuffer& encrypted_buffer,
64 cdm::VideoFrame* video_frame) OVERRIDE; 64 cdm::VideoFrame* video_frame) OVERRIDE;
65 virtual cdm::Status DecryptAndDecodeSamples( 65 virtual cdm::Status DecryptAndDecodeSamples(
66 const cdm::InputBuffer& encrypted_buffer, 66 const cdm::InputBuffer& encrypted_buffer,
67 cdm::Buffer* sample_buffer) OVERRIDE; 67 cdm::AudioFrames* audio_frames) OVERRIDE;
68 68
69 private: 69 private:
70 class Client : public media::DecryptorClient { 70 class Client : public media::DecryptorClient {
71 public: 71 public:
72 enum Status { 72 enum Status {
73 kKeyAdded, 73 kKeyAdded,
74 kKeyError, 74 kKeyError,
75 kKeyMessage, 75 kKeyMessage,
76 kNeedKey 76 kNeedKey
77 }; 77 };
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 #endif 144 #endif
145 145
146 #if defined(CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER) 146 #if defined(CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER)
147 cdm::Size video_size_; 147 cdm::Size video_size_;
148 #endif // CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER 148 #endif // CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER
149 }; 149 };
150 150
151 } // namespace webkit_media 151 } // namespace webkit_media
152 152
153 #endif // WEBKIT_MEDIA_CRYPTO_PPAPI_CLEAR_KEY_CDM_H_ 153 #endif // WEBKIT_MEDIA_CRYPTO_PPAPI_CLEAR_KEY_CDM_H_
OLDNEW
« no previous file with comments | « webkit/media/crypto/ppapi/cdm_wrapper.cc ('k') | webkit/media/crypto/ppapi/clear_key_cdm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698