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

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: add NOTREACHED for deserialization failure Created 8 years, 2 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_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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 const cdm::AudioDecoderConfig& audio_decoder_config) OVERRIDE; 50 const cdm::AudioDecoderConfig& audio_decoder_config) OVERRIDE;
51 virtual cdm::Status InitializeVideoDecoder( 51 virtual cdm::Status InitializeVideoDecoder(
52 const cdm::VideoDecoderConfig& video_decoder_config) OVERRIDE; 52 const cdm::VideoDecoderConfig& video_decoder_config) OVERRIDE;
53 virtual void DeinitializeDecoder(cdm::StreamType decoder_type) OVERRIDE; 53 virtual void DeinitializeDecoder(cdm::StreamType decoder_type) OVERRIDE;
54 virtual void ResetDecoder(cdm::StreamType decoder_type) OVERRIDE; 54 virtual void ResetDecoder(cdm::StreamType decoder_type) OVERRIDE;
55 virtual cdm::Status DecryptAndDecodeFrame( 55 virtual cdm::Status DecryptAndDecodeFrame(
56 const cdm::InputBuffer& encrypted_buffer, 56 const cdm::InputBuffer& encrypted_buffer,
57 cdm::VideoFrame* video_frame) OVERRIDE; 57 cdm::VideoFrame* video_frame) OVERRIDE;
58 virtual cdm::Status DecryptAndDecodeSamples( 58 virtual cdm::Status DecryptAndDecodeSamples(
59 const cdm::InputBuffer& encrypted_buffer, 59 const cdm::InputBuffer& encrypted_buffer,
60 cdm::Buffer* sample_buffer) OVERRIDE; 60 cdm::AudioFrames* audio_frames) OVERRIDE;
61 61
62 private: 62 private:
63 class Client : public media::DecryptorClient { 63 class Client : public media::DecryptorClient {
64 public: 64 public:
65 enum Status { 65 enum Status {
66 kKeyAdded, 66 kKeyAdded,
67 kKeyError, 67 kKeyError,
68 kKeyMessage, 68 kKeyMessage,
69 kNeedKey 69 kNeedKey
70 }; 70 };
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 cdm::Allocator* const allocator_; 121 cdm::Allocator* const allocator_;
122 122
123 #if defined(CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER) 123 #if defined(CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER)
124 cdm::Size video_size_; 124 cdm::Size video_size_;
125 #endif // CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER 125 #endif // CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER
126 }; 126 };
127 127
128 } // namespace webkit_media 128 } // namespace webkit_media
129 129
130 #endif // WEBKIT_MEDIA_CRYPTO_PPAPI_CLEAR_KEY_CDM_H_ 130 #endif // WEBKIT_MEDIA_CRYPTO_PPAPI_CLEAR_KEY_CDM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698