Reuse PPB_Buffer_Impl in ContentDecryptorDelegate.

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 <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "media/base/decryptor.h"
 #include "ppapi/c/private/pp_content_decryptor.h"
 #include "ppapi/c/private/ppp_content_decryptor_private.h"
+#include "ppapi/shared_impl/scoped_pp_resource.h"
 #include "webkit/plugins/webkit_plugins_export.h"
 
 namespace media {
 class AudioDecoderConfig;
 class DecoderBuffer;
 class DecryptorClient;
 class VideoDecoderConfig;
 }
 
 namespace webkit {
@@ skipping 64 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 PP_Resource containing a PPB_Buffer_Impl and
+  // copies |data| into the buffer resource. This method reuses

[ddorwin, 2012/11/17 02:07:38]

Why "create" and copy in a single function? First, copy isn't really part of
"Make". Second, we'll have to break this up later when we try to eliminate the
memcpy.
Update: Oh, this is the way the existing function is. I guess we should stay
consistent for now.

[xhwang, 2012/11/18 00:10:33]

This memcpy is for input, which is usually small. Also, if we want to remove the
memcpy, we have to preallocate memory and pass it into the demuxers. I feel it's
not worth the effort.

+  // |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, fills |resource| with a PP_Resource with ID of 0.
+  // Returns true upon success and false if any error happened.
+  bool MakeMediaBufferResource(media::Decryptor::StreamType stream_type,
+                               const uint8* data, int size,
+                               ::ppapi::ScopedPPResource* resource);
+
   const PP_Instance pp_instance_;
   const PPP_ContentDecryptor_Private* const plugin_decryption_interface_;
 
   media::DecryptorClient* decryptor_client_;
 
   // Request ID for tracking pending content decryption callbacks.
   // Note that zero indicates an invalid request ID.
   // TODO(xhwang): Add completion callbacks for Reset/Stop and remove the use
   // of request IDs.
   uint32_t next_decryption_request_id_;
 
   uint32_t pending_audio_decrypt_request_id_;
   media::Decryptor::DecryptCB pending_audio_decrypt_cb_;
 
   uint32_t pending_video_decrypt_request_id_;
   media::Decryptor::DecryptCB pending_video_decrypt_cb_;
 
   uint32_t pending_audio_decoder_init_request_id_;
   media::Decryptor::DecoderInitCB pending_audio_decoder_init_cb_;
 
   uint32_t pending_video_decoder_init_request_id_;
   media::Decryptor::DecoderInitCB pending_video_decoder_init_cb_;
 
   uint32_t pending_audio_decode_request_id_;
   media::Decryptor::AudioDecodeCB pending_audio_decode_cb_;
 
   uint32_t pending_video_decode_request_id_;
   media::Decryptor::VideoDecodeCB pending_video_decode_cb_;
 
+  // ScopedPPResource for audio and video input buffers.

[ddorwin, 2012/11/17 02:07:38]

Maybe add
  // See MakeMediaBufferResource.
for an explanation

[xhwang, 2012/11/18 00:10:33]

Done.

+  ::ppapi::ScopedPPResource audio_input_resource_;
+  int audio_input_resource_size_;
+  ::ppapi::ScopedPPResource video_input_resource_;
+  int video_input_resource_size_;
+
   DISALLOW_COPY_AND_ASSIGN(ContentDecryptorDelegate);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_CONTENT_DECRYPTOR_DELEGATE_H_