Bug 1272422 - Part 2: Vidoe -> Video. r?cpearce draft
authorDan Glastonbury <dglastonbury@mozilla.com>
Fri, 13 May 2016 10:22:30 +1000
changeset 366637 d2317f06faee9c8c74122aee79f08e1d6bc1bade
parent 366636 3574bdb282fecacd41c9f7f39afaf370d8ee26b5
child 366638 3982533b4568f8723defb807a2c18ef3d9a34d3f
child 366644 fcc200a2e6e07fd3bf5e4fc658474aaeeb3a0818
push id18032
push userbmo:dglastonbury@mozilla.com
push dateFri, 13 May 2016 01:42:11 +0000
reviewerscpearce
bugs1272422
milestone49.0a1
Bug 1272422 - Part 2: Vidoe -> Video. r?cpearce Fix spelling of video. MozReview-Commit-ID: JGlxxHfE5tW
dom/media/MediaDecoderReaderWrapper.cpp
dom/media/MediaDecoderReaderWrapper.h
dom/media/MediaDecoderStateMachine.cpp
dom/media/SeekTask.cpp
--- a/dom/media/MediaDecoderReaderWrapper.cpp
+++ b/dom/media/MediaDecoderReaderWrapper.cpp
@@ -274,17 +274,17 @@ MediaDecoderReaderWrapper::RequestVideoD
 bool
 MediaDecoderReaderWrapper::IsRequestingAudioData() const
 {
   MOZ_ASSERT(mOwnerThread->IsCurrentThreadIn());
   return mAudioDataRequest.Exists();
 }
 
 bool
-MediaDecoderReaderWrapper::IsRequestingVidoeData() const
+MediaDecoderReaderWrapper::IsRequestingVideoData() const
 {
   MOZ_ASSERT(mOwnerThread->IsCurrentThreadIn());
   return mVideoDataRequest.Exists();
 }
 
 RefPtr<MediaDecoderReader::SeekPromise>
 MediaDecoderReaderWrapper::Seek(SeekTarget aTarget, media::TimeUnit aEndTime)
 {
--- a/dom/media/MediaDecoderReaderWrapper.h
+++ b/dom/media/MediaDecoderReaderWrapper.h
@@ -242,17 +242,17 @@ public:
   void CancelAudioCallback(CallbackID aID);
   void CancelVideoCallback(CallbackID aID);
 
   // NOTE: please set callbacks before requesting audio/video data!
   void RequestAudioData();
   void RequestVideoData(bool aSkipToNextKeyframe, media::TimeUnit aTimeThreshold);
 
   bool IsRequestingAudioData() const;
-  bool IsRequestingVidoeData() const;
+  bool IsRequestingVideoData() const;
 
   RefPtr<SeekPromise> Seek(SeekTarget aTarget, media::TimeUnit aEndTime);
   RefPtr<WaitForDataPromise> WaitForData(MediaData::Type aType);
   RefPtr<BufferedUpdatePromise> UpdateBufferedWithPromise();
   RefPtr<ShutdownPromise> Shutdown();
 
   void ReleaseMediaResources();
   void SetIdle();
--- a/dom/media/MediaDecoderStateMachine.cpp
+++ b/dom/media/MediaDecoderStateMachine.cpp
@@ -1763,17 +1763,17 @@ MediaDecoderStateMachine::EnsureVideoDec
 
   if (IsVideoDecodeSuspended() && !IsDecodingFirstFrame()) {
     // The element is invisible and background videos should be suspended.
     // If the first frame has already been decoded, don't request anymore video
     // frames.
     return NS_OK;
   }
 
-  if (!IsVideoDecoding() || mReader->IsRequestingVidoeData() ||
+  if (!IsVideoDecoding() || mReader->IsRequestingVideoData() ||
       mVideoWaitRequest.Exists()) {
     return NS_OK;
   }
 
   RequestVideoData();
   return NS_OK;
 }
 
@@ -2276,17 +2276,17 @@ nsresult MediaDecoderStateMachine::RunSt
           ScheduleStateMachineIn(USECS_PER_S);
           return NS_OK;
         }
       } else if (OutOfDecodedAudio() || OutOfDecodedVideo()) {
         MOZ_ASSERT(mReader->IsWaitForDataSupported(),
                    "Don't yet have a strategy for non-heuristic + non-WaitForData");
         DispatchDecodeTasksIfNeeded();
         MOZ_ASSERT_IF(!mMinimizePreroll && OutOfDecodedAudio(), mReader->IsRequestingAudioData() || mAudioWaitRequest.Exists());
-        MOZ_ASSERT_IF(!mMinimizePreroll && OutOfDecodedVideo(), mReader->IsRequestingVidoeData() || mVideoWaitRequest.Exists());
+        MOZ_ASSERT_IF(!mMinimizePreroll && OutOfDecodedVideo(), mReader->IsRequestingVideoData() || mVideoWaitRequest.Exists());
         DECODER_LOG("In buffering mode, waiting to be notified: outOfAudio: %d, "
                     "mAudioStatus: %s, outOfVideo: %d, mVideoStatus: %s",
                     OutOfDecodedAudio(), AudioRequestStatus(),
                     OutOfDecodedVideo(), VideoRequestStatus());
         return NS_OK;
       }
 
       DECODER_LOG("Changed state from BUFFERING to DECODING");
@@ -2859,17 +2859,17 @@ MediaDecoderStateMachine::AudioRequestSt
   }
   return "idle";
 }
 
 const char*
 MediaDecoderStateMachine::VideoRequestStatus() const
 {
   MOZ_ASSERT(OnTaskQueue());
-  if (mReader->IsRequestingVidoeData()) {
+  if (mReader->IsRequestingVideoData()) {
     MOZ_DIAGNOSTIC_ASSERT(!mVideoWaitRequest.Exists());
     return "pending";
   } else if (mVideoWaitRequest.Exists()) {
     return "waiting";
   }
   return "idle";
 }
 
--- a/dom/media/SeekTask.cpp
+++ b/dom/media/SeekTask.cpp
@@ -232,17 +232,17 @@ nsresult
 SeekTask::EnsureVideoDecodeTaskQueued()
 {
   AssertOwnerThread();
 
   SAMPLE_LOG("EnsureVideoDecodeTaskQueued isDecoding=%d status=%s",
              IsVideoDecoding(), VideoRequestStatus());
 
   if (!IsVideoDecoding() ||
-      mReader->IsRequestingVidoeData() ||
+      mReader->IsRequestingVideoData() ||
       mVideoWaitRequest.Exists() ||
       mSeekRequest.Exists()) {
     return NS_OK;
   }
 
   RequestVideoData();
   return NS_OK;
 }
@@ -259,17 +259,17 @@ SeekTask::AudioRequestStatus()
   }
   return "idle";
 }
 
 const char*
 SeekTask::VideoRequestStatus()
 {
   AssertOwnerThread();
-  if (mReader->IsRequestingVidoeData()) {
+  if (mReader->IsRequestingVideoData()) {
     MOZ_DIAGNOSTIC_ASSERT(!mVideoWaitRequest.Exists());
     return "pending";
   } else if (mVideoWaitRequest.Exists()) {
     return "waiting";
   }
   return "idle";
 }