summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorajose <ajose@chromium.org>2015-07-06 11:47:34 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-06 18:48:10 +0000
commit2a0235f2be225a99f0fabee2b39bd91ba9845bef (patch)
treeb21ce2e19788a0faa1f5d2527855f86a5865eaca /media
parent9cfae7cc7be9c99eb1b6a528d9393d9350901c63 (diff)
downloadchromium_src-2a0235f2be225a99f0fabee2b39bd91ba9845bef.zip
chromium_src-2a0235f2be225a99f0fabee2b39bd91ba9845bef.tar.gz
chromium_src-2a0235f2be225a99f0fabee2b39bd91ba9845bef.tar.bz2
Cleanup - switch to consistent static annotation.
//static => // static Review URL: https://codereview.chromium.org/1221623008 Cr-Commit-Position: refs/heads/master@{#337427}
Diffstat (limited to 'media')
-rw-r--r--media/base/video_capture_types.cc4
-rw-r--r--media/base/video_frame.cc6
-rw-r--r--media/video/capture/android/video_capture_device_factory_android.cc2
-rw-r--r--media/video/capture/linux/v4l2_capture_delegate.cc4
-rw-r--r--media/video/capture/mac/video_capture_device_decklink_mac.mm2
5 files changed, 9 insertions, 9 deletions
diff --git a/media/base/video_capture_types.cc b/media/base/video_capture_types.cc
index 5c2439b..1796bf2 100644
--- a/media/base/video_capture_types.cc
+++ b/media/base/video_capture_types.cc
@@ -85,7 +85,7 @@ std::string VideoCaptureFormat::ToString(const VideoCaptureFormat& format) {
PixelStorageToString(format.pixel_storage).c_str());
}
-//static
+// static
std::string VideoCaptureFormat::PixelFormatToString(VideoPixelFormat format) {
switch (format) {
case PIXEL_FORMAT_UNKNOWN:
@@ -115,7 +115,7 @@ std::string VideoCaptureFormat::PixelFormatToString(VideoPixelFormat format) {
return std::string();
}
-//static
+// static
std::string VideoCaptureFormat::PixelStorageToString(
VideoPixelStorage storage) {
switch (storage) {
diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc
index e0367c8..1d36743 100644
--- a/media/base/video_frame.cc
+++ b/media/base/video_frame.cc
@@ -39,7 +39,7 @@ static bool IsValidPlane(size_t plane, VideoFrame::Format format) {
}
// Returns true if |frame| is accesible mapped in the VideoFrame memory space.
-//static
+// static
static bool IsStorageTypeMappable(VideoFrame::StorageType storage_type) {
return
#if defined(OS_LINUX)
@@ -152,7 +152,7 @@ std::string VideoFrame::FormatToString(Format format) {
return "";
}
-//static
+// static
bool VideoFrame::IsYuvPlanar(Format format) {
switch (format) {
case YV12:
@@ -606,7 +606,7 @@ size_t VideoFrame::Columns(size_t plane, Format format, int width) {
return RoundUp(width, sample_width) / sample_width;
}
-//static
+// static
void VideoFrame::HashFrameForTesting(base::MD5Context* context,
const scoped_refptr<VideoFrame>& frame) {
DCHECK(context);
diff --git a/media/video/capture/android/video_capture_device_factory_android.cc b/media/video/capture/android/video_capture_device_factory_android.cc
index 074fb50..4a71d0f 100644
--- a/media/video/capture/android/video_capture_device_factory_android.cc
+++ b/media/video/capture/android/video_capture_device_factory_android.cc
@@ -21,7 +21,7 @@ bool VideoCaptureDeviceFactoryAndroid::RegisterVideoCaptureDeviceFactory(
return RegisterNativesImpl(env);
}
-//static
+// static
ScopedJavaLocalRef<jobject>
VideoCaptureDeviceFactoryAndroid::createVideoCaptureAndroid(
int id,
diff --git a/media/video/capture/linux/v4l2_capture_delegate.cc b/media/video/capture/linux/v4l2_capture_delegate.cc
index bca49e6..de9edb9 100644
--- a/media/video/capture/linux/v4l2_capture_delegate.cc
+++ b/media/video/capture/linux/v4l2_capture_delegate.cc
@@ -81,7 +81,7 @@ V4L2CaptureDelegate::CreateV4L2CaptureDelegate(
}
}
-//static
+// static
size_t V4L2CaptureDelegate::GetNumPlanesForFourCc(uint32_t fourcc) {
for (const auto& fourcc_and_pixel_format : kSupportedFormatsAndPlanarity) {
if (fourcc_and_pixel_format.fourcc == fourcc)
@@ -118,7 +118,7 @@ std::list<uint32_t> V4L2CaptureDelegate::GetListOfUsableFourCcs(
return supported_formats;
}
-//static
+// static
std::string V4L2CaptureDelegate::FourccToString(uint32_t fourcc) {
return base::StringPrintf("%c%c%c%c", fourcc & 0xFF, (fourcc >> 8) & 0xFF,
(fourcc >> 16) & 0xFF, (fourcc >> 24) & 0xFF);
diff --git a/media/video/capture/mac/video_capture_device_decklink_mac.mm b/media/video/capture/mac/video_capture_device_decklink_mac.mm
index bfc0831..c494304 100644
--- a/media/video/capture/mac/video_capture_device_decklink_mac.mm
+++ b/media/video/capture/mac/video_capture_device_decklink_mac.mm
@@ -317,7 +317,7 @@ static std::string JoinDeviceNameAndFormat(CFStringRef name,
base::SysCFStringRefToUTF8(format);
}
-//static
+// static
void VideoCaptureDeviceDeckLinkMac::EnumerateDevices(
VideoCaptureDevice::Names* device_names) {
scoped_refptr<IDeckLinkIterator> decklink_iter(