Add decoder de-initialize and reset to the Pepper CDM API.

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;
@@ skipping 139 matching lines @@
   // Width and height of video frame immediately post-decode. Not all pixels
   // in this region are valid.
   Size coded_size;
 
   // Optional byte data required to initialize video decoders, such as H.264
   // AAVC data.
   uint8_t* extra_data;
   int32_t extra_data_size;
 };
 
+enum StreamType {
+  kStreamTypeAudio = 0,
+  kStreamTypeVideo = 1
+};
+
 // ContentDecryptionModule interface that all CDMs need to implement.
 // Note: ContentDecryptionModule implementations must use the allocator
 // provided in CreateCdmInstance() to allocate any Buffer that needs to
 // be passed back to the caller. Implementations must call Buffer::Destroy()
 // when a Buffer is created that will never be returned to the caller.
 class ContentDecryptionModule {
  public:
   // Generates a |key_request| given the |init_data|.
   //
   // Returns kSuccess if the key request was successfully generated,
@@ skipping 54 matching lines @@
   // may still be able to do Decrypt().
   //
   // TODO(tomfinegan): Determine the proper error to return here once there
   // are callers for this method.
   //
   // TODO(xhwang): Add stream ID here and in the following video decoder
   // functions when we need to support multiple video streams in one CDM.
   virtual Status InitializeVideoDecoder(
       const VideoDecoderConfig& video_decoder_config) = 0;
 
+  // De-initializes the CDM decoder and sets it to an uninitialized state. The
+  // caller can initialize the decoder again after this call to re-initialize
+  // it. This can be used to reconfigure the decoder if the configuration
+  // changes.
+  virtual void DeinitializeDecoder(StreamType decoder_type) = 0;
+
+  // Resets the CDM decoder to an initialized clean state. All internal buffers
+  // MUST be flushed.
+  virtual void ResetDecoder(StreamType decoder_type) = 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| == NULL) until only empty
   // |video_frame| (|format| == kEmptyVideoFrame) 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 kDecryptError if any decryption error happened.
   // Returns kDecodeError if any decoding error happened.
   // If the return value is not kSuccess, |video_frame| should be ignored by
   // the caller.
   virtual Status DecryptAndDecodeFrame(const InputBuffer& encrypted_buffer,
                                        VideoFrame* video_frame) = 0;
 
-  // Resets the CDM video decoder to an initialized clean state. All internal
-  // buffers will be flushed.
-  virtual void ResetVideoDecoder() = 0;
-
-  // Stops the CDM video decoder and sets it to an uninitialized state. The
-  // caller can call InitializeVideoDecoder() again after this call to
-  // re-initialize the video decoder. This can be used to reconfigure the
-  // video decoder if the config changes.
-  virtual void StopVideoDecoder() = 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;
 
   virtual uint8_t* data() = 0;
@@ skipping 94 matching lines @@
   virtual int64_t timestamp() const = 0;
 
  protected:
    VideoFrame() {}
    virtual ~VideoFrame() {}
 };
 
 }  // namespace cdm
 
 #endif  // WEBKIT_MEDIA_CRYPTO_PPAPI_CONTENT_DECRYPTION_MODULE_H_