Update PluginInstance for audio support for content decryption.

webkit/media/crypto/ppapi/cdm_wrapper.cc

Index: webkit/media/crypto/ppapi/cdm_wrapper.cc
diff --git a/webkit/media/crypto/ppapi/cdm_wrapper.cc b/webkit/media/crypto/ppapi/cdm_wrapper.cc
index 2180c342ac099e12bc0fc6134dcf82196e34f894..9d12f8adedb5d05164f98e30fc23bfc9ce94b7c3 100644
--- a/webkit/media/crypto/ppapi/cdm_wrapper.cc
+++ b/webkit/media/crypto/ppapi/cdm_wrapper.cc
@@ -404,6 +404,28 @@ int64_t VideoFrameImpl::timestamp() const {
   return timestamp_;
 }
 
+class AudioFramesImpl : public cdm::AudioFrames {
+ public:
+  AudioFramesImpl() : buffer_(NULL) {}
+  virtual ~AudioFramesImpl() {
+    if (buffer_)
+      buffer_->Destroy();
+  }
+
+  // AudioFrames implementation.
+  virtual void set_buffer(cdm::Buffer* buffer) OVERRIDE {
+    buffer_ = static_cast<PpbBuffer*>(buffer);
+  }
+  virtual cdm::Buffer* buffer() OVERRIDE {
+    return buffer_;
+  }
+
+ private:
+  PpbBuffer* buffer_;
+
+  DISALLOW_COPY_AND_ASSIGN(AudioFramesImpl);
+};
+
 // A wrapper class for abstracting away PPAPI interaction and threading for a
 // Content Decryption Module (CDM).
 class CdmWrapper : public pp::Instance,
@@ -451,6 +473,7 @@ class CdmWrapper : public pp::Instance,
   typedef linked_ptr<DecryptedBlockImpl> LinkedDecryptedBlock;
   typedef linked_ptr<KeyMessageImpl> LinkedKeyMessage;
   typedef linked_ptr<VideoFrameImpl> LinkedVideoFrame;
+  typedef linked_ptr<AudioFramesImpl> LinkedAudioFrames;
 
   // <code>PPB_ContentDecryptor_Private</code> dispatchers. These are passed to
   // <code>callback_factory_</code> to ensure that calls into
@@ -476,6 +499,10 @@ class CdmWrapper : public pp::Instance,
                     const cdm::Status& status,
                     const LinkedVideoFrame& video_frame,
                     const PP_DecryptTrackingInfo& tracking_info);
+  void DeliverSamples(int32_t result,
+                      const cdm::Status& status,
+                      const LinkedAudioFrames& audio_frames,
+                      const PP_DecryptTrackingInfo& tracking_info);
 
   // Helper for SetTimer().
   void TimerExpired(int32 result);
@@ -678,8 +705,6 @@ 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(cdm_);
 
   cdm::InputBuffer input_buffer;
@@ -691,14 +716,34 @@ void CdmWrapper::DecryptAndDecode(
                          &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_block_info.tracking_info));
+  cdm::Status status = cdm::kDecodeError;
+  switch (decoder_type) {
+    case PP_DECRYPTORSTREAMTYPE_VIDEO: {
+      LinkedVideoFrame video_frame(new VideoFrameImpl());
+      status = cdm_->DecryptAndDecodeFrame(input_buffer, video_frame.get());
+      CallOnMain(callback_factory_.NewCallback(
+          &CdmWrapper::DeliverFrame,
+          status,
+          video_frame,
+          encrypted_block_info.tracking_info));
+      return;
+    }
+
+    case PP_DECRYPTORSTREAMTYPE_AUDIO: {
+      LinkedAudioFrames audio_frames(new AudioFramesImpl());
+      status = cdm_->DecryptAndDecodeSamples(input_buffer, audio_frames.get());
+      CallOnMain(callback_factory_.NewCallback(
+          &CdmWrapper::DeliverSamples,
+          status,
+          audio_frames,
+          encrypted_block_info.tracking_info));
+      return;
+    }
+
+    default:
+      PP_NOTREACHED();
+      return;
+  }
 }
 
 void CdmWrapper::SetTimer(int64 delay_ms) {
@@ -875,6 +920,45 @@ void CdmWrapper::DeliverFrame(
   pp::ContentDecryptor_Private::DeliverFrame(buffer, decrypted_frame_info);
 }
 
+void CdmWrapper::DeliverSamples(int32_t result,
+                                const cdm::Status& status,
+                                const LinkedAudioFrames& audio_frames,
+                                const PP_DecryptTrackingInfo& tracking_info) {
+  PP_DCHECK(result == PP_OK);
+  // TODO(tomfinegan): Add PP_DecryptedSamplesInfo (or better name) for
+  // cdm::AudioFrames.

[Tom Finegan, 2012/10/23 03:15:27]

Why do we need PP_DecryptedSamplesInfo? Does the media side need more
information than what will be serialized in the pp::Buffer_Dev?

[xhwang, 2012/10/23 03:25:09]

We still need the decrypt result and request ID. We can keep using
PP_DecryptTrackingInfo and make sure the media side ignores the timestamp in the
trackinginfo. WDYT?

+  PP_DecryptedBlockInfo decrypted_block_info;
+  decrypted_block_info.tracking_info = tracking_info;
+  // TODO(tomfinegan): Remove this after PP_DecryptedSamplesInfo is added.
+  decrypted_block_info.tracking_info.timestamp = 0;

[Tom Finegan, 2012/10/23 03:15:27]

Ditto about PP_DSI, and setting this to 0 will be fine when the timestamps come
out of the pp::Buffer_Dev, right?

[xhwang, 2012/10/23 03:25:09]

ditto

+
+  switch (status) {
+    case cdm::kSuccess:
+      decrypted_block_info.result = PP_DECRYPTRESULT_SUCCESS;
+      PP_DCHECK(audio_frames.get() && audio_frames->buffer());
+      break;
+    case cdm::kNeedMoreData:
+      decrypted_block_info.result = PP_DECRYPTRESULT_SUCCESS;
+      break;
+    case cdm::kNoKey:
+      decrypted_block_info.result = PP_DECRYPTRESULT_DECRYPT_NOKEY;
+      break;
+    case cdm::kDecryptError:
+      decrypted_block_info.result = PP_DECRYPTRESULT_DECRYPT_ERROR;
+      break;
+    default:
+      PP_DCHECK(false);
+      decrypted_block_info.result = PP_DECRYPTRESULT_DECRYPT_ERROR;
+  }
+
+  const pp::Buffer_Dev& buffer =
+      audio_frames.get() && audio_frames->buffer() ?
+      static_cast<PpbBuffer*>(audio_frames->buffer())->buffer_dev() :
+          pp::Buffer_Dev();
+
+  pp::ContentDecryptor_Private::DeliverSamples(buffer, decrypted_block_info);
+}
+
 
 // This object is the global object representing this plugin library as long
 // as it is loaded.