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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/base/pipeline_impl.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/mime_util_internal.cc ('k') | media/base/video_codecs.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/pipeline_impl.cc
diff --git a/media/base/pipeline_impl.cc b/media/base/pipeline_impl.cc
index acd6b073eb421a0531badc3d15f341984ea7d952..e8e786731a7d00f938395a5a22dd928fc48f67d5 100644
--- a/media/base/pipeline_impl.cc
+++ b/media/base/pipeline_impl.cc
@@ -557,7 +557,7 @@ void PipelineImpl::RendererWrapper::OnSelectedVideoTrackChanged(
void PipelineImpl::RendererWrapper::OnStatisticsUpdate(
const PipelineStatistics& stats) {
- DVLOG(3) << __FUNCTION__;
+ DVLOG(3) << __func__;
DCHECK(media_task_runner_->BelongsToCurrentThread());
base::AutoLock auto_lock(shared_state_lock_);
@@ -572,7 +572,7 @@ void PipelineImpl::RendererWrapper::OnStatisticsUpdate(
void PipelineImpl::RendererWrapper::OnBufferingStateChange(
BufferingState state) {
DCHECK(media_task_runner_->BelongsToCurrentThread());
- DVLOG(2) << __FUNCTION__ << "(" << state << ") ";
+ DVLOG(2) << __func__ << "(" << state << ") ";
main_task_runner_->PostTask(
FROM_HERE,
@@ -720,7 +720,7 @@ void PipelineImpl::RendererWrapper::DoSeek(base::TimeDelta seek_timestamp,
}
void PipelineImpl::RendererWrapper::DoStop(const base::Closure& done_cb) {
- DVLOG(2) << __FUNCTION__;
+ DVLOG(2) << __func__;
DCHECK(media_task_runner_->BelongsToCurrentThread());
DCHECK_EQ(state_, kStopping);
DCHECK(!pending_callbacks_.get());
@@ -932,12 +932,12 @@ PipelineImpl::PipelineImpl(
playback_rate_(kDefaultPlaybackRate),
volume_(kDefaultVolume),
weak_factory_(this) {
- DVLOG(2) << __FUNCTION__;
+ DVLOG(2) << __func__;
renderer_wrapper_.reset(new RendererWrapper(media_task_runner_, media_log_));
}
PipelineImpl::~PipelineImpl() {
- DVLOG(2) << __FUNCTION__;
+ DVLOG(2) << __func__;
DCHECK(thread_checker_.CalledOnValidThread());
DCHECK(!client_) << "Stop() must complete before destroying object";
DCHECK(seek_cb_.is_null());
@@ -952,7 +952,7 @@ void PipelineImpl::Start(Demuxer* demuxer,
std::unique_ptr<Renderer> renderer,
Client* client,
const PipelineStatusCB& seek_cb) {
- DVLOG(2) << __FUNCTION__;
+ DVLOG(2) << __func__;
DCHECK(thread_checker_.CalledOnValidThread());
DCHECK(demuxer);
DCHECK(renderer);
@@ -982,7 +982,7 @@ void PipelineImpl::Start(Demuxer* demuxer,
}
void PipelineImpl::Stop() {
- DVLOG(2) << __FUNCTION__;
+ DVLOG(2) << __func__;
DCHECK(thread_checker_.CalledOnValidThread());
if (!IsRunning()) {
@@ -1033,7 +1033,7 @@ void PipelineImpl::Stop() {
}
void PipelineImpl::Seek(base::TimeDelta time, const PipelineStatusCB& seek_cb) {
- DVLOG(2) << __FUNCTION__ << " to " << time.InMicroseconds();
+ DVLOG(2) << __func__ << " to " << time.InMicroseconds();
DCHECK(thread_checker_.CalledOnValidThread());
DCHECK(!seek_cb.is_null());
@@ -1050,7 +1050,7 @@ void PipelineImpl::Seek(base::TimeDelta time, const PipelineStatusCB& seek_cb) {
}
void PipelineImpl::Suspend(const PipelineStatusCB& suspend_cb) {
- DVLOG(2) << __FUNCTION__;
+ DVLOG(2) << __func__;
DCHECK(!suspend_cb.is_null());
DCHECK(IsRunning());
@@ -1065,7 +1065,7 @@ void PipelineImpl::Suspend(const PipelineStatusCB& suspend_cb) {
void PipelineImpl::Resume(std::unique_ptr<Renderer> renderer,
base::TimeDelta time,
const PipelineStatusCB& seek_cb) {
- DVLOG(2) << __FUNCTION__;
+ DVLOG(2) << __func__;
DCHECK(thread_checker_.CalledOnValidThread());
DCHECK(renderer);
DCHECK(!seek_cb.is_null());
@@ -1091,7 +1091,7 @@ double PipelineImpl::GetPlaybackRate() const {
}
void PipelineImpl::SetPlaybackRate(double playback_rate) {
- DVLOG(2) << __FUNCTION__ << "(" << playback_rate << ")";
+ DVLOG(2) << __func__ << "(" << playback_rate << ")";
DCHECK(thread_checker_.CalledOnValidThread());
if (playback_rate < 0.0)
@@ -1110,7 +1110,7 @@ float PipelineImpl::GetVolume() const {
}
void PipelineImpl::SetVolume(float volume) {
- DVLOG(2) << __FUNCTION__ << "(" << volume << ")";
+ DVLOG(2) << __func__ << "(" << volume << ")";
DCHECK(thread_checker_.CalledOnValidThread());
if (volume < 0.0f || volume > 1.0f)
@@ -1150,7 +1150,7 @@ PipelineStatistics PipelineImpl::GetStatistics() const {
void PipelineImpl::SetCdm(CdmContext* cdm_context,
const CdmAttachedCB& cdm_attached_cb) {
- DVLOG(2) << __FUNCTION__;
+ DVLOG(2) << __func__;
DCHECK(thread_checker_.CalledOnValidThread());
DCHECK(cdm_context);
DCHECK(!cdm_attached_cb.is_null());
@@ -1187,7 +1187,7 @@ const char* PipelineImpl::GetStateString(State state) {
#undef RETURN_STRING
void PipelineImpl::OnError(PipelineStatus error) {
- DVLOG(2) << __FUNCTION__;
+ DVLOG(2) << __func__;
DCHECK(thread_checker_.CalledOnValidThread());
DCHECK_NE(PIPELINE_OK, error) << "PIPELINE_OK isn't an error!";
DCHECK(IsRunning());
@@ -1209,7 +1209,7 @@ void PipelineImpl::OnError(PipelineStatus error) {
}
void PipelineImpl::OnEnded() {
- DVLOG(2) << __FUNCTION__;
+ DVLOG(2) << __func__;
DCHECK(thread_checker_.CalledOnValidThread());
DCHECK(IsRunning());
@@ -1218,7 +1218,7 @@ void PipelineImpl::OnEnded() {
}
void PipelineImpl::OnMetadata(PipelineMetadata metadata) {
- DVLOG(2) << __FUNCTION__;
+ DVLOG(2) << __func__;
DCHECK(thread_checker_.CalledOnValidThread());
DCHECK(IsRunning());
@@ -1227,7 +1227,7 @@ void PipelineImpl::OnMetadata(PipelineMetadata metadata) {
}
void PipelineImpl::OnBufferingStateChange(BufferingState state) {
- DVLOG(2) << __FUNCTION__ << "(" << state << ")";
+ DVLOG(2) << __func__ << "(" << state << ")";
DCHECK(thread_checker_.CalledOnValidThread());
DCHECK(IsRunning());
@@ -1236,7 +1236,7 @@ void PipelineImpl::OnBufferingStateChange(BufferingState state) {
}
void PipelineImpl::OnDurationChange(base::TimeDelta duration) {
- DVLOG(2) << __FUNCTION__;
+ DVLOG(2) << __func__;
DCHECK(thread_checker_.CalledOnValidThread());
DCHECK(IsRunning());
@@ -1248,7 +1248,7 @@ void PipelineImpl::OnDurationChange(base::TimeDelta duration) {
void PipelineImpl::OnAddTextTrack(const TextTrackConfig& config,
const AddTextTrackDoneCB& done_cb) {
- DVLOG(2) << __FUNCTION__;
+ DVLOG(2) << __func__;
DCHECK(thread_checker_.CalledOnValidThread());
DCHECK(IsRunning());
@@ -1257,7 +1257,7 @@ void PipelineImpl::OnAddTextTrack(const TextTrackConfig& config,
}
void PipelineImpl::OnWaitingForDecryptionKey() {
- DVLOG(2) << __FUNCTION__;
+ DVLOG(2) << __func__;
DCHECK(thread_checker_.CalledOnValidThread());
DCHECK(IsRunning());
@@ -1266,7 +1266,7 @@ void PipelineImpl::OnWaitingForDecryptionKey() {
}
void PipelineImpl::OnVideoNaturalSizeChange(const gfx::Size& size) {
- DVLOG(2) << __FUNCTION__;
+ DVLOG(2) << __func__;
DCHECK(thread_checker_.CalledOnValidThread());
DCHECK(IsRunning());
@@ -1275,7 +1275,7 @@ void PipelineImpl::OnVideoNaturalSizeChange(const gfx::Size& size) {
}
void PipelineImpl::OnVideoOpacityChange(bool opaque) {
- DVLOG(2) << __FUNCTION__;
+ DVLOG(2) << __func__;
DCHECK(thread_checker_.CalledOnValidThread());
DCHECK(IsRunning());
@@ -1284,7 +1284,7 @@ void PipelineImpl::OnVideoOpacityChange(bool opaque) {
}
void PipelineImpl::OnSeekDone(base::TimeDelta start_time) {
- DVLOG(3) << __FUNCTION__ << "(" << start_time.InMicroseconds() << ")";
+ DVLOG(3) << __func__ << "(" << start_time.InMicroseconds() << ")";
DCHECK(thread_checker_.CalledOnValidThread());
DCHECK(IsRunning());
@@ -1293,7 +1293,7 @@ void PipelineImpl::OnSeekDone(base::TimeDelta start_time) {
}
void PipelineImpl::OnSuspendDone(base::TimeDelta suspend_time) {
- DVLOG(3) << __FUNCTION__ << "(" << suspend_time.InMicroseconds() << ")";
+ DVLOG(3) << __func__ << "(" << suspend_time.InMicroseconds() << ")";
DCHECK(thread_checker_.CalledOnValidThread());
DCHECK(IsRunning());
« no previous file with comments | « media/base/mime_util_internal.cc ('k') | media/base/video_codecs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698