Support multiple video decoders and encoders

content/common/gpu/media/gpu_video_encode_accelerator.h

 // Copyright 2013 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_COMMON_GPU_MEDIA_GPU_VIDEO_ENCODE_ACCELERATOR_H_
 #define CONTENT_COMMON_GPU_MEDIA_GPU_VIDEO_ENCODE_ACCELERATOR_H_
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "content/common/gpu/gpu_command_buffer_stub.h"
 #include "gpu/config/gpu_info.h"
 #include "ipc/ipc_listener.h"
 #include "media/video/video_encode_accelerator.h"
 #include "ui/gfx/size.h"
 
 namespace base {
 
 class SharedMemory;
@@ skipping 32 matching lines @@
                             size_t payload_size,
                             bool key_frame) override;
   void NotifyError(media::VideoEncodeAccelerator::Error error) override;
 
   // GpuCommandBufferStub::DestructionObserver implementation.
   void OnWillDestroyStub() override;
 
   // Static query for supported profiles.  This query calls the appropriate
   // platform-specific version.
   static std::vector<gpu::VideoEncodeAcceleratorSupportedProfile>
-  GetSupportedProfiles();
+      GetSupportedProfiles();
   static std::vector<gpu::VideoEncodeAcceleratorSupportedProfile>
-  ConvertMediaToGpuProfiles(const std::vector<
-      media::VideoEncodeAccelerator::SupportedProfile>& media_profiles);
+      ConvertMediaToGpuProfiles(const std::vector<
+          media::VideoEncodeAccelerator::SupportedProfile>& media_profiles);
 
  private:
   // Create the appropriate platform-specific VEA.

[Pawel Osciak, 2014/12/26 01:11:36]

Please update comments.

[henryhsu, 2014/12/26 08:40:40]

Done.

-  static scoped_ptr<media::VideoEncodeAccelerator> CreateEncoder();
+  static ScopedVector<media::VideoEncodeAccelerator> CreateEncoder();

[Pawel Osciak, 2014/12/26 01:11:36]

CreateEncoders

[henryhsu, 2014/12/26 08:40:40]

Done.

 
   // IPC handlers, proxying media::VideoEncodeAccelerator for the renderer
   // process.
   void OnEncode(int32 frame_id,
                 base::SharedMemoryHandle buffer_handle,
                 uint32 buffer_size,
                 bool force_keyframe);
   void OnUseOutputBitstreamBuffer(int32 buffer_id,
                                   base::SharedMemoryHandle buffer_handle,
                                   uint32 buffer_size);
   void OnRequestEncodingParametersChange(uint32 bitrate, uint32 framerate);
 
   void OnDestroy();
 
   void EncodeFrameFinished(int32 frame_id, scoped_ptr<base::SharedMemory> shm);
 
   void Send(IPC::Message* message);
   // Helper for replying to the creation request.
   void SendCreateEncoderReply(IPC::Message* message, bool succeeded);
 
   // Route ID to communicate with the host.
   int32 host_route_id_;
 
   // Unowned pointer to the underlying GpuCommandBufferStub.  |this| is
   // registered as a DestuctionObserver of |stub_| and will self-delete when
   // |stub_| is destroyed.
   GpuCommandBufferStub* stub_;
 
-  // Owned pointer to the underlying VideoEncodeAccelerator.
-  scoped_ptr<media::VideoEncodeAccelerator> encoder_;
+  // Owned pointer to all VideoEncodeAccelerator.

[Pawel Osciak, 2014/12/26 01:11:36]

s/pointer/pointers/
s/VideoEncodeAccelerator/VideoEncodeAccelerators/

[henryhsu, 2014/12/26 08:40:40]

encoder_list is not used.

+  ScopedVector<media::VideoEncodeAccelerator> encoder_list_;

[Pawel Osciak, 2014/12/26 01:11:36]

s/encoder_list_/encoders_/, since it's not a list.

[henryhsu, 2014/12/26 08:40:40]

Done.

+  // Pointer to valid VideoEncodeAccelerator.

[Pawel Osciak, 2014/12/26 01:11:36]

What does "valid" mean here?

[henryhsu, 2014/12/26 08:40:40]

Done.

+  media::VideoEncodeAccelerator* encoder_;
   base::Callback<bool(void)> make_context_current_;
 
   // Video encoding parameters.
   media::VideoFrame::Format input_format_;
   gfx::Size input_visible_size_;
   gfx::Size input_coded_size_;
   size_t output_buffer_size_;
 
   // Weak pointer for media::VideoFrames that refer back to |this|.
   base::WeakPtrFactory<GpuVideoEncodeAccelerator> weak_this_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuVideoEncodeAccelerator);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_MEDIA_GPU_VIDEO_ENCODE_ACCELERATOR_H_