Update Decryptor interface to support audio decoding.

webkit/media/crypto/ppapi/clear_key_cdm.cc

Index: webkit/media/crypto/ppapi/clear_key_cdm.cc
diff --git a/webkit/media/crypto/ppapi/clear_key_cdm.cc b/webkit/media/crypto/ppapi/clear_key_cdm.cc
index af526c962543540304045897c5e19f981f98fe2f..83cad79972bb3433b0be3855df90dee8999e9617 100644
--- a/webkit/media/crypto/ppapi/clear_key_cdm.cc
+++ b/webkit/media/crypto/ppapi/clear_key_cdm.cc
@@ -213,7 +213,9 @@ cdm::Status ClearKeyCdm::Decrypt(
   // Callback is called synchronously, so we can use variables on the stack.
   media::Decryptor::Status status;
   scoped_refptr<media::DecoderBuffer> buffer;
-  decryptor_.Decrypt(decoder_buffer,
+  // We don't care what stream type it is here. So just pick video.

[ddorwin, 2012/10/17 02:52:33]

I've been wondering why we need stream type in Decrypt(). Is there anything we
might actually do with it?

[xhwang, 2012/10/17 22:29:06]

Yep. Remember that we need to be able to cancel only one stream? To do that, we
first need to track which stream is doing the decryption.

[ddorwin, 2012/10/17 23:26:31]

When/where will that be implemented?

[xhwang, 2012/10/18 04:33:16]

After we have decrypt-and-decode working, I'll add DecryptingDemuxerStream,
which will be our new solution for decrypt-only for both audio and video.

+  decryptor_.Decrypt(media::Decryptor::kVideo,
+                     decoder_buffer,
                      base::Bind(&CopyDecryptResults, &status, &buffer));
 
   if (status == media::Decryptor::kError)
@@ -267,7 +269,8 @@ cdm::Status ClearKeyCdm::DecryptAndDecodeFrame(
   // Callback is called synchronously, so we can use variables on the stack.
   media::Decryptor::Status status;
   scoped_refptr<media::DecoderBuffer> buffer;
-  decryptor_.Decrypt(decoder_buffer,
+  decryptor_.Decrypt(media::Decryptor::kVideo,
+                     decoder_buffer,
                      base::Bind(&CopyDecryptResults, &status, &buffer));
 
   if (status == media::Decryptor::kError)