Index: content/common/gpu/media/video_decode_accelerator_unittest.cc |
diff --git a/content/common/gpu/media/video_decode_accelerator_unittest.cc b/content/common/gpu/media/video_decode_accelerator_unittest.cc |
index 8397020c954cd664d234f64303cafb8fdd5d41e7..2a0b97528c3b1fc36e0caf4bf253d417cdc74964 100644 |
--- a/content/common/gpu/media/video_decode_accelerator_unittest.cc |
+++ b/content/common/gpu/media/video_decode_accelerator_unittest.cc |
@@ -14,6 +14,7 @@ |
// - Finally actual TEST cases are at the bottom of this file, using the above |
// infrastructure. |
+#include <dlfcn.h> |
#include <fcntl.h> |
#include <sys/stat.h> |
#include <sys/types.h> |
@@ -559,7 +560,8 @@ void GLRenderingVDAClient::CreateAndStartDecoder() { |
#elif defined(OS_CHROMEOS) |
#if defined(ARCH_CPU_ARMEL) |
- scoped_ptr<V4L2Device> device = V4L2Device::Create(); |
+ scoped_ptr<V4L2Device> device = V4L2Device::Create( |
+ static_cast<EGLContext>(rendering_helper_->GetGLContext())); |
if (!device.get()) { |
NotifyError(media::VideoDecodeAccelerator::PLATFORM_FAILURE); |
return; |
@@ -1555,6 +1557,11 @@ int main(int argc, char **argv) { |
CommandLine* cmd_line = CommandLine::ForCurrentProcess(); |
DCHECK(cmd_line); |
+#if defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL) |
+ dlopen("/usr/lib/libtegrav4l2.so", RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE); |
+ errno = 0; |
+#endif |
sheu
2014/03/07 00:18:08
VaapiWrapper does the dlopen once statically in In
|
+ |
CommandLine::SwitchMap switches = cmd_line->GetSwitches(); |
for (CommandLine::SwitchMap::const_iterator it = switches.begin(); |
it != switches.end(); ++it) { |