Add video decoding support in the CDM interface.

webkit/media/crypto/ppapi/content_decryption_module.h

Index: webkit/media/crypto/ppapi/content_decryption_module.h
diff --git a/webkit/media/crypto/ppapi/content_decryption_module.h b/webkit/media/crypto/ppapi/content_decryption_module.h
index cb21258a6fb24feb19ab45813e34f3c15fb1082d..098e6e1462c2820165044a2d146ae7b184ec77fe 100644
--- a/webkit/media/crypto/ppapi/content_decryption_module.h
+++ b/webkit/media/crypto/ppapi/content_decryption_module.h
@@ -29,8 +29,11 @@ namespace cdm {
 
 enum Status {
   kSuccess = 0,
-  kErrorUnknown,
-  kErrorNoKey
+  kDecryptOnly,  // The CDM does not support to DecryptAndDecode() requested

[ddorwin, 2012/09/03 12:35:30]

"to" does not seem like the correct grammar.

+                 // decoder config but can still be used to do Decrypt() only.
+  kNeedMoreData,  // Decoder needs more data to produce a decoded frame/sample.
+  kNoKey,  // The decryption key is not available for decryption.
+  kError
 };
 
 // TODO(xhwang): Use int32_t instead of uint32_t for sizes here and below and
@@ -129,6 +132,76 @@ struct OutputBuffer {
   int64_t timestamp;  // Presentation timestamp in microseconds.
 };
 
+struct VideoFrame {
+  // Surface formats based on FOURCC labels, see:
+  // http://www.fourcc.org/yuv.php
+  enum Format {
+    kInvalidFormat = 0,  // Invalid format value.  Used for error reporting.
+    kEmpty,  // An empty frame.
+    kI420  // 12bpp YVU planar 1x1 Y, 2x2 UV samples.
+  };
+
+  struct Size {
+    Size() : width(0), height(0) {}
+    Size(int32_t width, int32_t height) : width(width), height(height) {}
+
+    int32_t width;
+    int32_t height;
+  };
+
+  static const int32_t kMaxPlanes = 3;
+
+  VideoFrame()
+      : format(kInvalidFormat),
+        timestamp(0) {
+    for (int i = 0; i < kMaxPlanes; ++i) {
+      strides[i] = 0;
+      data[i] = NULL;
+    }
+  }
+
+  Format format;
+
+  // Width and height of the video frame.
+  Size data_size;
+
+  // Array of strides for each plane, typically greater or equal to the width
+  // of the surface divided by the horizontal sampling period.  Note that
+  // strides can be negative.
+  int32_t strides[kMaxPlanes];
+
+  // Array of data pointers to each plane.
+  uint8_t* data[kMaxPlanes];
+
+  int64_t timestamp;  // Presentation timestamp in microseconds.
+};
+
+struct VideoDecoderConfig {
+  enum VideoCodec {
+    kUnknownVideoCodec = 0,
+    kCodecVP8
+  };
+
+  enum VideoCodecProfile {
+    kUnknownVideoCodecProfile = 0,
+    kVp8ProfileMain
+  };
+
+  VideoDecoderConfig()
+      : codec(kUnknownVideoCodec),
+        profile(kUnknownVideoCodecProfile),
+        format(VideoFrame::kInvalidFormat),
+        extra_data(NULL),
+        extra_data_size() {}
+
+  VideoCodec codec;
+  VideoCodecProfile profile;
+  VideoFrame::Format format;
+  VideoFrame::Size coded_size;
+  uint8_t* extra_data;
+  int32_t extra_data_size;
+};
+
 class ContentDecryptionModule {
  public:
   // Generates a |key_request| given the |init_data|.
@@ -136,7 +209,7 @@ class ContentDecryptionModule {
   // in which case the callee should have allocated memory for the output
   // parameters (e.g |session_id| in |key_request|) and passed the ownership
   // to the caller.
-  // Returns kErrorUnknown otherwise, in which case the output parameters should
+  // Returns kError otherwise, in which case the output parameters should
   // not be used by the caller.
   //
   // TODO(xhwang): It's not safe to pass the ownership of the dynamically
@@ -148,7 +221,7 @@ class ContentDecryptionModule {
 
   // Adds the |key| to the CDM to be associated with |key_id|.
   // Returns kSuccess if the key was successfully added.
-  // Returns kErrorUnknown otherwise.
+  // Returns kError otherwise.
   virtual Status AddKey(const char* session_id,
                         int session_id_size,
                         const uint8_t* key,
@@ -159,7 +232,7 @@ class ContentDecryptionModule {
   // Cancels any pending key request made to the CDM for |session_id|.
   // Returns kSuccess if all pending key requests for |session_id| were
   // successfully canceled or there was no key request to be canceled.
-  // Returns kErrorUnknown otherwise.
+  // Returns kError otherwise.
   virtual Status CancelKeyRequest(const char* session_id,
                                   int session_id_size) = 0;
 
@@ -167,10 +240,11 @@ class ContentDecryptionModule {
   // Returns kSuccess if decryption succeeded, in which case the callee
   // should have filled the |decrypted_buffer| and passed the ownership of
   // |data| in |decrypted_buffer| to the caller.
-  // Returns kErrorNoKey if the CDM did not have the necessary decryption key
+  // Returns kNoKey if the CDM did not have the necessary decryption key
   // to decrypt.
-  // Returns kErrorUnknown if any other error happened.
-  // In these two cases, |decrypted_buffer| should not be used by the caller.
+  // Returns kError if any other error happened.
+  // If the return value is not kSuccess, |decrypted_buffer| should be discarded
+  // and not be used by the caller.
   //
   // TODO(xhwang): It's not safe to pass the ownership of the dynamically
   // allocated memory over library boundaries. Fix it after related PPAPI change
@@ -178,6 +252,45 @@ class ContentDecryptionModule {
   virtual Status Decrypt(const InputBuffer& encrypted_buffer,
                          OutputBuffer* decrypted_buffer) = 0;
 
+  // Initializes the CDM video decoder with |video_decoder_config|. This
+  // function must be called before DecryptAndDecode() is called.
+  // Returns kSuccess if the |video_decoder_config| is supported and the CDM
+  // video decoder is successfully initialized.
+  // Returns kDecryptOnly if the |video_decoder_config| is not supported
+  // but the CDM can still be used to Decrypt() the video stream.
+  // Returns kError if |video_decoder_config| is not supported and the
+  // CDM can not be used (or is not allowed) to Decrypt() the video stream.
+  virtual Status InitializeVideoDecoder(
+      const VideoDecoderConfig& video_decoder_config) = 0;
+
+  // Decrypts the |encrypted_buffer| and decodes the decrypted buffer into a
+  // |video_frame|. Upon end-of-stream, the caller should call this function
+  // repeatedly with empty |encrypted_buffer| (|data| being NULL) until
+  // only empty |video_frame| (|format| being kEmpty) is produced.
+  // Returns kSuccess if decryption and decoding both succeeded, in which case
+  // the callee should have filled the |video_frame| and passed the ownership of
+  // |data| in |video_frame| 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
+  // a decoded frame (e.g. during initialization).
+  // Returns kError if any other (decryption or decoding) error happened.
+  // If the return value is not kSuccess, |video_frame| should be discarded and
+  // not be used by the caller.
+  //
+  // TODO(xhwang): It's not safe to pass the ownership of the dynamically
+  // allocated memory over library boundaries. Fix it after related PPAPI change
+  // and sample CDM are landed.
+  virtual Status DecryptAndDecodeVideo(const InputBuffer& encrypted_buffer,
+                                       VideoFrame* video_frame) = 0;
+
+  // Resets the CDM video decoder to an initialized clean state.
+  virtual void ResetVideoDecoder() = 0;
+
+  // Stops the CDM video decoder and set it to an uninitialized state. Note
+  // that a VideoDecoder cannot be re-initialized after it has been stopped.
+  virtual void StopVideoDecoder() = 0;
+
   virtual ~ContentDecryptionModule() {}
 };