mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-28 04:35:33 +00:00
Bug 1143971: Rebase bustage fix. r=bustage ON A CLOSED TREE
--HG-- extra : rebase_source : 9c76279d11fdcd747fc69b24939b888372c6f5ca
This commit is contained in:
parent
4e43f49889
commit
65525c3610
@ -1041,13 +1041,13 @@ MediaSourceReader::MaybeNotifyHaveData()
|
|||||||
if (!IsSeeking() && mAudioTrack) {
|
if (!IsSeeking() && mAudioTrack) {
|
||||||
haveAudio = HaveData(mLastAudioTime, MediaData::AUDIO_DATA);
|
haveAudio = HaveData(mLastAudioTime, MediaData::AUDIO_DATA);
|
||||||
if (ended || haveAudio) {
|
if (ended || haveAudio) {
|
||||||
WaitPromise(MediaData::AUDIO_DATA).ResolveIfExists(MediaData::AUDIO_DATA __func__);
|
WaitPromise(MediaData::AUDIO_DATA).ResolveIfExists(MediaData::AUDIO_DATA, __func__);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!IsSeeking() && mVideoTrack) {
|
if (!IsSeeking() && mVideoTrack) {
|
||||||
haveVideo = HaveData(mLastVideoTime, MediaData::VIDEO_DATA);
|
haveVideo = HaveData(mLastVideoTime, MediaData::VIDEO_DATA);
|
||||||
if (ended || haveVideo) {
|
if (ended || haveVideo) {
|
||||||
WaitPromise(MediaData::VIDEO_DATA).ResolveIfExists(MediaData::VIDEO_DATA __func__);
|
WaitPromise(MediaData::VIDEO_DATA).ResolveIfExists(MediaData::VIDEO_DATA, __func__);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
MSE_DEBUG("isSeeking=%d haveAudio=%d, haveVideo=%d ended=%d",
|
MSE_DEBUG("isSeeking=%d haveAudio=%d, haveVideo=%d ended=%d",
|
||||||
|
Loading…
Reference in New Issue
Block a user