From 2641e73ea3080ca6faf5e84c23fb44bad0220fbc Mon Sep 17 00:00:00 2001 From: JW Wang Date: Fri, 24 Mar 2017 11:35:45 +0800 Subject: [PATCH] Bug 1350203. P2 - rename VERBOSE_LOG to LOGV. r=kaku MozReview-Commit-ID: IM8t69P5dU4 --HG-- extra : rebase_source : dc6325c87c368079c766f884551db1baba67c7f9 --- dom/media/MediaDecoderStateMachine.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dom/media/MediaDecoderStateMachine.cpp b/dom/media/MediaDecoderStateMachine.cpp index 393e06c70840..758c676168c3 100644 --- a/dom/media/MediaDecoderStateMachine.cpp +++ b/dom/media/MediaDecoderStateMachine.cpp @@ -67,7 +67,7 @@ using namespace mozilla::media; // avoid redefined macro in unified build #undef FMT #undef LOG -#undef VERBOSE_LOG +#undef LOGV #undef SAMPLE_LOG #undef DECODER_WARN #undef SFMT @@ -76,7 +76,7 @@ using namespace mozilla::media; #define FMT(x, ...) "Decoder=%p " x, mDecoderID, ##__VA_ARGS__ #define LOG(x, ...) MOZ_LOG(gMediaDecoderLog, LogLevel::Debug, (FMT(x, ##__VA_ARGS__))) -#define VERBOSE_LOG(x, ...) MOZ_LOG(gMediaDecoderLog, LogLevel::Verbose, (FMT(x, ##__VA_ARGS__))) +#define LOGV(x, ...) MOZ_LOG(gMediaDecoderLog, LogLevel::Verbose, (FMT(x, ##__VA_ARGS__))) #define SAMPLE_LOG(x, ...) MOZ_LOG(gMediaSampleLog, LogLevel::Debug, (FMT(x, ##__VA_ARGS__))) #define DECODER_WARN(x, ...) NS_WARNING(nsPrintfCString(FMT(x, ##__VA_ARGS__)).get()) @@ -3674,7 +3674,7 @@ MediaDecoderStateMachine::OnMediaSinkVideoComplete() { MOZ_ASSERT(OnTaskQueue()); MOZ_ASSERT(HasVideo()); - VERBOSE_LOG("[%s]", __func__); + LOGV("[%s]", __func__); mMediaSinkVideoPromise.Complete(); mVideoCompleted = true; @@ -3686,7 +3686,7 @@ MediaDecoderStateMachine::OnMediaSinkVideoError() { MOZ_ASSERT(OnTaskQueue()); MOZ_ASSERT(HasVideo()); - VERBOSE_LOG("[%s]", __func__); + LOGV("[%s]", __func__); mMediaSinkVideoPromise.Complete(); mVideoCompleted = true; @@ -3700,7 +3700,7 @@ void MediaDecoderStateMachine::OnMediaSinkAudioComplete() { MOZ_ASSERT(OnTaskQueue()); MOZ_ASSERT(HasAudio()); - VERBOSE_LOG("[%s]", __func__); + LOGV("[%s]", __func__); mMediaSinkAudioPromise.Complete(); mAudioCompleted = true; @@ -3716,7 +3716,7 @@ void MediaDecoderStateMachine::OnMediaSinkAudioError(nsresult aResult) { MOZ_ASSERT(OnTaskQueue()); MOZ_ASSERT(HasAudio()); - VERBOSE_LOG("[%s]", __func__); + LOGV("[%s]", __func__); mMediaSinkAudioPromise.Complete(); mAudioCompleted = true; @@ -3929,4 +3929,5 @@ MediaDecoderStateMachine::CancelSuspendTimer() // avoid redefined macro in unified build #undef LOG +#undef LOGV #undef NS_DispatchToMainThread