Index: media/gpu/tegra_v4l2_device.cc |
diff --git a/content/common/gpu/media/tegra_v4l2_device.cc b/media/gpu/tegra_v4l2_device.cc |
similarity index 95% |
rename from content/common/gpu/media/tegra_v4l2_device.cc |
rename to media/gpu/tegra_v4l2_device.cc |
index a28644964d5972b85503093b1975daf979f000dc..320cc32b70beb1116c780b883ad2f234a3fd65f5 100644 |
--- a/content/common/gpu/media/tegra_v4l2_device.cc |
+++ b/media/gpu/tegra_v4l2_device.cc |
@@ -9,10 +9,10 @@ |
#include "base/lazy_instance.h" |
#include "base/posix/eintr_wrapper.h" |
#include "base/trace_event/trace_event.h" |
-#include "content/common/gpu/media/tegra_v4l2_device.h" |
+#include "media/gpu/tegra_v4l2_device.h" |
#include "ui/gl/gl_bindings.h" |
-namespace content { |
+namespace media { |
namespace { |
const char kDecoderDevice[] = "/dev/tegra_avpchannel"; |
@@ -93,9 +93,7 @@ base::LazyInstance<TegraFunctionSymbolFinder> g_tegra_function_symbol_finder_ = |
LAZY_INSTANCE_INITIALIZER; |
TegraV4L2Device::TegraV4L2Device(Type type) |
- : V4L2Device(type), |
- device_fd_(-1) { |
-} |
+ : V4L2Device(type), device_fd_(-1) {} |
TegraV4L2Device::~TegraV4L2Device() { |
if (device_fd_ != -1) { |
@@ -204,11 +202,8 @@ EGLImageKHR TegraV4L2Device::CreateEGLImage(EGLDisplay egl_display, |
EGLint attr = EGL_NONE; |
EGLImageKHR egl_image = |
- eglCreateImageKHR(egl_display, |
- egl_context, |
- EGL_GL_TEXTURE_2D_KHR, |
- reinterpret_cast<EGLClientBuffer>(texture_id), |
- &attr); |
+ eglCreateImageKHR(egl_display, egl_context, EGL_GL_TEXTURE_2D_KHR, |
+ reinterpret_cast<EGLClientBuffer>(texture_id), &attr); |
if (egl_image == EGL_NO_IMAGE_KHR) { |
LOG(ERROR) << "Unable to create EGL image"; |
return egl_image; |
@@ -226,7 +221,9 @@ EGLBoolean TegraV4L2Device::DestroyEGLImage(EGLDisplay egl_display, |
return eglDestroyImageKHR(egl_display, egl_image); |
} |
-GLenum TegraV4L2Device::GetTextureTarget() { return GL_TEXTURE_2D; } |
+GLenum TegraV4L2Device::GetTextureTarget() { |
+ return GL_TEXTURE_2D; |
+} |
uint32_t TegraV4L2Device::PreferredInputFormat() { |
// TODO(posciak): We should support "dontcare" returns here once we |
@@ -235,4 +232,4 @@ uint32_t TegraV4L2Device::PreferredInputFormat() { |
return V4L2_PIX_FMT_YUV420M; |
} |
-} // namespace content |
+} // namespace media |