Update PPP side of Pepper CDM API to support video decoding.

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 190 matching lines @@
   // If the return value is not kSuccess, |decrypted_buffer| should be ignored
   // 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 Decrypt(const InputBuffer& encrypted_buffer,
                          DecryptedBlock* decrypted_buffer) = 0;
 
   // Initializes the CDM video decoder with |video_decoder_config|. This
-  // function must be called before DecryptAndDecodeVideo() is called.
+  // function must be called before DecryptAndDecodeFrame() is called.
   //
   // Returns kSuccess if the |video_decoder_config| is supported and the CDM
   // video decoder is successfully initialized.
   // Returns kError if |video_decoder_config| is not supported. The CDM may
   // still be able to do Decrypt().
   //
   // 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;
@@ skipping 10 matching lines @@
   // 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 ignored 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,
+  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.
@@ skipping 93 matching lines @@
   virtual int64_t timestamp() const = 0;
 
  protected:
    VideoFrame() {}
    virtual ~VideoFrame() {}
 };
 
 }  // namespace cdm
 
 #endif  // WEBKIT_MEDIA_CRYPTO_PPAPI_CONTENT_DECRYPTION_MODULE_H_