Update PluginInstance for decrypt-and-decode video.

webkit/plugins/ppapi/ppapi_plugin_instance.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
 #define WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 243 matching lines @@
   // TODO(tomfinegan): Move decryptor methods to delegate class.
   void set_decrypt_client(media::DecryptorClient* client);
   bool GenerateKeyRequest(const std::string& key_system,
                           const std::string& init_data);
   bool AddKey(const std::string& session_id,
               const std::string& key,
               const std::string& init_data);
   bool CancelKeyRequest(const std::string& session_id);
   bool Decrypt(const scoped_refptr<media::DecoderBuffer>& encrypted_buffer,
                const media::Decryptor::DecryptCB& decrypt_cb);
-  // TODO(xhwang): Update this when we need to support decrypt and decode.
   bool DecryptAndDecodeFrame(
       const scoped_refptr<media::DecoderBuffer>& encrypted_frame,
-      const media::Decryptor::DecryptCB& decrypt_cb);
+      const media::Decryptor::VideoDecodeCB& video_decode_cb);
 
   // There are 2 implementations of the fullscreen interface
   // PPB_FlashFullscreen is used by Pepper Flash.
   // PPB_Fullscreen is intended for other applications including NaCl.
   // The two interface are mutually exclusive.
 
   // Implementation of PPB_FlashFullscreen.
 
   // Because going to fullscreen is asynchronous (but going out is not), there
   // are 3 states:
@@ skipping 471 matching lines @@
   // We store the arguments so we can re-send them if we are reset to talk to
   // NaCl via the IPC NaCl proxy.
   std::vector<std::string> argn_;
   std::vector<std::string> argv_;
 
   // This is NULL unless HandleDocumentLoad has called. In that case, we store
   // the pointer so we can re-send it later if we are reset to talk to NaCl.
   scoped_refptr<PPB_URLLoader_Impl> document_loader_;
 
   media::DecryptorClient* decryptor_client_;
+
+  // Request ID for tracking pending content decryption callbacks.
+  // Note that zero indicates an invalid request ID.
   uint32_t next_decryption_request_id_;
+
   typedef std::map<uint32_t, media::Decryptor::DecryptCB> DecryptionCBMap;
   DecryptionCBMap pending_decryption_cbs_;
 
+  uint32_t pending_video_decode_request_id_;
+  media::Decryptor::VideoDecodeCB pending_video_decode_cb_;

[ddorwin, 2012/10/08 19:05:57]

We have a list for decrypt-only and one for decode? This is fine for now
(getting decode working), but we should revisit this after adding audio.

[xhwang, 2012/10/08 20:50:51]

TODO added.

+
   DISALLOW_COPY_AND_ASSIGN(PluginInstance);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_