Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1393)

Unified Diff: content/common/gpu/media/video_decode_accelerator_unittest.cc

Issue 137023008: Add support for Tegra V4L2 VDA (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 7c4874996df2d9688b6f6543d54a4b582e95240f..2cf297110103760f59364115d87136d2aeaa4af1 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>
@@ -556,7 +557,8 @@ void GLRenderingVDAClient::CreateAndStartDecoder() {
new DXVAVideoDecodeAccelerator(base::Bind(&DoNothingReturnTrue)));
#elif defined(OS_CHROMEOS) && 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;
@@ -1542,6 +1544,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
+
CommandLine::SwitchMap switches = cmd_line->GetSwitches();
for (CommandLine::SwitchMap::const_iterator it = switches.begin();
it != switches.end(); ++it) {

Powered by Google App Engine
This is Rietveld 408576698