Update PluginInstance for audio support for content decryption.

webkit/media/crypto/ppapi/content_decryption_module.h

 // 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.
 
 #ifndef WEBKIT_MEDIA_CRYPTO_PPAPI_CONTENT_DECRYPTION_MODULE_H_
 #define WEBKIT_MEDIA_CRYPTO_PPAPI_CONTENT_DECRYPTION_MODULE_H_
 
 #if defined(_MSC_VER)
 typedef unsigned char uint8_t;
 typedef unsigned int uint32_t;
 typedef int int32_t;
 typedef __int64 int64_t;
 #else
 #include <stdint.h>
 #endif
 
 #include "webkit/media/crypto/ppapi/cdm_export.h"
 
 namespace cdm {
 class Allocator;
-class Buffer;
 class CdmHost;
 class ContentDecryptionModule;
-class DecryptedBlock;
-class KeyMessage;
-class VideoFrame;
 }
 
 extern "C" {
 // Caller retains ownership of arguments, which must outlive the call to
 // DestroyCdmInstance below.
 CDM_EXPORT cdm::ContentDecryptionModule* CreateCdmInstance(
     cdm::Allocator* allocator, cdm::CdmHost* host);
 CDM_EXPORT void DestroyCdmInstance(cdm::ContentDecryptionModule* instance);
 CDM_EXPORT const char* GetCdmVersion();
 }
 
 namespace cdm {
 
+class AudioFrames;
+class Buffer;
+class DecryptedBlock;
+class KeyMessage;
+class VideoFrame;
+
 enum Status {
   kSuccess = 0,
   kNeedMoreData,  // Decoder needs more data to produce a decoded frame/sample.
   kNoKey,  // The required decryption key is not available.
   kSessionError,  // Session management error.
   kDecryptError,  // Decryption failed.
   kDecodeError  // Error decoding audio or video.
 };
 
 // An input buffer can be split into several continuous subsamples.
@@ skipping 258 matching lines @@
   // the callee will have filled |audio_frames| and passed the ownership of
   // |data| in |audio_frames| to the caller.
   // Returns kNoKey if the CDM did not have the necessary decryption key
   // to decrypt.
   // Returns kNeedMoreData if more data was needed by the decoder to generate
   // audio samples (e.g. during initialization and end-of-stream).
   // Returns kDecryptError if any decryption error happened.
   // Returns kDecodeError if any decoding error happened.
   // If the return value is not kSuccess, |audio_frames| should be ignored by
   // the caller.
-  //
-  // |audio_frames| can contain multiple audio output buffers. Each buffer must
-  // be serialized in this format:
-  //
-  // |<------------------- serialized audio buffer ------------------->|
-  // | int64_t timestamp | int64_t length | length bytes of audio data |
-  //
-  // For example, with three audio output buffers, |audio_frames| will look
-  // like this:
-  //
-  // |<---------------- audio_frames ------------------>|
-  // | audio buffer 0 | audio buffer 1 | audio buffer 2 |
   virtual Status DecryptAndDecodeSamples(const InputBuffer& encrypted_buffer,
-                                         Buffer* audio_frames) = 0;
+                                         AudioFrames* audio_frames) = 0;
 
   virtual ~ContentDecryptionModule() {}
 };
 
 // Represents a buffer created by Allocator implementations.
 class Buffer {
  public:
   // Destroys the buffer in the same context as it was created.
   virtual void Destroy() = 0;
 
@@ skipping 66 matching lines @@
   virtual int32_t default_url_length() const = 0;
 
  protected:
   KeyMessage() {}
   virtual ~KeyMessage() {}
 };
 
 class VideoFrame {
  public:
   enum VideoPlane {
-   kYPlane = 0,
-   kUPlane = 1,
-   kVPlane = 2,
-   kMaxPlanes = 3,
+    kYPlane = 0,
+    kUPlane = 1,
+    kVPlane = 2,
+    kMaxPlanes = 3,
   };
 
   virtual void set_format(VideoFormat format) = 0;
   virtual VideoFormat format() const = 0;
 
   virtual void set_size(cdm::Size size) = 0;
   virtual cdm::Size size() const = 0;
 
   virtual void set_frame_buffer(Buffer* frame_buffer) = 0;
   virtual Buffer* frame_buffer() = 0;
 
   virtual void set_plane_offset(VideoPlane plane, int32_t offset) = 0;
   virtual int32_t plane_offset(VideoPlane plane) = 0;
 
   virtual void set_stride(VideoPlane plane, int32_t stride) = 0;
   virtual int32_t stride(VideoPlane plane) = 0;
 
   virtual void set_timestamp(int64_t timestamp) = 0;
   virtual int64_t timestamp() const = 0;
 
  protected:
-   VideoFrame() {}
-   virtual ~VideoFrame() {}
+  VideoFrame() {}
+  virtual ~VideoFrame() {}
+};
+
+// Represents decrypted and decoded audio frames. AudioFrames can contain
+// multiple audio output buffers, which are serialized into this format:
+//
+// |<------------------- serialized audio buffer ------------------->|
+// | int64_t timestamp | int64_t length | length bytes of audio data |
+//
+// For example, with three audio output buffers, the AudioFrames will look
+// like this:
+//
+// |<----------------- AudioFrames ------------------>|
+// | audio buffer 0 | audio buffer 1 | audio buffer 2 |
+class AudioFrames {
+ public:
+  virtual void set_buffer(Buffer* buffer) = 0;
+  virtual Buffer* buffer() = 0;
+
+ protected:
+  AudioFrames() {}
+  virtual ~AudioFrames() {}
 };
 
 }  // namespace cdm
 
 #endif  // WEBKIT_MEDIA_CRYPTO_PPAPI_CONTENT_DECRYPTION_MODULE_H_