Update Decryptor interface to support audio decoding.

webkit/media/crypto/ppapi/clear_key_cdm.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 "webkit/media/crypto/ppapi/clear_key_cdm.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 195 matching lines @@
     const cdm::InputBuffer& encrypted_buffer,
     cdm::DecryptedBlock* decrypted_block) {
   DVLOG(1) << "Decrypt()";
 
   scoped_refptr<media::DecoderBuffer> decoder_buffer =
       CopyDecoderBufferFrom(encrypted_buffer);
 
   // 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.
+  decryptor_.Decrypt(media::Decryptor::kVideo,
+                     decoder_buffer,
                      base::Bind(&CopyDecryptResults, &status, &buffer));
 
   if (status == media::Decryptor::kError)
     return cdm::kDecryptError;
 
   if (status == media::Decryptor::kNoKey)
     return cdm::kNoKey;
 
   DCHECK(buffer);
   int data_size = buffer->GetDataSize();
@@ skipping 33 matching lines @@
     video_frame->set_format(cdm::kEmptyVideoFrame);
     return cdm::kSuccess;
   }
 
   scoped_refptr<media::DecoderBuffer> decoder_buffer =
       CopyDecoderBufferFrom(encrypted_buffer);
 
   // 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)
     return cdm::kDecryptError;
 
   if (status == media::Decryptor::kNoKey)
     return cdm::kNoKey;
 
 #if !defined(CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER)
   NOTIMPLEMENTED();
   return cdm::kDecodeError;
 #else
   GenerateFakeVideoFrame(decoder_buffer->GetTimestamp(), video_frame);
   return cdm::kSuccess;
 #endif  // CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER
 }
 
 #if defined(CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER)
 void ClearKeyCdm::GenerateFakeVideoFrame(base::TimeDelta timestamp,
                                          cdm::VideoFrame* video_frame) {
   // Choose non-zero alignment and padding on purpose for testing.
   const int kAlignment = 8;
   const int kPadding = 16;
   const int kPlanePadding = 128;
 
   int width = video_size_.width;
   int height = video_size_.height;
-  DCHECK(width % 2 == 0);
-  DCHECK(height % 2 == 0);
+  DCHECK_EQ(width % 2, 0);
+  DCHECK_EQ(height % 2, 0);
 
   int y_stride = (width + kAlignment - 1) / kAlignment * kAlignment + kPadding;
   int uv_stride =
       (width / 2 + kAlignment - 1) / kAlignment * kAlignment + kPadding;
   int y_rows = height;
   int uv_rows = height / 2;
   int y_offset = 0;
   int v_offset = y_stride * y_rows + kPlanePadding;
   int u_offset = v_offset + uv_stride * uv_rows + kPlanePadding;
   int frame_size = u_offset + uv_stride * uv_rows + kPlanePadding;
@@ skipping 11 matching lines @@
 
   static unsigned char color = 0;
   color += 10;
 
   memset(reinterpret_cast<void*>(video_frame->frame_buffer()->data()),
          color, frame_size);
 }
 #endif  // CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER
 
 }  // namespace webkit_media