From f0dc4e10b099858b32a27fb5f73cd781f68f24f5 Mon Sep 17 00:00:00 2001 From: Chris Pearce Date: Wed, 13 Aug 2014 15:04:19 +1200 Subject: [PATCH] Bug 1052378 - Replace stray mIsXXXDecoding fields with IsXXXDecoding() function calls in MediaDecoderStateMachine. r=kinetik --- content/media/MediaDecoderStateMachine.cpp | 4 ++-- content/media/MediaDecoderStateMachine.h | 8 -------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/content/media/MediaDecoderStateMachine.cpp b/content/media/MediaDecoderStateMachine.cpp index c91512124ee..c74b3bdd701 100644 --- a/content/media/MediaDecoderStateMachine.cpp +++ b/content/media/MediaDecoderStateMachine.cpp @@ -586,8 +586,8 @@ MediaDecoderStateMachine::DecodeVideo() // soon anyway and we'll want to be able to display frames immediately // after buffering finishes. if (mState == DECODER_STATE_DECODING && - mIsVideoDecoding && - ((!mIsAudioPrerolling && mIsAudioDecoding && + IsVideoDecoding() && + ((!mIsAudioPrerolling && IsAudioDecoding() && GetDecodedAudioDuration() < mLowAudioThresholdUsecs * mPlaybackRate) || (!mIsVideoPrerolling && IsVideoDecoding() && // don't skip frame when |clock time| <= |mVideoFrameEndTime| for diff --git a/content/media/MediaDecoderStateMachine.h b/content/media/MediaDecoderStateMachine.h index 78b0597a604..d2d062bba79 100644 --- a/content/media/MediaDecoderStateMachine.h +++ b/content/media/MediaDecoderStateMachine.h @@ -829,14 +829,6 @@ protected: bool mIsAudioPrerolling; bool mIsVideoPrerolling; - // True when we have an audio stream that we're decoding, and we have not - // yet decoded to end of stream. - bool mIsAudioDecoding; - - // True when we have a video stream that we're decoding, and we have not - // yet decoded to end of stream. - bool mIsVideoDecoding; - // True when we have dispatched a task to the decode task queue to request // decoded audio/video, and/or we are waiting for the requested sample to be // returned by callback from the Reader.