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

Unified Diff: media/filters/audio_timestamp_validator.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/ffmpeg/ffmpeg_common.cc ('k') | media/filters/chunk_demuxer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/audio_timestamp_validator.cc
diff --git a/media/filters/audio_timestamp_validator.cc b/media/filters/audio_timestamp_validator.cc
index 6597e962455d5e3b749c985063efeea097c67c71..1507efaef515036cdac05e0f5404ea1098288127 100644
--- a/media/filters/audio_timestamp_validator.cc
+++ b/media/filters/audio_timestamp_validator.cc
@@ -50,9 +50,8 @@ void AudioTimestampValidator::CheckForTimestampGap(
if (audio_base_ts_ == kNoTimestamp && !has_codec_delay_ &&
buffer->discard_padding().first == base::TimeDelta() &&
buffer->discard_padding().second == base::TimeDelta()) {
- DVLOG(3) << __FUNCTION__
- << " Expecting stable timestamps - stream has neither codec delay"
- << " nor discard padding.";
+ DVLOG(3) << __func__ << " Expecting stable timestamps - stream has neither "
+ << "codec delay nor discard padding.";
limit_unstable_audio_tries_ = 0;
}
@@ -66,7 +65,7 @@ void AudioTimestampValidator::CheckForTimestampGap(
// before producing the first decoded output.
if (!audio_output_ts_helper_) {
audio_base_ts_ = buffer->timestamp();
- DVLOG(3) << __FUNCTION__
+ DVLOG(3) << __func__
<< " setting audio_base:" << audio_base_ts_.InMicroseconds();
return;
}
@@ -83,8 +82,7 @@ void AudioTimestampValidator::CheckForTimestampGap(
if (!reached_stable_state_) {
if (std::abs(ts_delta.InMilliseconds()) < kStableTimeGapThrsholdMsec) {
reached_stable_state_ = true;
- DVLOG(3) << __FUNCTION__
- << " stabilized! tries:" << num_unstable_audio_tries_
+ DVLOG(3) << __func__ << " stabilized! tries:" << num_unstable_audio_tries_
<< " offset:"
<< audio_output_ts_helper_->base_timestamp().InMicroseconds();
} else {
@@ -95,7 +93,7 @@ void AudioTimestampValidator::CheckForTimestampGap(
audio_output_ts_helper_->SetBaseTimestamp(orig_offset + ts_delta);
audio_output_ts_helper_->AddFrames(decoded_frame_count);
- DVLOG(3) << __FUNCTION__
+ DVLOG(3) << __func__
<< " NOT stabilized. tries:" << num_unstable_audio_tries_
<< " offset was:" << orig_offset.InMicroseconds() << " now:"
<< audio_output_ts_helper_->base_timestamp().InMicroseconds();
@@ -121,7 +119,7 @@ void AudioTimestampValidator::CheckForTimestampGap(
// Increase threshold to avoid log spam but, let us know if gap widens.
drift_warning_threshold_msec_ = std::abs(ts_delta.InMilliseconds());
}
- DVLOG(3) << __FUNCTION__ << " delta:" << ts_delta.InMicroseconds()
+ DVLOG(3) << __func__ << " delta:" << ts_delta.InMicroseconds()
<< " expected_ts:" << expected_ts.InMicroseconds()
<< " actual_ts:" << buffer->timestamp().InMicroseconds()
<< " audio_ts_offset:"
@@ -139,7 +137,7 @@ void AudioTimestampValidator::RecordOutputDuration(
audio_output_ts_helper_->SetBaseTimestamp(audio_base_ts_);
}
- DVLOG(3) << __FUNCTION__ << " " << audio_buffer->frame_count() << " frames";
+ DVLOG(3) << __func__ << " " << audio_buffer->frame_count() << " frames";
audio_output_ts_helper_->AddFrames(audio_buffer->frame_count());
}
« no previous file with comments | « media/ffmpeg/ffmpeg_common.cc ('k') | media/filters/chunk_demuxer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698