Index: media/gpu/v4l2_device.cc |
diff --git a/content/common/gpu/media/v4l2_device.cc b/media/gpu/v4l2_device.cc |
similarity index 95% |
rename from content/common/gpu/media/v4l2_device.cc |
rename to media/gpu/v4l2_device.cc |
index fec869a371b8a34e9f021e6e8ba7f2f387703937..0090f2fff42edded0eedbb2f740d2de8713399cb 100644 |
--- a/content/common/gpu/media/v4l2_device.cc |
+++ b/media/gpu/v4l2_device.cc |
@@ -8,18 +8,16 @@ |
#include "base/numerics/safe_conversions.h" |
#include "build/build_config.h" |
-#include "content/common/gpu/media/generic_v4l2_device.h" |
+#include "media/gpu/generic_v4l2_device.h" |
#if defined(ARCH_CPU_ARMEL) |
-#include "content/common/gpu/media/tegra_v4l2_device.h" |
+#include "media/gpu/tegra_v4l2_device.h" |
#endif |
-namespace content { |
+namespace media { |
-V4L2Device::V4L2Device(Type type) : type_(type) { |
-} |
+V4L2Device::V4L2Device(Type type) : type_(type) {} |
-V4L2Device::~V4L2Device() { |
-} |
+V4L2Device::~V4L2Device() {} |
// static |
scoped_refptr<V4L2Device> V4L2Device::Create(Type type) { |
@@ -83,8 +81,7 @@ uint32_t V4L2Device::VideoPixelFormatToV4L2PixFmt( |
uint32_t V4L2Device::VideoCodecProfileToV4L2PixFmt( |
media::VideoCodecProfile profile, |
bool slice_based) { |
- if (profile >= media::H264PROFILE_MIN && |
- profile <= media::H264PROFILE_MAX) { |
+ if (profile >= media::H264PROFILE_MIN && profile <= media::H264PROFILE_MAX) { |
if (slice_based) |
return V4L2_PIX_FMT_H264_SLICE; |
else |
@@ -245,14 +242,14 @@ void V4L2Device::GetSupportedResolution(uint32_t pixelformat, |
if (max_resolution->IsEmpty()) { |
max_resolution->SetSize(1920, 1088); |
LOG(ERROR) << "GetSupportedResolution failed to get maximum resolution for " |
- << "fourcc " << std::hex << pixelformat |
- << ", fall back to " << max_resolution->ToString(); |
+ << "fourcc " << std::hex << pixelformat << ", fall back to " |
+ << max_resolution->ToString(); |
} |
if (min_resolution->IsEmpty()) { |
min_resolution->SetSize(16, 16); |
LOG(ERROR) << "GetSupportedResolution failed to get minimum resolution for " |
- << "fourcc " << std::hex << pixelformat |
- << ", fall back to " << min_resolution->ToString(); |
+ << "fourcc " << std::hex << pixelformat << ", fall back to " |
+ << min_resolution->ToString(); |
} |
} |
@@ -321,4 +318,4 @@ bool V4L2Device::SupportsDecodeProfileForV4L2PixelFormats( |
return iter != supported_profiles.end(); |
} |
-} // namespace content |
+} // namespace media |