Plumb support for audio sample formats.

- Introduces a new PP_DecryptedSampleInfo structure which
contains the AudioFormat for use when delivering samples.
- Plumbs the structure through to ContentDecryptorDelegate.
- Extends the ContentDecryptorDelegate code to handle planar
data.
- Cleans up FFmpegCdmAudioDecoder to remove 3 memcpy's in the
common case (1 decode per packet) and 2 in the uncommon (> 1
decode per packet).

BUG=169105
TEST=eme browsertests

Review URL: https://codereview.chromium.org/26956002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230250 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 3 insertions, 3 deletions

diff --git a/ppapi/cpp/private/content_decryptor_private.cc b/ppapi/cpp/private/content_decryptor_private.cc
index 23417c3..8c7dcd2 100644
--- a/ppapi/cpp/private/content_decryptor_private.cc
+++ b/ppapi/cpp/private/content_decryptor_private.cc
@@ -330,12 +330,12 @@ void ContentDecryptor_Private::DeliverFrame(
 
 void ContentDecryptor_Private::DeliverSamples(
     pp::Buffer_Dev audio_frames,
-    const PP_DecryptedBlockInfo& decrypted_block_info) {
+    const PP_DecryptedSampleInfo& decrypted_sample_info) {
   if (has_interface<PPB_ContentDecryptor_Private>()) {
     get_interface<PPB_ContentDecryptor_Private>()->DeliverSamples(
         associated_instance_.pp_instance(),
         audio_frames.pp_resource(),
-        &decrypted_block_info);
+        &decrypted_sample_info);
   }
 }
 
diff --git a/ppapi/cpp/private/content_decryptor_private.h b/ppapi/cpp/private/content_decryptor_private.h
index a43a74c..ff98569 100644
--- a/ppapi/cpp/private/content_decryptor_private.h
+++ b/ppapi/cpp/private/content_decryptor_private.h
@@ -94,7 +94,7 @@ class ContentDecryptor_Private {
   // provided to DecryptAndDecode() when it calls this method. The browser will
   // reuse the buffer in a subsequent DecryptAndDecode() call.
   void DeliverSamples(pp::Buffer_Dev audio_frames,
-                      const PP_DecryptedBlockInfo& decrypted_block_info);
+                      const PP_DecryptedSampleInfo& decrypted_sample_info);
 
  private:
   InstanceHandle associated_instance_;