Tighten up media::DecoderBuffer API contract for end of stream buffers (round 2).

webkit/plugins/ppapi/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 WEBKIT_PLUGINS_PPAPI_CONTENT_DECRYPTOR_DELEGATE_H_
 #define WEBKIT_PLUGINS_PPAPI_CONTENT_DECRYPTOR_DELEGATE_H_
 
 #include <queue>
 #include <string>
 
@@ skipping 87 matching lines @@
                         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);
 
  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 |data| 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
+  // 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.
-  // If |data| is NULL, sets |*resource| to NULL.
+  //
+  // 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 uint8* data, uint32_t size,
-                               scoped_refptr<PPB_Buffer_Impl>* resource);
+  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);
 
   const PP_Instance pp_instance_;
   const PPP_ContentDecryptor_Private* const plugin_decryption_interface_;
 
   // Callbacks for firing key events.
   media::KeyAddedCB key_added_cb_;
@@ skipping 36 matching lines @@
   base::WeakPtrFactory<ContentDecryptorDelegate> weak_ptr_factory_;
   base::WeakPtr<ContentDecryptorDelegate> weak_this_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentDecryptorDelegate);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_CONTENT_DECRYPTOR_DELEGATE_H_