Bug 1283370. Part 5 - make EnsureVideoDecodeTaskQueued() return void. r=kaku
MozReview-Commit-ID: 885lZ2eygvs
--- a/dom/media/NextFrameSeekTask.cpp
+++ b/dom/media/NextFrameSeekTask.cpp
@@ -176,31 +176,30 @@ NextFrameSeekTask::Seek(const media::Tim
bool
NextFrameSeekTask::IsVideoDecoding() const
{
AssertOwnerThread();
return !mIsVideoQueueFinished;
}
-nsresult
+void
NextFrameSeekTask::EnsureVideoDecodeTaskQueued()
{
AssertOwnerThread();
SAMPLE_LOG("EnsureVideoDecodeTaskQueued isDecoding=%d status=%s",
IsVideoDecoding(), VideoRequestStatus());
if (!IsVideoDecoding() ||
mReader->IsRequestingVideoData() ||
mReader->IsWaitingVideoData()) {
- return NS_OK;
+ return;
}
RequestVideoData();
- return NS_OK;
}
const char*
NextFrameSeekTask::VideoRequestStatus()
{
AssertOwnerThread();
if (mReader->IsRequestingVideoData()) {
@@ -250,20 +249,17 @@ NextFrameSeekTask::CheckIfSeekComplete()
{
AssertOwnerThread();
const bool audioSeekComplete = IsAudioSeekComplete();
const bool videoSeekComplete = IsVideoSeekComplete();
if (!videoSeekComplete) {
// We haven't reached the target. Ensure we have requested another sample.
- if (NS_FAILED(EnsureVideoDecodeTaskQueued())) {
- DECODER_WARN("Failed to request video during seek");
- RejectIfExist(__func__);
- }
+ EnsureVideoDecodeTaskQueued();
}
SAMPLE_LOG("CheckIfSeekComplete() audioSeekComplete=%d videoSeekComplete=%d",
audioSeekComplete, videoSeekComplete);
if (audioSeekComplete && videoSeekComplete) {
UpdateSeekTargetTime();
Resolve(__func__); // Call to MDSM::SeekCompleted();
--- a/dom/media/NextFrameSeekTask.h
+++ b/dom/media/NextFrameSeekTask.h
@@ -40,17 +40,17 @@ public:
bool NeedToResetMDSM() const override;
private:
~NextFrameSeekTask();
bool IsVideoDecoding() const;
- nsresult EnsureVideoDecodeTaskQueued();
+ void EnsureVideoDecodeTaskQueued();
const char* VideoRequestStatus();
void RequestVideoData();
bool IsAudioSeekComplete();
bool IsVideoSeekComplete();