media/.../{android_,gpu_}video_encode_accelerator{,_host} cleanup

media/gpu/ipc/service/gpu_video_encode_accelerator.cc

Index: media/gpu/ipc/service/gpu_video_encode_accelerator.cc
diff --git a/media/gpu/ipc/service/gpu_video_encode_accelerator.cc b/media/gpu/ipc/service/gpu_video_encode_accelerator.cc
index 23ce04e476cc1245226ff701973d38a4f6cb8272..51362c9d3b0b6f9e1edd9cb705ce0d26c4c600ea 100644
--- a/media/gpu/ipc/service/gpu_video_encode_accelerator.cc
+++ b/media/gpu/ipc/service/gpu_video_encode_accelerator.cc
@@ -43,6 +43,7 @@
 
 namespace media {
 
+namespace {

[watk, 2016/08/18 18:12:15]

I don't think it's in the style guide but we usually put a newline after opening
a namespace (unless it's just forward declarations).

[mcasas, 2016/08/18 19:24:40]

oops, done

 static bool MakeDecoderContextCurrent(

[watk, 2016/08/18 18:12:15]

Remove static on this one and all below.

[mcasas, 2016/08/18 19:24:40]

Done.

     const base::WeakPtr<gpu::GpuCommandBufferStub> stub) {
   if (!stub) {
@@ -58,6 +59,46 @@ static bool MakeDecoderContextCurrent(
   return true;
 }
 
+#if defined(OS_CHROMEOS) && defined(USE_V4L2_CODEC)
+static std::unique_ptr<VideoEncodeAccelerator> CreateV4L2VEA() {
+  std::unique_ptr<VideoEncodeAccelerator> encoder;
+  scoped_refptr<V4L2Device> device = V4L2Device::Create(V4L2Device::kEncoder);
+  if (device)
+    encoder.reset(new V4L2VideoEncodeAccelerator(device));

[watk, 2016/08/18 18:12:15]

If you feel like doing some extra cleanup :) You could change these to all use
MakeUnique instead of wrapunique.

[mcasas, 2016/08/18 19:24:40]

Tried but it wouldn't work:
../../media/gpu/ipc/service/gpu_video_encode_accelerator.cc:80:10: error: no
viable conversion from returned value of type
'unique_ptr<media::AndroidVideoEncodeAccelerator>' to function return type
'unique_ptr<media::VideoEncodeAccelerator>'

prob because we're outside of the class.

[watk, 2016/08/18 20:13:15]

Ah my bad

+  return encoder;
+}
+#endif
+
+#if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)
+static std::unique_ptr<VideoEncodeAccelerator> CreateVaapiVEA() {
+  return base::WrapUnique<VideoEncodeAccelerator>(
+      new VaapiVideoEncodeAccelerator());
+}
+#endif
+
+#if defined(OS_ANDROID) && defined(ENABLE_WEBRTC)
+static std::unique_ptr<VideoEncodeAccelerator> CreateAndroidVEA() {
+  return base::WrapUnique<VideoEncodeAccelerator>(
+      new AndroidVideoEncodeAccelerator());
+}
+#endif
+
+#if defined(OS_MACOSX)
+static std::unique_ptr<VideoEncodeAccelerator> CreateVTVEA() {
+  return base::WrapUnique<VideoEncodeAccelerator>(
+      new VTVideoEncodeAccelerator());
+}
+#endif
+
+#if defined(OS_WIN)
+static std::unique_ptr<VideoEncodeAccelerator> CreateMediaFoundationVEA() {
+  return base::WrapUnique<media::VideoEncodeAccelerator>(
+      new MediaFoundationVideoEncodeAccelerator());
+}
+#endif
+
+}  // anonymous namespace
+
 GpuVideoEncodeAccelerator::GpuVideoEncodeAccelerator(
     int32_t host_route_id,
     gpu::GpuCommandBufferStub* stub)
@@ -81,36 +122,32 @@ bool GpuVideoEncodeAccelerator::Initialize(VideoPixelFormat input_format,
                                            const gfx::Size& input_visible_size,
                                            VideoCodecProfile output_profile,
                                            uint32_t initial_bitrate) {
-  DVLOG(2) << "GpuVideoEncodeAccelerator::Initialize(): "
-           << "input_format=" << input_format
+  DVLOG(1) << __FUNCTION__
+           << " input_format=" << VideoPixelFormatToString(input_format)
            << ", input_visible_size=" << input_visible_size.ToString()
-           << ", output_profile=" << output_profile
+           << ", output_profile=" << GetProfileName(output_profile)
            << ", initial_bitrate=" << initial_bitrate;
   DCHECK(!encoder_);
 
   if (!stub_->channel()->AddRoute(host_route_id_, stub_->stream_id(), this)) {
-    DLOG(ERROR) << "GpuVideoEncodeAccelerator::Initialize(): "
-                   "failed to add route";
+    DLOG(ERROR) << __FUNCTION__ << " failed to add route";
     return false;
   }
 
   if (input_visible_size.width() > limits::kMaxDimension ||
       input_visible_size.height() > limits::kMaxDimension ||
       input_visible_size.GetArea() > limits::kMaxCanvas) {
-    DLOG(ERROR) << "GpuVideoEncodeAccelerator::Initialize(): "
-                << "input_visible_size " << input_visible_size.ToString()
-                << " too large";
+    DLOG(ERROR) << __FUNCTION__ << "too large input_visible_size "
+                << input_visible_size.ToString();
     return false;
   }
 
   const gpu::GpuPreferences& gpu_preferences =
       stub_->channel()->gpu_channel_manager()->gpu_preferences();
 
-  std::vector<GpuVideoEncodeAccelerator::CreateVEAFp> create_vea_fps =
-      CreateVEAFps(gpu_preferences);
   // Try all possible encoders and use the first successful encoder.
-  for (size_t i = 0; i < create_vea_fps.size(); ++i) {
-    encoder_ = (*create_vea_fps[i])();
+  for (const auto& vea_factory_method : GetVEAFactoryMethods(gpu_preferences)) {
+    encoder_ = vea_factory_method.Run();
     if (encoder_ &&
         encoder_->Initialize(input_format, input_visible_size, output_profile,
                              initial_bitrate, this)) {
@@ -120,8 +157,7 @@ bool GpuVideoEncodeAccelerator::Initialize(VideoPixelFormat input_format,
     }
   }
   encoder_.reset();
-  DLOG(ERROR)
-      << "GpuVideoEncodeAccelerator::Initialize(): VEA initialization failed";
+  DLOG(ERROR) << __FUNCTION__ << " VEA initialization failed";
   return false;
 }
 
@@ -178,11 +214,9 @@ gpu::VideoEncodeAcceleratorSupportedProfiles
 GpuVideoEncodeAccelerator::GetSupportedProfiles(
     const gpu::GpuPreferences& gpu_preferences) {
   VideoEncodeAccelerator::SupportedProfiles profiles;
-  std::vector<GpuVideoEncodeAccelerator::CreateVEAFp> create_vea_fps =
-      CreateVEAFps(gpu_preferences);
 
-  for (size_t i = 0; i < create_vea_fps.size(); ++i) {
-    std::unique_ptr<VideoEncodeAccelerator> encoder = (*create_vea_fps[i])();
+  for (const auto& vea_factory_method : GetVEAFactoryMethods(gpu_preferences)) {
+    std::unique_ptr<VideoEncodeAccelerator> encoder = vea_factory_method.Run();
     if (!encoder)
       continue;
     VideoEncodeAccelerator::SupportedProfiles vea_profiles =
@@ -194,85 +228,35 @@ GpuVideoEncodeAccelerator::GetSupportedProfiles(
 }
 
 // static
-std::vector<GpuVideoEncodeAccelerator::CreateVEAFp>
-GpuVideoEncodeAccelerator::CreateVEAFps(
+std::vector<GpuVideoEncodeAccelerator::VEAFactoryMethod>
+GpuVideoEncodeAccelerator::GetVEAFactoryMethods(
     const gpu::GpuPreferences& gpu_preferences) {
-  std::vector<GpuVideoEncodeAccelerator::CreateVEAFp> create_vea_fps;
+  std::vector<VEAFactoryMethod> vea_factory_methods;
 #if defined(OS_CHROMEOS) && defined(USE_V4L2_CODEC)
-  create_vea_fps.push_back(&GpuVideoEncodeAccelerator::CreateV4L2VEA);
+  vea_factory_methods.push_back(base::Bind(&CreateV4L2VEA));
 #endif
 #if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)
   if (!gpu_preferences.disable_vaapi_accelerated_video_encode)
-    create_vea_fps.push_back(&GpuVideoEncodeAccelerator::CreateVaapiVEA);
+    vea_factory_methods.push_back(base::Bind(&CreateVaapiVEA));
 #endif
 #if defined(OS_ANDROID) && defined(ENABLE_WEBRTC)
   if (!gpu_preferences.disable_web_rtc_hw_encoding)
-    create_vea_fps.push_back(&GpuVideoEncodeAccelerator::CreateAndroidVEA);
+    vea_factory_methods.push_back(base::Bind(&CreateAndroidVEA));
 #endif
 #if defined(OS_MACOSX)
-  create_vea_fps.push_back(&GpuVideoEncodeAccelerator::CreateVTVEA);
+  vea_factory_methods.push_back(base::Bind(&CreateVTVEA));
 #endif
 #if defined(OS_WIN)
-  if (base::FeatureList::IsEnabled(kMediaFoundationH264Encoding)) {
-    create_vea_fps.push_back(
-        &GpuVideoEncodeAccelerator::CreateMediaFoundationVEA);
-  }
+  if (base::FeatureList::IsEnabled(kMediaFoundationH264Encoding))
+    vea_factory_methods.push_back(base::Bind(&CreateMediaFoundationVEA));
 #endif
-  return create_vea_fps;
+  return vea_factory_methods;
 }
 
-#if defined(OS_CHROMEOS) && defined(USE_V4L2_CODEC)
-// static
-std::unique_ptr<VideoEncodeAccelerator>
-GpuVideoEncodeAccelerator::CreateV4L2VEA() {
-  std::unique_ptr<VideoEncodeAccelerator> encoder;
-  scoped_refptr<V4L2Device> device = V4L2Device::Create(V4L2Device::kEncoder);
-  if (device)
-    encoder.reset(new V4L2VideoEncodeAccelerator(device));
-  return encoder;
-}
-#endif
-
-#if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)
-// static
-std::unique_ptr<VideoEncodeAccelerator>
-GpuVideoEncodeAccelerator::CreateVaapiVEA() {
-  return base::WrapUnique<VideoEncodeAccelerator>(
-      new VaapiVideoEncodeAccelerator());
-}
-#endif
-
-#if defined(OS_ANDROID) && defined(ENABLE_WEBRTC)
-// static
-std::unique_ptr<VideoEncodeAccelerator>
-GpuVideoEncodeAccelerator::CreateAndroidVEA() {
-  return base::WrapUnique<VideoEncodeAccelerator>(
-      new AndroidVideoEncodeAccelerator());
-}
-#endif
-
-#if defined(OS_MACOSX)
-// static
-std::unique_ptr<VideoEncodeAccelerator>
-GpuVideoEncodeAccelerator::CreateVTVEA() {
-  return base::WrapUnique<VideoEncodeAccelerator>(
-      new VTVideoEncodeAccelerator());
-}
-#endif
-
-#if defined(OS_WIN)
-// static
-std::unique_ptr<media::VideoEncodeAccelerator>
-GpuVideoEncodeAccelerator::CreateMediaFoundationVEA() {
-  return base::WrapUnique<media::VideoEncodeAccelerator>(
-      new MediaFoundationVideoEncodeAccelerator());
-}
-#endif
-
 void GpuVideoEncodeAccelerator::OnEncode(
     const AcceleratedVideoEncoderMsg_Encode_Params& params) {
-  DVLOG(3) << "GpuVideoEncodeAccelerator::OnEncode: frame_id = "
-           << params.frame_id << ", buffer_size=" << params.buffer_size
+  DVLOG(3) << __FUNCTION__ << " frame_id = " << params.frame_id
+           << ", buffer_size=" << params.buffer_size
            << ", force_keyframe=" << params.force_keyframe;
   DCHECK_EQ(PIXEL_FORMAT_I420, input_format_);
 
@@ -285,7 +269,7 @@ void GpuVideoEncodeAccelerator::OnEncode(
     return;
 
   if (params.frame_id < 0) {
-    DLOG(ERROR) << "GpuVideoEncodeAccelerator::OnEncode(): invalid "
+    DLOG(ERROR) << __FUNCTION__ << " invalidc "

[watk, 2016/08/18 18:12:15]

s/invalidc/invalid

[mcasas, 2016/08/18 19:24:40]

Done.

                 << "frame_id=" << params.frame_id;
     NotifyError(VideoEncodeAccelerator::kPlatformFailureError);
     return;
@@ -299,15 +283,14 @@ void GpuVideoEncodeAccelerator::OnEncode(
   map_size += aligned_offset;
 
   if (!map_offset.IsValid() || !map_size.IsValid()) {
-    DLOG(ERROR) << "GpuVideoEncodeAccelerator::OnEncode():"
-                << " invalid (buffer_offset,buffer_size)";
+    DLOG(ERROR) << __FUNCTION__ << "  invalid (buffer_offset, buffer_size)";
     NotifyError(VideoEncodeAccelerator::kPlatformFailureError);
     return;
   }
 
   if (!shm->MapAt(map_offset.ValueOrDie(), map_size.ValueOrDie())) {
-    DLOG(ERROR) << "GpuVideoEncodeAccelerator::OnEncode(): "
-                << "could not map frame_id=" << params.frame_id;
+    DLOG(ERROR) << __FUNCTION__
+                << " could not map frame_id=" << params.frame_id;
     NotifyError(VideoEncodeAccelerator::kPlatformFailureError);
     return;
   }
@@ -319,8 +302,7 @@ void GpuVideoEncodeAccelerator::OnEncode(
       input_visible_size_, shm_memory, params.buffer_size, params.buffer_handle,
       params.buffer_offset, params.timestamp);
   if (!frame) {
-    DLOG(ERROR) << "GpuVideoEncodeAccelerator::OnEncode(): "
-                << "could not create a frame";
+    DLOG(ERROR) << __FUNCTION__ << " could not create a frame";
     NotifyError(VideoEncodeAccelerator::kPlatformFailureError);
     return;
   }
@@ -332,8 +314,7 @@ void GpuVideoEncodeAccelerator::OnEncode(
 
 void GpuVideoEncodeAccelerator::OnEncode2(
     const AcceleratedVideoEncoderMsg_Encode_Params2& params) {
-  DVLOG(3) << "GpuVideoEncodeAccelerator::OnEncode2: "
-           << "frame_id = " << params.frame_id
+  DVLOG(3) << __FUNCTION__ << " frame_id = " << params.frame_id
            << ", size=" << params.size.ToString()
            << ", force_keyframe=" << params.force_keyframe
            << ", handle type=" << params.gpu_memory_buffer_handles[0].type;
@@ -345,19 +326,18 @@ void GpuVideoEncodeAccelerator::OnUseOutputBitstreamBuffer(
     int32_t buffer_id,
     base::SharedMemoryHandle buffer_handle,
     uint32_t buffer_size) {
-  DVLOG(3) << "GpuVideoEncodeAccelerator::OnUseOutputBitstreamBuffer(): "
-           << "buffer_id=" << buffer_id << ", buffer_size=" << buffer_size;
+  DVLOG(3) << __FUNCTION__ << " buffer_id=" << buffer_id
+           << ", buffer_size=" << buffer_size;
   if (!encoder_)
     return;
   if (buffer_id < 0) {
-    DLOG(ERROR) << "GpuVideoEncodeAccelerator::OnUseOutputBitstreamBuffer(): "
-                << "invalid buffer_id=" << buffer_id;
+    DLOG(ERROR) << __FUNCTION__ << " invalid buffer_id=" << buffer_id;
     NotifyError(VideoEncodeAccelerator::kPlatformFailureError);
     return;
   }
   if (buffer_size < output_buffer_size_) {
-    DLOG(ERROR) << "GpuVideoEncodeAccelerator::OnUseOutputBitstreamBuffer(): "
-                << "buffer too small for buffer_id=" << buffer_id;
+    DLOG(ERROR) << __FUNCTION__
+                << " buffer too small for buffer_id=" << buffer_id;
     NotifyError(VideoEncodeAccelerator::kPlatformFailureError);
     return;
   }
@@ -366,15 +346,15 @@ void GpuVideoEncodeAccelerator::OnUseOutputBitstreamBuffer(
 }
 
 void GpuVideoEncodeAccelerator::OnDestroy() {
-  DVLOG(2) << "GpuVideoEncodeAccelerator::OnDestroy()";
+  DVLOG(2) << __FUNCTION__;
   OnWillDestroyStub();
 }
 
 void GpuVideoEncodeAccelerator::OnRequestEncodingParametersChange(
     uint32_t bitrate,
     uint32_t framerate) {
-  DVLOG(2) << "GpuVideoEncodeAccelerator::OnRequestEncodingParametersChange(): "
-           << "bitrate=" << bitrate << ", framerate=" << framerate;
+  DVLOG(2) << __FUNCTION__ << " bitrate=" << bitrate
+           << ", framerate=" << framerate;
   if (!encoder_)
     return;
   encoder_->RequestEncodingParametersChange(bitrate, framerate);