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

Unified Diff: media/formats/mp4/track_run_iterator.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/hevc.cc ('k') | media/formats/mpeg/mpeg_audio_stream_parser_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/formats/mp4/track_run_iterator.cc
diff --git a/media/formats/mp4/track_run_iterator.cc b/media/formats/mp4/track_run_iterator.cc
index b2f6e7399f9cfb633164203dadec2685a5ff4476..545e39ca1d518b146cdbc6b02136d9240e7f1d4a 100644
--- a/media/formats/mp4/track_run_iterator.cc
+++ b/media/formats/mp4/track_run_iterator.cc
@@ -144,13 +144,13 @@ static bool PopulateSampleInfo(const TrackExtends& trex,
uint32_t flags;
if (i < trun.sample_flags.size()) {
flags = trun.sample_flags[i];
- DVLOG(4) << __FUNCTION__ << " trun sample flags " << HexFlags(flags);
+ DVLOG(4) << __func__ << " trun sample flags " << HexFlags(flags);
} else if (tfhd.has_default_sample_flags) {
flags = tfhd.default_sample_flags;
- DVLOG(4) << __FUNCTION__ << " tfhd sample flags " << HexFlags(flags);
+ DVLOG(4) << __func__ << " tfhd sample flags " << HexFlags(flags);
} else {
flags = trex.default_sample_flags;
- DVLOG(4) << __FUNCTION__ << " trex sample flags " << HexFlags(flags);
+ DVLOG(4) << __func__ << " trex sample flags " << HexFlags(flags);
}
SampleDependsOn sample_depends_on =
@@ -158,7 +158,7 @@ static bool PopulateSampleInfo(const TrackExtends& trex,
if (sample_depends_on == kSampleDependsOnUnknown) {
sample_depends_on = sdtp_sample_depends_on;
}
- DVLOG(4) << __FUNCTION__ << " sample_depends_on " << sample_depends_on;
+ DVLOG(4) << __func__ << " sample_depends_on " << sample_depends_on;
if (sample_depends_on == kSampleDependsOnReserved) {
MEDIA_LOG(ERROR, media_log) << "Reserved value used in sample dependency"
" info.";
@@ -180,10 +180,9 @@ static bool PopulateSampleInfo(const TrackExtends& trex,
sample_info->is_keyframe = sample_is_sync_sample &&
(!sample_depends_on_others || is_audio);
- DVLOG(4) << __FUNCTION__ << " is_kf:" << sample_info->is_keyframe
+ DVLOG(4) << __func__ << " is_kf:" << sample_info->is_keyframe
<< " is_sync:" << sample_is_sync_sample
- << " deps:" << sample_depends_on_others
- << " audio:" << is_audio;
+ << " deps:" << sample_depends_on_others << " audio:" << is_audio;
return true;
}
« no previous file with comments | « media/formats/mp4/hevc.cc ('k') | media/formats/mpeg/mpeg_audio_stream_parser_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698