Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-15 14:25:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1105066 - Chain seeks in MediaSourceReader so that we seek audio to the same time as video; r=kentuckyfriedtakahe

Browse Source
This commit is contained in:
Matt Woodrow 2015-01-12 11:05:08 +13:00
parent 972dde5588
commit 8cd51d9f13
2 changed files with 32 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
dom/media/mediasource/MediaSourceReader.cpp
View File

@ -53,8 +53,6 @@ MediaSourceReader::MediaSourceReader(MediaSourceDecoder* aDecoder)
, mPendingEndTime(-1)
, mPendingCurrentTime(-1)
, mWaitingForSeekData(false)
, mPendingSeeks(0)
, mSeekResult(NS_OK)
, mTimeThreshold(-1)
, mDropAudioBeforeThreshold(false)
, mDropVideoBeforeThreshold(false)
@ -594,16 +592,7 @@ MediaSourceReader::Seek(int64_t aTime, int64_t aStartTime, int64_t aEndTime,
// to complete (and they would have been accounted for already).
{
ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
if (!mWaitingForSeekData) {
mWaitingForSeekData = true;
if (mAudioTrack) {
mPendingSeeks++;
}
if (mVideoTrack) {
mPendingSeeks++;
}
}
mWaitingForSeekData = true;
}
AttemptSeek();
@ -611,36 +600,40 @@ MediaSourceReader::Seek(int64_t aTime, int64_t aStartTime, int64_t aEndTime,
}
void
MediaSourceReader::OnSeekCompleted(int64_t aTime)
MediaSourceReader::OnVideoSeekCompleted(int64_t aTime)
{
mPendingSeeks--;
FinalizeSeek();
mPendingSeekTime = aTime;
if (mAudioTrack) {
mAudioIsSeeking = true;
SwitchAudioReader(mPendingSeekTime);
mAudioReader->Seek(mPendingSeekTime,
mPendingStartTime,
mPendingEndTime,
mPendingCurrentTime)
->Then(GetTaskQueue(), __func__, this,
&MediaSourceReader::OnAudioSeekCompleted,
&MediaSourceReader::OnSeekFailed);
MSE_DEBUG("MediaSourceReader(%p)::Seek audio reader=%p", this, mAudioReader.get());
return;
}
mSeekPromise.Resolve(mPendingSeekTime, __func__);
}
void
MediaSourceReader::OnAudioSeekCompleted(int64_t aTime)
{
mSeekPromise.Resolve(mPendingSeekTime, __func__);
}
void
MediaSourceReader::OnSeekFailed(nsresult aResult)
{
mPendingSeeks--;
// Keep the most recent failed result (if any)
if (NS_FAILED(aResult)) {
mSeekResult = aResult;
}
FinalizeSeek();
}
void
MediaSourceReader::FinalizeSeek()
{
// Only dispatch the final event onto the state machine
// since it's only expecting one response.
if (!mPendingSeeks) {
if (NS_FAILED(mSeekResult)) {
mSeekPromise.Reject(mSeekResult, __func__);
} else {
mSeekPromise.Resolve(mPendingSeekTime, __func__);
}
mSeekResult = NS_OK;
mSeekPromise.Reject(aResult, __func__);
return;
}
mSeekPromise.Resolve(mPendingSeekTime, __func__);
}
void
@ -664,18 +657,6 @@ MediaSourceReader::AttemptSeek()
mLastAudioTime = mPendingSeekTime;
mLastVideoTime = mPendingSeekTime;
if (mAudioTrack) {
mAudioIsSeeking = true;
SwitchAudioReader(mPendingSeekTime);
mAudioReader->Seek(mPendingSeekTime,
mPendingStartTime,
mPendingEndTime,
mPendingCurrentTime)
->Then(GetTaskQueue(), __func__, this,
&MediaSourceReader::OnSeekCompleted,
&MediaSourceReader::OnSeekFailed);
MSE_DEBUG("MediaSourceReader(%p)::Seek audio reader=%p", this, mAudioReader.get());
}
if (mVideoTrack) {
mVideoIsSeeking = true;
SwitchVideoReader(mPendingSeekTime);
@ -684,10 +665,13 @@ MediaSourceReader::AttemptSeek()
mPendingEndTime,
mPendingCurrentTime)
->Then(GetTaskQueue(), __func__, this,
&MediaSourceReader::OnSeekCompleted,
&MediaSourceReader::OnVideoSeekCompleted,
&MediaSourceReader::OnSeekFailed);
MSE_DEBUG("MediaSourceReader(%p)::Seek video reader=%p", this, mVideoReader.get());
} else {
OnVideoSeekCompleted(mPendingSeekTime);
}
{
ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
mWaitingForSeekData = false;

10
dom/media/mediasource/MediaSourceReader.h
View File

@ -58,7 +58,8 @@ public:
void OnVideoDecoded(VideoData* aSample);
void OnVideoNotDecoded(NotDecodedReason aReason);
void OnSeekCompleted(int64_t aTime);
void OnVideoSeekCompleted(int64_t aTime);
void OnAudioSeekCompleted(int64_t aTime);
void OnSeekFailed(nsresult aResult);
virtual bool IsWaitForDataSupported() MOZ_OVERRIDE { return true; }
@ -144,7 +145,6 @@ private:
bool HaveData(int64_t aTarget, MediaData::Type aType);
void AttemptSeek();
void FinalizeSeek();
nsRefPtr<MediaDecoderReader> mAudioReader;
nsRefPtr<MediaDecoderReader> mVideoReader;
@ -182,12 +182,6 @@ private:
int64_t mPendingCurrentTime;
bool mWaitingForSeekData;
// Number of outstanding OnSeekCompleted notifications
// we're expecting to get from child decoders, and the
// result we're going to forward onto our callback.
uint32_t mPendingSeeks;
nsresult mSeekResult;
int64_t mTimeThreshold;
bool mDropAudioBeforeThreshold;
bool mDropVideoBeforeThreshold;