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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/base/video_frame.cc

Issue 2161193003: Use __func__ instead of __FUNCTION__. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resync Created 4 years, 5 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/base/video_codecs.cc ('k') | media/base/wall_clock_time_source.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/video_frame.cc
diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc
index a854fa7fe6b512036f7c1b628ab67bf08103e3b2..03d7f8714c0829c763d57b187de371cd922c2ebe 100644
--- a/media/base/video_frame.cc
+++ b/media/base/video_frame.cc
@@ -177,7 +177,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapNativeTextures(
}
const StorageType storage = STORAGE_OPAQUE;
if (!IsValidConfig(format, storage, coded_size, visible_rect, natural_size)) {
- LOG(DFATAL) << __FUNCTION__ << " Invalid config."
+ LOG(DFATAL) << __func__ << " Invalid config."
<< ConfigToString(format, storage, coded_size, visible_rect,
natural_size);
return nullptr;
@@ -232,7 +232,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalYuvData(
base::TimeDelta timestamp) {
const StorageType storage = STORAGE_UNOWNED_MEMORY;
if (!IsValidConfig(format, storage, coded_size, visible_rect, natural_size)) {
- LOG(DFATAL) << __FUNCTION__ << " Invalid config."
+ LOG(DFATAL) << __func__ << " Invalid config."
<< ConfigToString(format, storage, coded_size, visible_rect,
natural_size);
return nullptr;
@@ -267,7 +267,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalYuvGpuMemoryBuffers(
base::TimeDelta timestamp) {
const StorageType storage = STORAGE_GPU_MEMORY_BUFFERS;
if (!IsValidConfig(format, storage, coded_size, visible_rect, natural_size)) {
- LOG(DFATAL) << __FUNCTION__ << " Invalid config."
+ LOG(DFATAL) << __func__ << " Invalid config."
<< ConfigToString(format, storage, coded_size, visible_rect,
natural_size);
return nullptr;
@@ -304,7 +304,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalYuvaData(
base::TimeDelta timestamp) {
const StorageType storage = STORAGE_UNOWNED_MEMORY;
if (!IsValidConfig(format, storage, coded_size, visible_rect, natural_size)) {
- LOG(DFATAL) << __FUNCTION__ << " Invalid config."
+ LOG(DFATAL) << __func__ << " Invalid config."
<< ConfigToString(format, storage, coded_size, visible_rect,
natural_size);
return nullptr;
@@ -340,7 +340,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs(
base::TimeDelta timestamp) {
const StorageType storage = STORAGE_DMABUFS;
if (!IsValidConfig(format, storage, coded_size, visible_rect, natural_size)) {
- LOG(DFATAL) << __FUNCTION__ << " Invalid config."
+ LOG(DFATAL) << __func__ << " Invalid config."
<< ConfigToString(format, storage, coded_size, visible_rect,
natural_size);
return nullptr;
@@ -351,7 +351,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs(
new VideoFrame(format, storage, coded_size, visible_rect, natural_size,
mailbox_holders, ReleaseMailboxCB(), timestamp);
if (!frame || !frame->DuplicateFileDescriptors(dmabuf_fds)) {
- LOG(DFATAL) << __FUNCTION__ << " Couldn't duplicate fds.";
+ LOG(DFATAL) << __func__ << " Couldn't duplicate fds.";
return nullptr;
}
return frame;
@@ -388,7 +388,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapCVPixelBuffer(
const StorageType storage = STORAGE_UNOWNED_MEMORY;
if (!IsValidConfig(format, storage, coded_size, visible_rect, natural_size)) {
- LOG(DFATAL) << __FUNCTION__ << " Invalid config."
+ LOG(DFATAL) << __func__ << " Invalid config."
<< ConfigToString(format, storage, coded_size, visible_rect,
natural_size);
return nullptr;
@@ -414,7 +414,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame(
DCHECK(frame->visible_rect().Contains(visible_rect));
if (!AreValidPixelFormatsForWrap(frame->format(), format)) {
- LOG(DFATAL) << __FUNCTION__ << " Invalid format conversion."
+ LOG(DFATAL) << __func__ << " Invalid format conversion."
<< VideoPixelFormatToString(frame->format()) << " to "
<< VideoPixelFormatToString(format);
return nullptr;
@@ -422,7 +422,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame(
if (!IsValidConfig(format, frame->storage_type(), frame->coded_size(),
visible_rect, natural_size)) {
- LOG(DFATAL) << __FUNCTION__ << " Invalid config."
+ LOG(DFATAL) << __func__ << " Invalid config."
<< ConfigToString(format, frame->storage_type(),
frame->coded_size(), visible_rect,
natural_size);
@@ -448,7 +448,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame(
for (size_t i = 0; i < kMaxPlanes; ++i)
original_fds.push_back(frame->dmabuf_fd(i));
if (!wrapping_frame->DuplicateFileDescriptors(original_fds)) {
- LOG(DFATAL) << __FUNCTION__ << " Couldn't duplicate fds.";
+ LOG(DFATAL) << __func__ << " Couldn't duplicate fds.";
return nullptr;
}
}
@@ -515,7 +515,7 @@ scoped_refptr<VideoFrame> VideoFrame::CreateHoleFrame(
const StorageType storage = STORAGE_HOLE;
const gfx::Rect visible_rect = gfx::Rect(size);
if (!IsValidConfig(format, storage, size, visible_rect, size)) {
- LOG(DFATAL) << __FUNCTION__ << " Invalid config."
+ LOG(DFATAL) << __func__ << " Invalid config."
<< ConfigToString(format, storage, size, visible_rect, size);
return nullptr;
}
@@ -823,7 +823,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalStorage(
if (!IsValidConfig(format, storage_type, coded_size, visible_rect,
natural_size)) {
- LOG(DFATAL) << __FUNCTION__ << " Invalid config."
+ LOG(DFATAL) << __func__ << " Invalid config."
<< ConfigToString(format, storage_type, coded_size,
visible_rect, natural_size);
return nullptr;
@@ -989,7 +989,7 @@ scoped_refptr<VideoFrame> VideoFrame::CreateFrameInternal(
const StorageType storage = STORAGE_OWNED_MEMORY;
if (!IsValidConfig(format, storage, new_coded_size, visible_rect,
natural_size)) {
- LOG(DFATAL) << __FUNCTION__ << " Invalid config."
+ LOG(DFATAL) << __func__ << " Invalid config."
<< ConfigToString(format, storage, coded_size, visible_rect,
natural_size);
return nullptr;
« no previous file with comments | « media/base/video_codecs.cc ('k') | media/base/wall_clock_time_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698