Generalize Pepper CDM API decrypt and decode.

webkit/media/crypto/ppapi/cdm_wrapper.cc

 // 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.
 
 #include <cstring>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 393 matching lines @@
   virtual void Decrypt(
       pp::Buffer_Dev encrypted_buffer,
       const PP_EncryptedBlockInfo& encrypted_block_info) OVERRIDE;
   virtual void InitializeVideoDecoder(
       const PP_VideoDecoderConfig& decoder_config,
       pp::Buffer_Dev extra_data_buffer) OVERRIDE;
   virtual void DeinitializeDecoder(PP_DecryptorStreamType decoder_type,
                                    uint32_t request_id) OVERRIDE;
   virtual void ResetDecoder(PP_DecryptorStreamType decoder_type,
                             uint32_t request_id) OVERRIDE;
-  virtual void DecryptAndDecodeFrame(
-      pp::Buffer_Dev encrypted_frame,
-      const PP_EncryptedVideoFrameInfo& encrypted_video_frame_info) OVERRIDE;
+  virtual void DecryptAndDecode(
+      PP_DecryptorStreamType decoder_type,
+      pp::Buffer_Dev encrypted_buffer,
+      const PP_EncryptedBlockInfo& encrypted_block_info) OVERRIDE;
 
   // CdmHost methods.
   virtual void SetTimer(int64 delay_ms) OVERRIDE;
   virtual double GetCurrentWallTimeMs() OVERRIDE;
 
  private:
   typedef linked_ptr<DecryptedBlockImpl> LinkedDecryptedBlock;
   typedef linked_ptr<KeyMessageImpl> LinkedKeyMessage;
   typedef linked_ptr<VideoFrameImpl> LinkedVideoFrame;
 
@@ skipping 189 matching lines @@
 
 void CdmWrapper::ResetDecoder(PP_DecryptorStreamType decoder_type,
                               uint32_t request_id) {
   // TODO(tomfinegan): Implement ResetDecoder in clear key CDM, and call it
   // here.
   CallOnMain(callback_factory_.NewCallback(&CdmWrapper::DecoderResetDone,
                                            decoder_type,
                                            request_id));
 }
 
-void CdmWrapper::DecryptAndDecodeFrame(
-    pp::Buffer_Dev encrypted_frame,
-    const PP_EncryptedVideoFrameInfo& encrypted_video_frame_info) {
-  PP_DCHECK(!encrypted_frame.is_null());
+void CdmWrapper::DecryptAndDecode(
+    PP_DecryptorStreamType decoder_type,
+    pp::Buffer_Dev encrypted_buffer,
+    const PP_EncryptedBlockInfo& encrypted_block_info) {
+  // TODO(tomfinegan): Remove this check when audio decoding is added.
+  PP_DCHECK(decoder_type == PP_DECRYPTORSTREAMTYPE_VIDEO);
+
+  PP_DCHECK(!encrypted_buffer.is_null());
   PP_DCHECK(cdm_);
 
   cdm::InputBuffer input_buffer;
   std::vector<cdm::SubsampleEntry> subsamples;
-  ConfigureInputBuffer(encrypted_frame,
-                       encrypted_video_frame_info.encryption_info,
+  ConfigureInputBuffer(encrypted_buffer,
+                       encrypted_block_info,
                        &subsamples,
                        &input_buffer);
 
   LinkedVideoFrame video_frame(new VideoFrameImpl());
   cdm::Status status = cdm_->DecryptAndDecodeFrame(input_buffer,
                                                    video_frame.get());
   CallOnMain(callback_factory_.NewCallback(
       &CdmWrapper::DeliverFrame,
       status,
       video_frame,
-      encrypted_video_frame_info.encryption_info.tracking_info));
+      encrypted_block_info.tracking_info));
 }
 
 void CdmWrapper::SetTimer(int64 delay_ms) {
   // NOTE: doesn't really need to run on the main thread; could just as well run
   // on a helper thread if |cdm_| were thread-friendly and care was taken.  We
   // only use CallOnMainThread() here to get delayed-execution behavior.
   pp::Module::Get()->core()->CallOnMainThread(
       delay_ms,
       callback_factory_.NewCallback(&CdmWrapper::TimerExpired),
       PP_OK);
@@ skipping 166 matching lines @@
 }  // namespace webkit_media
 
 namespace pp {
 
 // Factory function for your specialization of the Module object.
 Module* CreateModule() {
   return new webkit_media::CdmWrapperModule();
 }
 
 }  // namespace pp