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

Side by Side Diff: webkit/media/crypto/ppapi_decryptor.h

Issue 11091005: Update PluginInstance for decrypt-and-decode video. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fix a bug in ppp_content_decryptor_private_proxy.cc 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
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_DECRYPTOR_H_ 5 #ifndef WEBKIT_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_
6 #define WEBKIT_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_ 6 #define WEBKIT_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 virtual void DecryptAndDecodeVideo( 59 virtual void DecryptAndDecodeVideo(
60 const scoped_refptr<media::DecoderBuffer>& encrypted, 60 const scoped_refptr<media::DecoderBuffer>& encrypted,
61 const VideoDecodeCB& video_decode_cb) OVERRIDE; 61 const VideoDecodeCB& video_decode_cb) OVERRIDE;
62 virtual void CancelDecryptAndDecodeVideo() OVERRIDE; 62 virtual void CancelDecryptAndDecodeVideo() OVERRIDE;
63 virtual void StopVideoDecoder() OVERRIDE; 63 virtual void StopVideoDecoder() OVERRIDE;
64 64
65 private: 65 private:
66 void ReportFailureToCallPlugin(const std::string& key_system, 66 void ReportFailureToCallPlugin(const std::string& key_system,
67 const std::string& session_id); 67 const std::string& session_id);
68 68
69 void OnVideoDecoderInitialized(bool success);
70
69 media::DecryptorClient* client_; 71 media::DecryptorClient* client_;
70 scoped_refptr<webkit::ppapi::PluginInstance> cdm_plugin_; 72 scoped_refptr<webkit::ppapi::PluginInstance> cdm_plugin_;
71 scoped_refptr<base::MessageLoopProxy> render_loop_proxy_; 73 scoped_refptr<base::MessageLoopProxy> render_loop_proxy_;
72 74
75 DecoderInitCB video_decoder_init_cb_;
73 KeyAddedCB key_added_cb_; 76 KeyAddedCB key_added_cb_;
74 77
75 DISALLOW_COPY_AND_ASSIGN(PpapiDecryptor); 78 DISALLOW_COPY_AND_ASSIGN(PpapiDecryptor);
76 }; 79 };
77 80
78 } // namespace webkit_media 81 } // namespace webkit_media
79 82
80 #endif // WEBKIT_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_ 83 #endif // WEBKIT_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698