Plumb support for audio sample formats.

content/renderer/pepper/content_decryptor_delegate.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 CONTENT_RENDERER_PEPPER_CONTENT_DECRYPTOR_DELEGATE_H_
 #define CONTENT_RENDERER_PEPPER_CONTENT_DECRYPTOR_DELEGATE_H_
 
 #include <queue>
 #include <string>
 
@@ skipping 85 matching lines @@
   void DecoderInitializeDone(PP_DecryptorStreamType decoder_type,
                              uint32_t request_id,
                              PP_Bool success);
   void DecoderDeinitializeDone(PP_DecryptorStreamType decoder_type,
                                uint32_t request_id);
   void DecoderResetDone(PP_DecryptorStreamType decoder_type,
                         uint32_t request_id);
   void DeliverFrame(PP_Resource decrypted_frame,
                     const PP_DecryptedFrameInfo* frame_info);
   void DeliverSamples(PP_Resource audio_frames,
-                      const PP_DecryptedBlockInfo* block_info);
+                      const PP_DecryptedSampleInfo* sample_info);
 
  private:
   // Cancels the pending decrypt-and-decode callback for |stream_type|.
   void CancelDecode(media::Decryptor::StreamType stream_type);
 
   // Fills |resource| with a PPB_Buffer_Impl and copies the data from
   // |encrypted_buffer| into the buffer resource. This method reuses
   // |audio_input_resource_| and |video_input_resource_| to reduce the latency
   // in requesting new PPB_Buffer_Impl resources. The caller must make sure that
   // |audio_input_resource_| or |video_input_resource_| is available before
   // calling this method.
   //
   // An end of stream |encrypted_buffer| is represented as a null |resource|.
   //
   // Returns true upon success and false if any error happened.
   bool MakeMediaBufferResource(
       media::Decryptor::StreamType stream_type,
       const scoped_refptr<media::DecoderBuffer>& encrypted_buffer,
       scoped_refptr<PPB_Buffer_Impl>* resource);
 
   void FreeBuffer(uint32_t buffer_id);
 
   void SetBufferToFreeInTrackingInfo(PP_DecryptTrackingInfo* tracking_info);
 
   // Deserializes audio data stored in |audio_frames| into individual audio
   // buffers in |frames|. Returns true upon success.
   bool DeserializeAudioFrames(PP_Resource audio_frames,
                               size_t data_size,
+                              media::SampleFormat sample_format,
                               media::Decryptor::AudioBuffers* frames);
 
   const PP_Instance pp_instance_;
   const PPP_ContentDecryptor_Private* const plugin_decryption_interface_;
 
   // TODO(ddorwin): Remove after updating the Pepper API to not use key system.
   std::string key_system_;
 
   // Callbacks for firing key events.
   media::KeyAddedCB key_added_cb_;
@@ skipping 26 matching lines @@
   uint32_t pending_video_decode_request_id_;
   media::Decryptor::VideoDecodeCB pending_video_decode_cb_;
 
   // Cached audio and video input buffers. See MakeMediaBufferResource.
   scoped_refptr<PPB_Buffer_Impl> audio_input_resource_;
   scoped_refptr<PPB_Buffer_Impl> video_input_resource_;
 
   std::queue<uint32_t> free_buffers_;
 
   // Keep track of audio parameters.
-  media::SampleFormat audio_sample_format_;
   int audio_samples_per_second_;
   int audio_channel_count_;
-  int audio_bytes_per_frame_;
 
   base::WeakPtr<ContentDecryptorDelegate> weak_this_;
   base::WeakPtrFactory<ContentDecryptorDelegate> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentDecryptorDelegate);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_PEPPER_CONTENT_DECRYPTOR_DELEGATE_H_