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

Unified Diff: media/gpu/generic_v4l2_device.cc

Issue 2061823003: media: Drop "media::" in media/gpu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: work around clang format by adding an empty line Created 4 years, 6 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
« no previous file with comments | « media/gpu/fake_video_decode_accelerator.cc ('k') | media/gpu/gpu_video_decode_accelerator_factory_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/gpu/generic_v4l2_device.cc
diff --git a/media/gpu/generic_v4l2_device.cc b/media/gpu/generic_v4l2_device.cc
index 57fe87a7cb63cf197a456a0aef492a2a76df69b6..ebdc867b12a5b63f3b4ef6627a82488dc883806a 100644
--- a/media/gpu/generic_v4l2_device.cc
+++ b/media/gpu/generic_v4l2_device.cc
@@ -232,10 +232,10 @@ EGLImageKHR GenericV4L2Device::CreateEGLImage(
return EGL_NO_IMAGE_KHR;
}
- media::VideoPixelFormat vf_format = V4L2PixFmtToVideoPixelFormat(v4l2_pixfmt);
+ VideoPixelFormat vf_format = V4L2PixFmtToVideoPixelFormat(v4l2_pixfmt);
// Number of components, as opposed to the number of V4L2 planes, which is
// just a buffer count.
- size_t num_planes = media::VideoFrame::NumPlanes(vf_format);
+ size_t num_planes = VideoFrame::NumPlanes(vf_format);
DCHECK_LE(num_planes, 3u);
if (num_planes < dmabuf_fds.size()) {
// It's possible for more than one DRM plane to reside in one V4L2 plane,
@@ -266,15 +266,13 @@ EGLImageKHR GenericV4L2Device::CreateEGLImage(
attrs.push_back(EGL_DMA_BUF_PLANE0_OFFSET_EXT + plane * 3);
attrs.push_back(plane_offset);
attrs.push_back(EGL_DMA_BUF_PLANE0_PITCH_EXT + plane * 3);
- attrs.push_back(
- media::VideoFrame::RowBytes(plane, vf_format, size.width()));
+ attrs.push_back(VideoFrame::RowBytes(plane, vf_format, size.width()));
if (v4l2_plane + 1 < dmabuf_fds.size()) {
++v4l2_plane;
plane_offset = 0;
} else {
- plane_offset +=
- media::VideoFrame::PlaneSize(vf_format, plane, size).GetArea();
+ plane_offset += VideoFrame::PlaneSize(vf_format, plane, size).GetArea();
}
}
« no previous file with comments | « media/gpu/fake_video_decode_accelerator.cc ('k') | media/gpu/gpu_video_decode_accelerator_factory_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698