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

Unified Diff: media/formats/mpeg/mpeg_audio_stream_parser_base.cc

Issue 2518403004: media: Use __func__ instead of __FUNCTION__ (Closed)
Patch Set: rebase Created 4 years 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/formats/mp4/track_run_iterator.cc ('k') | media/formats/webm/webm_cluster_parser_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/formats/mpeg/mpeg_audio_stream_parser_base.cc
diff --git a/media/formats/mpeg/mpeg_audio_stream_parser_base.cc b/media/formats/mpeg/mpeg_audio_stream_parser_base.cc
index 093d863011b250b0063a5d6d586833f3ff1c6bd0..338a202024b838865fd9fa1b1b800d3e3556f9ea 100644
--- a/media/formats/mpeg/mpeg_audio_stream_parser_base.cc
+++ b/media/formats/mpeg/mpeg_audio_stream_parser_base.cc
@@ -70,7 +70,7 @@ void MPEGAudioStreamParserBase::Init(
const NewMediaSegmentCB& new_segment_cb,
const EndMediaSegmentCB& end_of_segment_cb,
const scoped_refptr<MediaLog>& media_log) {
- DVLOG(1) << __FUNCTION__;
+ DVLOG(1) << __func__;
DCHECK_EQ(state_, UNINITIALIZED);
init_cb_ = init_cb;
config_cb_ = config_cb;
@@ -83,7 +83,7 @@ void MPEGAudioStreamParserBase::Init(
}
void MPEGAudioStreamParserBase::Flush() {
- DVLOG(1) << __FUNCTION__;
+ DVLOG(1) << __func__;
DCHECK_NE(state_, UNINITIALIZED);
queue_.Reset();
if (timestamp_helper_)
@@ -92,7 +92,7 @@ void MPEGAudioStreamParserBase::Flush() {
}
bool MPEGAudioStreamParserBase::Parse(const uint8_t* buf, int size) {
- DVLOG(1) << __FUNCTION__ << "(" << size << ")";
+ DVLOG(1) << __func__ << "(" << size << ")";
DCHECK(buf);
DCHECK_GT(size, 0);
DCHECK_NE(state_, UNINITIALIZED);
@@ -165,14 +165,14 @@ bool MPEGAudioStreamParserBase::Parse(const uint8_t* buf, int size) {
}
void MPEGAudioStreamParserBase::ChangeState(State state) {
- DVLOG(1) << __FUNCTION__ << "() : " << state_ << " -> " << state;
+ DVLOG(1) << __func__ << "() : " << state_ << " -> " << state;
state_ = state;
}
int MPEGAudioStreamParserBase::ParseFrame(const uint8_t* data,
int size,
BufferQueue* buffers) {
- DVLOG(2) << __FUNCTION__ << "(" << size << ")";
+ DVLOG(2) << __func__ << "(" << size << ")";
int sample_rate;
ChannelLayout channel_layout;
@@ -251,7 +251,7 @@ int MPEGAudioStreamParserBase::ParseFrame(const uint8_t* data,
int MPEGAudioStreamParserBase::ParseIcecastHeader(const uint8_t* data,
int size) {
- DVLOG(1) << __FUNCTION__ << "(" << size << ")";
+ DVLOG(1) << __func__ << "(" << size << ")";
if (size < 4)
return 0;
@@ -274,7 +274,7 @@ int MPEGAudioStreamParserBase::ParseIcecastHeader(const uint8_t* data,
}
int MPEGAudioStreamParserBase::ParseID3v1(const uint8_t* data, int size) {
- DVLOG(1) << __FUNCTION__ << "(" << size << ")";
+ DVLOG(1) << __func__ << "(" << size << ")";
if (size < kID3v1Size)
return 0;
@@ -285,7 +285,7 @@ int MPEGAudioStreamParserBase::ParseID3v1(const uint8_t* data, int size) {
}
int MPEGAudioStreamParserBase::ParseID3v2(const uint8_t* data, int size) {
- DVLOG(1) << __FUNCTION__ << "(" << size << ")";
+ DVLOG(1) << __func__ << "(" << size << ")";
if (size < 10)
return 0;
« no previous file with comments | « media/formats/mp4/track_run_iterator.cc ('k') | media/formats/webm/webm_cluster_parser_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698