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

Unified Diff: media/filters/ffmpeg_demuxer.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/filters/decrypting_video_decoder.cc ('k') | media/filters/frame_processor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_demuxer.cc
diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
index 153157b7e379962ada266c9e7de0b99b5eed34ff..2cf751dda302da653d91a5e51b52d029d3bbe7c2 100644
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
@@ -1532,7 +1532,7 @@ void FFmpegDemuxer::OnEnabledAudioTracksChanged(
DCHECK(track_id_to_demux_stream_map_[track_ids[0]] == audio_stream);
enabled = true;
}
- DVLOG(1) << __FUNCTION__ << ": " << (enabled ? "enabling" : "disabling")
+ DVLOG(1) << __func__ << ": " << (enabled ? "enabling" : "disabling")
<< " audio stream";
audio_stream->set_enabled(enabled, currTime);
}
@@ -1548,7 +1548,7 @@ void FFmpegDemuxer::OnSelectedVideoTrackChanged(
DCHECK(track_id_to_demux_stream_map_[track_ids[0]] == video_stream);
enabled = true;
}
- DVLOG(1) << __FUNCTION__ << ": " << (enabled ? "enabling" : "disabling")
+ DVLOG(1) << __func__ << ": " << (enabled ? "enabling" : "disabling")
<< " video stream";
video_stream->set_enabled(enabled, currTime);
}
@@ -1591,7 +1591,7 @@ void FFmpegDemuxer::OnReadFrameDone(ScopedAVPacket packet, int result) {
// - either underlying ffmpeg returned an error
// - or FFMpegDemuxer reached the maximum allowed memory usage.
if (result < 0 || IsMaxMemoryUsageReached()) {
- LOG(ERROR) << __FUNCTION__ << " result=" << result
+ LOG(ERROR) << __func__ << " result=" << result
<< " IsMaxMemoryUsageReached=" << IsMaxMemoryUsageReached();
// Update the duration based on the highest elapsed time across all streams
// if it was previously unknown.
« no previous file with comments | « media/filters/decrypting_video_decoder.cc ('k') | media/filters/frame_processor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698