Drop |data_offset| in cdm::InputBuffer.

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 CDM_CONTENT_DECRYPTION_MODULE_H_
 #define CDM_CONTENT_DECRYPTION_MODULE_H_
 
 #if defined(_MSC_VER)
 typedef unsigned char uint8_t;
 typedef unsigned int uint32_t;
@@ skipping 142 matching lines @@
 // TODO(xhwang): Add checks to make sure these structs have fixed layout.
 struct SubsampleEntry {
   SubsampleEntry(uint32_t clear_bytes, uint32_t cipher_bytes)
       : clear_bytes(clear_bytes), cipher_bytes(cipher_bytes) {}
 
   uint32_t clear_bytes;
   uint32_t cipher_bytes;
 };
 
 // Represents an input buffer to be decrypted (and possibly decoded). It does
-// own any pointers in this struct.
-struct InputBuffer {
-  InputBuffer()
+// not own any pointers in this struct.
+// Deprecated: New CDM implementations should use InputBuffer.
+struct InputBuffer_1 {
+  InputBuffer_1()
       : data(NULL),
         data_size(0),
         data_offset(0),
         key_id(NULL),
         key_id_size(0),
         iv(NULL),
         iv_size(0),
         subsamples(NULL),
         num_subsamples(0),
         timestamp(0) {}
 
   const uint8_t* data;  // Pointer to the beginning of the input data.
   uint32_t data_size;  // Size (in bytes) of |data|.
 
   uint32_t data_offset;  // Number of bytes to be discarded before decryption.
 
   const uint8_t* key_id;  // Key ID to identify the decryption key.
   uint32_t key_id_size;  // Size (in bytes) of |key_id|.
 
   const uint8_t* iv;  // Initialization vector.
   uint32_t iv_size;  // Size (in bytes) of |iv|.
 
   const struct SubsampleEntry* subsamples;
   uint32_t num_subsamples;  // Number of subsamples in |subsamples|.
 
   int64_t timestamp;  // Presentation timestamp in microseconds.
 };
 
+// Represents an input buffer to be decrypted (and possibly decoded). It does
+// not own any pointers in this struct.
+struct InputBuffer_2 {
+  InputBuffer_2()
+      : data(NULL),
+        data_size(0),
+        key_id(NULL),
+        key_id_size(0),
+        iv(NULL),
+        iv_size(0),
+        subsamples(NULL),
+        num_subsamples(0),
+        timestamp(0) {}
+
+  const uint8_t* data;  // Pointer to the beginning of the input data.
+  uint32_t data_size;  // Size (in bytes) of |data|.
+
+  const uint8_t* key_id;  // Key ID to identify the decryption key.
+  uint32_t key_id_size;  // Size (in bytes) of |key_id|.
+
+  const uint8_t* iv;  // Initialization vector.
+  uint32_t iv_size;  // Size (in bytes) of |iv|.
+
+  const struct SubsampleEntry* subsamples;
+  uint32_t num_subsamples;  // Number of subsamples in |subsamples|.
+
+  int64_t timestamp;  // Presentation timestamp in microseconds.
+};
+
+typedef InputBuffer_2 InputBuffer;
+
 struct AudioDecoderConfig {
   enum AudioCodec {
     kUnknownAudioCodec = 0,
     kCodecVorbis,
     kCodecAac
   };
 
   AudioDecoderConfig()
       : codec(kUnknownAudioCodec),
         channel_count(0),
@@ skipping 255 matching lines @@
   // Decrypts the |encrypted_buffer|.
   //
   // 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 kNoKey if the CDM did not have the necessary decryption key
   // to decrypt.
   // Returns kDecryptError if any other error happened.
   // If the return value is not kSuccess, |decrypted_buffer| should be ignored
   // by the caller.
-  virtual Status Decrypt(const InputBuffer& encrypted_buffer,
+  virtual Status Decrypt(const InputBuffer_1& encrypted_buffer,
                          DecryptedBlock* decrypted_buffer) = 0;
 
   // Initializes the CDM audio decoder with |audio_decoder_config|. This
   // function must be called before DecryptAndDecodeSamples() is called.
   //
   // Returns kSuccess if the |audio_decoder_config| is supported and the CDM
   // audio decoder is successfully initialized.
   // Returns kSessionError if |audio_decoder_config| is not supported. The CDM
   // may still be able to do Decrypt().
   // Returns kDeferredInitialization if the CDM is not ready to initialize the
@@ skipping 34 matching lines @@
   // the callee will have filled the |video_frame| and passed the ownership of
   // |frame_buffer| 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 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, |video_frame| should be ignored by
   // the caller.
-  virtual Status DecryptAndDecodeFrame(const InputBuffer& encrypted_buffer,
+  virtual Status DecryptAndDecodeFrame(const InputBuffer_1& encrypted_buffer,
                                        VideoFrame* video_frame) = 0;
 
   // Decrypts the |encrypted_buffer| and decodes the decrypted buffer into
   // |audio_frames|. Upon end-of-stream, the caller should call this function
   // repeatedly with empty |encrypted_buffer| (|data| == NULL) until only empty
   // |audio_frames| is produced.
   //
   // Returns kSuccess if decryption and decoding both succeeded, in which case
   // 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.
-  virtual Status DecryptAndDecodeSamples(const InputBuffer& encrypted_buffer,
+  virtual Status DecryptAndDecodeSamples(const InputBuffer_1& encrypted_buffer,
                                          AudioFrames* audio_frames) = 0;
 
   // Called by the host after a platform challenge was initiated via
   // Host::SendPlatformChallenge().
   virtual void OnPlatformChallengeResponse(
       const PlatformChallengeResponse& response) = 0;
 
   // Called by the host after a call to Host::QueryOutputProtectionStatus(). The
   // |link_mask| is a bit mask of OutputLinkTypes. The |output_protection_mask|
   // is a bit mask of OutputProtectionMethods, indicating whether all
@@ skipping 69 matching lines @@
   // Decrypts the |encrypted_buffer|.
   //
   // 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 kNoKey if the CDM did not have the necessary decryption key
   // to decrypt.
   // Returns kDecryptError if any other error happened.
   // If the return value is not kSuccess, |decrypted_buffer| should be ignored
   // by the caller.
-  virtual Status Decrypt(const InputBuffer& encrypted_buffer,
+  virtual Status Decrypt(const InputBuffer_1& encrypted_buffer,
                          DecryptedBlock* decrypted_buffer) = 0;
 
   // Initializes the CDM audio decoder with |audio_decoder_config|. This
   // function must be called before DecryptAndDecodeSamples() is called.
   //
   // Returns kSuccess if the |audio_decoder_config| is supported and the CDM
   // audio decoder is successfully initialized.
   // Returns kSessionError if |audio_decoder_config| is not supported. The CDM
   // may still be able to do Decrypt().
   // Returns kDeferredInitialization if the CDM is not ready to initialize the
@@ skipping 34 matching lines @@
   // the callee will have filled the |video_frame| and passed the ownership of
   // |frame_buffer| 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 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, |video_frame| should be ignored by
   // the caller.
-  virtual Status DecryptAndDecodeFrame(const InputBuffer& encrypted_buffer,
+  virtual Status DecryptAndDecodeFrame(const InputBuffer_1& encrypted_buffer,
                                        VideoFrame* video_frame) = 0;
 
   // Decrypts the |encrypted_buffer| and decodes the decrypted buffer into
   // |audio_frames|. Upon end-of-stream, the caller should call this function
   // repeatedly with empty |encrypted_buffer| (|data| == NULL) until only empty
   // |audio_frames| is produced.
   //
   // Returns kSuccess if decryption and decoding both succeeded, in which case
   // 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.
-  virtual Status DecryptAndDecodeSamples(const InputBuffer& encrypted_buffer,
+  virtual Status DecryptAndDecodeSamples(const InputBuffer_1& encrypted_buffer,
                                          AudioFrames* audio_frames) = 0;
 
   // Called by the host after a platform challenge was initiated via
   // Host::SendPlatformChallenge().
   virtual void OnPlatformChallengeResponse(
       const PlatformChallengeResponse& response) = 0;
 
   // Called by the host after a call to Host::QueryOutputProtectionStatus(). The
   // |link_mask| is a bit mask of OutputLinkTypes and |output_protection_mask|
   // is a bit mask of OutputProtectionMethods.
@@ skipping 623 matching lines @@
   virtual AudioFormat Format() const = 0;
 
  protected:
   AudioFrames_2() {}
   virtual ~AudioFrames_2() {}
 };
 
 }  // namespace cdm
 
 #endif  // CDM_CONTENT_DECRYPTION_MODULE_H_