Add multiple video encoders/decoders to video encoder/decoder unittest

content/common/gpu/media/video_decode_accelerator_unittest.cc

 // 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.
 //
 // The bulk of this file is support code; sorry about that.  Here's an overview
 // to hopefully help readers of this code:
 // - RenderingHelper is charged with interacting with X11/{EGL/GLES2,GLX/GL} or
 //   Win/EGL.
 // - ClientState is an enum for the state of the decode client used by the test.
 // - ClientStateNotification is a barrier abstraction that allows the test code
@@ skipping 37 matching lines @@
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "content/common/gpu/media/rendering_helper.h"
 #include "content/common/gpu/media/video_accelerator_unittest_helpers.h"
 #include "content/public/common/content_switches.h"
 #include "media/filters/h264_parser.h"
 #include "ui/gfx/codec/png_codec.h"
 
 #if defined(OS_WIN)
 #include "content/common/gpu/media/dxva_video_decode_accelerator.h"
-#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)
+#elif defined(OS_CHROMEOS)
+#if defined(ARCH_CPU_ARMEL) || (defined(USE_OZONE) && defined(USE_V4L2_CODEC))
 #include "content/common/gpu/media/v4l2_video_decode_accelerator.h"
 #include "content/common/gpu/media/v4l2_video_device.h"
-#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)
+// defined(ARCH_CPU_ARMEL) || (defined(USE_OZONE) && defined(USE_V4L2_CODEC))

[Pawel Osciak, 2015/01/09 13:09:11]

Maybe just remove this please, it's actually confusing I think.

[henryhsu, 2015/01/09 14:29:23]

Done.

+#endif
+#if defined(ARCH_CPU_X86_FAMILY)
 #include "content/common/gpu/media/vaapi_video_decode_accelerator.h"
 #include "content/common/gpu/media/vaapi_wrapper.h"
+#endif  // defined(ARCH_CPU_X86_FAMILY)
 #else
 #error The VideoAccelerator tests are not supported on this platform.
 #endif  // OS_WIN
 
 using media::VideoDecodeAccelerator;
 
 namespace content {
 namespace {
 
 // Values optionally filled in from flags; see main() below.
@@ skipping 201 matching lines @@
   int num_queued_fragments() { return num_queued_fragments_; }
   int num_decoded_frames() { return num_decoded_frames_; }
   double frames_per_second();
   // Return the median of the decode time of all decoded frames.
   base::TimeDelta decode_time_median();
   bool decoder_deleted() { return !decoder_.get(); }
 
  private:
   typedef std::map<int32, scoped_refptr<TextureRef>> TextureRefMap;
 
+  scoped_ptr<media::VideoDecodeAccelerator> CreateDXVAVDA();

[Pawel Osciak, 2015/01/09 13:09:11]

Could these be static and maybe even outside of this class?

[henryhsu, 2015/01/09 14:29:23]

I think no. First, we have multiple instances of GLRenderingVDAClient in several
test cases. Each instance should have their own VDA. Second, static or global
variables of class type are forbidden.

+  scoped_ptr<media::VideoDecodeAccelerator> CreateV4L2VDA();
+  scoped_ptr<media::VideoDecodeAccelerator> CreateVaapiVDA();
+
   void SetState(ClientState new_state);
   void FinishInitialization();
   void ReturnPicture(int32 picture_buffer_id);
 
   // Delete the associated decoder helper.
   void DeleteDecoder();
 
   // Compute & return the first encoded bytes (including a start frame) to send
   // to the decoder, starting at |start_pos| and returning one fragment. Skips
   // to the first decodable position.
@@ skipping 109 matching lines @@
 }
 
 GLRenderingVDAClient::~GLRenderingVDAClient() {
   DeleteDecoder();  // Clean up in case of expected error.
   CHECK(decoder_deleted());
   SetState(CS_DESTROYED);
 }
 
 static bool DoNothingReturnTrue() { return true; }
 
+scoped_ptr<media::VideoDecodeAccelerator>
+GLRenderingVDAClient::CreateDXVAVDA() {
+  scoped_ptr<media::VideoDecodeAccelerator> decoder;
+#if defined(OS_WIN)
+  if (base::win::GetVersion() >= base::win::VERSION_WIN7)
+    decoder.reset(
+        new DXVAVideoDecodeAccelerator(base::Bind(&DoNothingReturnTrue)));
+#endif
+  return decoder.Pass();
+}
+
+scoped_ptr<media::VideoDecodeAccelerator>
+GLRenderingVDAClient::CreateV4L2VDA() {
+  scoped_ptr<media::VideoDecodeAccelerator> decoder;
+#if defined(OS_CHROMEOS) && (defined(ARCH_CPU_ARMEL) || \
+    (defined(USE_OZONE) && defined(USE_V4L2_CODEC)))
+  scoped_ptr<V4L2Device> device = V4L2Device::Create(V4L2Device::kDecoder);
+  if (device.get()) {
+    base::WeakPtr<VideoDecodeAccelerator::Client> weak_client = AsWeakPtr();
+    decoder.reset(new V4L2VideoDecodeAccelerator(
+        static_cast<EGLDisplay>(rendering_helper_->GetGLDisplay()),
+        static_cast<EGLContext>(rendering_helper_->GetGLContextHandle()),
+        weak_client,
+        base::Bind(&DoNothingReturnTrue),
+        device.Pass(),
+        base::MessageLoopProxy::current()));
+  }
+#endif
+  return decoder.Pass();
+}
+
+scoped_ptr<media::VideoDecodeAccelerator>
+GLRenderingVDAClient::CreateVaapiVDA() {
+  scoped_ptr<media::VideoDecodeAccelerator> decoder;
+#if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)
+  decoder.reset(
+      new VaapiVideoDecodeAccelerator(base::Bind(&DoNothingReturnTrue)));
+#endif
+  return decoder.Pass();
+}
+
 void GLRenderingVDAClient::CreateAndStartDecoder() {
   CHECK(decoder_deleted());
   CHECK(!decoder_.get());
 
   VideoDecodeAccelerator::Client* client = this;
-  base::WeakPtr<VideoDecodeAccelerator::Client> weak_client = AsWeakPtr();
-#if defined(OS_WIN)
-  decoder_.reset(
-      new DXVAVideoDecodeAccelerator(base::Bind(&DoNothingReturnTrue)));
-#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)
 
-  scoped_ptr<V4L2Device> device = V4L2Device::Create(V4L2Device::kDecoder);
-  if (!device.get()) {
-    NotifyError(media::VideoDecodeAccelerator::PLATFORM_FAILURE);
-    return;
+  scoped_ptr<media::VideoDecodeAccelerator> decoders[] = {
+    CreateDXVAVDA(),
+    CreateV4L2VDA(),
+    CreateVaapiVDA()
+  };
+  size_t num_decoders = sizeof(decoders) /

[Pawel Osciak, 2015/01/09 13:09:11]

Please use arraysize() and move to the for loop.

[henryhsu, 2015/01/09 14:29:23]

Done.

+      sizeof(scoped_ptr<media::VideoDecodeAccelerator>);
+
+  for (size_t i = 0; i < num_decoders; ++i) {
+    if (!decoders[i]) continue;

[Pawel Osciak, 2015/01/09 13:09:11]

New line please.

[henryhsu, 2015/01/09 14:29:23]

Done.

+    decoder_ = decoders[i].Pass();
+    weak_decoder_factory_.reset(
+        new base::WeakPtrFactory<VideoDecodeAccelerator>(decoder_.get()));
+    SetState(CS_DECODER_SET);
+    if (decoder_->Initialize(profile_, client)) {
+      FinishInitialization();
+      return;
+    }
   }
-  decoder_.reset(new V4L2VideoDecodeAccelerator(
-      static_cast<EGLDisplay>(rendering_helper_->GetGLDisplay()),
-      static_cast<EGLContext>(rendering_helper_->GetGLContextHandle()),
-      weak_client, base::Bind(&DoNothingReturnTrue), device.Pass(),
-      base::MessageLoopProxy::current()));
-#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)
-  decoder_.reset(
-      new VaapiVideoDecodeAccelerator(base::Bind(&DoNothingReturnTrue)));
-#endif  // OS_WIN
   CHECK(decoder_.get());

[Pawel Osciak, 2015/01/09 13:09:11]

Perhaps have decoder_.reset() at the end of each iteration and have this as the
failing check instead of these two lines below?

[henryhsu, 2015/01/09 14:29:23]

We don't have to reset decoder_ at the end of each iteration because it will be
replaced by next decoders[i].
And I think CHECK(decoder_.get()) is useless. Once this CHECK is hit, we still
don't know which decoder initial failed.
But CHECK(false) is required to raise error when all decoders cannot be
initialized.

-  weak_decoder_factory_.reset(
-      new base::WeakPtrFactory<VideoDecodeAccelerator>(decoder_.get()));
-  SetState(CS_DECODER_SET);
-  if (decoder_deleted())
-    return;
-
-  CHECK(decoder_->Initialize(profile_, client));
-  FinishInitialization();
+  // Decoders are all initialize failed.
+  CHECK(false);
 }
 
 void GLRenderingVDAClient::ProvidePictureBuffers(
     uint32 requested_num_of_buffers,
     const gfx::Size& dimensions,
     uint32 texture_target) {
   if (decoder_deleted())
     return;
   std::vector<media::PictureBuffer> buffers;
 
@@ skipping 1014 matching lines @@
     if (it->first == "ozone-platform" || it->first == "ozone-use-surfaceless")
       continue;
     LOG(FATAL) << "Unexpected switch: " << it->first << ":" << it->second;
   }
 
   base::ShadowingAtExitManager at_exit_manager;
   content::RenderingHelper::InitializeOneOff();
 
   return RUN_ALL_TESTS();
 }