зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1350203. P2 - rename VERBOSE_LOG to LOGV. r=kaku
MozReview-Commit-ID: IM8t69P5dU4 --HG-- extra : rebase_source : dc6325c87c368079c766f884551db1baba67c7f9
This commit is contained in:
Родитель
3fd71fee63
Коммит
2641e73ea3
|
@ -67,7 +67,7 @@ using namespace mozilla::media;
|
||||||
// avoid redefined macro in unified build
|
// avoid redefined macro in unified build
|
||||||
#undef FMT
|
#undef FMT
|
||||||
#undef LOG
|
#undef LOG
|
||||||
#undef VERBOSE_LOG
|
#undef LOGV
|
||||||
#undef SAMPLE_LOG
|
#undef SAMPLE_LOG
|
||||||
#undef DECODER_WARN
|
#undef DECODER_WARN
|
||||||
#undef SFMT
|
#undef SFMT
|
||||||
|
@ -76,7 +76,7 @@ using namespace mozilla::media;
|
||||||
|
|
||||||
#define FMT(x, ...) "Decoder=%p " x, mDecoderID, ##__VA_ARGS__
|
#define FMT(x, ...) "Decoder=%p " x, mDecoderID, ##__VA_ARGS__
|
||||||
#define LOG(x, ...) MOZ_LOG(gMediaDecoderLog, LogLevel::Debug, (FMT(x, ##__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 SAMPLE_LOG(x, ...) MOZ_LOG(gMediaSampleLog, LogLevel::Debug, (FMT(x, ##__VA_ARGS__)))
|
||||||
#define DECODER_WARN(x, ...) NS_WARNING(nsPrintfCString(FMT(x, ##__VA_ARGS__)).get())
|
#define DECODER_WARN(x, ...) NS_WARNING(nsPrintfCString(FMT(x, ##__VA_ARGS__)).get())
|
||||||
|
|
||||||
|
@ -3674,7 +3674,7 @@ MediaDecoderStateMachine::OnMediaSinkVideoComplete()
|
||||||
{
|
{
|
||||||
MOZ_ASSERT(OnTaskQueue());
|
MOZ_ASSERT(OnTaskQueue());
|
||||||
MOZ_ASSERT(HasVideo());
|
MOZ_ASSERT(HasVideo());
|
||||||
VERBOSE_LOG("[%s]", __func__);
|
LOGV("[%s]", __func__);
|
||||||
|
|
||||||
mMediaSinkVideoPromise.Complete();
|
mMediaSinkVideoPromise.Complete();
|
||||||
mVideoCompleted = true;
|
mVideoCompleted = true;
|
||||||
|
@ -3686,7 +3686,7 @@ MediaDecoderStateMachine::OnMediaSinkVideoError()
|
||||||
{
|
{
|
||||||
MOZ_ASSERT(OnTaskQueue());
|
MOZ_ASSERT(OnTaskQueue());
|
||||||
MOZ_ASSERT(HasVideo());
|
MOZ_ASSERT(HasVideo());
|
||||||
VERBOSE_LOG("[%s]", __func__);
|
LOGV("[%s]", __func__);
|
||||||
|
|
||||||
mMediaSinkVideoPromise.Complete();
|
mMediaSinkVideoPromise.Complete();
|
||||||
mVideoCompleted = true;
|
mVideoCompleted = true;
|
||||||
|
@ -3700,7 +3700,7 @@ void MediaDecoderStateMachine::OnMediaSinkAudioComplete()
|
||||||
{
|
{
|
||||||
MOZ_ASSERT(OnTaskQueue());
|
MOZ_ASSERT(OnTaskQueue());
|
||||||
MOZ_ASSERT(HasAudio());
|
MOZ_ASSERT(HasAudio());
|
||||||
VERBOSE_LOG("[%s]", __func__);
|
LOGV("[%s]", __func__);
|
||||||
|
|
||||||
mMediaSinkAudioPromise.Complete();
|
mMediaSinkAudioPromise.Complete();
|
||||||
mAudioCompleted = true;
|
mAudioCompleted = true;
|
||||||
|
@ -3716,7 +3716,7 @@ void MediaDecoderStateMachine::OnMediaSinkAudioError(nsresult aResult)
|
||||||
{
|
{
|
||||||
MOZ_ASSERT(OnTaskQueue());
|
MOZ_ASSERT(OnTaskQueue());
|
||||||
MOZ_ASSERT(HasAudio());
|
MOZ_ASSERT(HasAudio());
|
||||||
VERBOSE_LOG("[%s]", __func__);
|
LOGV("[%s]", __func__);
|
||||||
|
|
||||||
mMediaSinkAudioPromise.Complete();
|
mMediaSinkAudioPromise.Complete();
|
||||||
mAudioCompleted = true;
|
mAudioCompleted = true;
|
||||||
|
@ -3929,4 +3929,5 @@ MediaDecoderStateMachine::CancelSuspendTimer()
|
||||||
|
|
||||||
// avoid redefined macro in unified build
|
// avoid redefined macro in unified build
|
||||||
#undef LOG
|
#undef LOG
|
||||||
|
#undef LOGV
|
||||||
#undef NS_DispatchToMainThread
|
#undef NS_DispatchToMainThread
|
||||||
|
|
Загрузка…
Ссылка в новой задаче