Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-08 04:27:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1115505 - keep decoding to ensure the stream is initialized in the decode-to-stream case. r=roc

Browse Source
This commit is contained in:
JW Wang 2014-12-25 01:26:00 +01:00
parent 05404cf3f4
commit 1bb19d6931
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dom/media/MediaDecoderStateMachine.cpp
View File

@ -531,6 +531,13 @@ bool MediaDecoderStateMachine::HaveEnoughDecodedAudio(int64_t aAmpleAudioUSecs)
}
DecodedStreamData* stream = mDecoder->GetDecodedStream();
// Since stream is initialized in SendStreamData() which is called when
// audio/video samples are received, we need to keep decoding to ensure
// the stream is initialized.
if (stream && !stream->mStreamInitialized) {
return false;
}
if (stream && stream->mStreamInitialized && !stream->mHaveSentFinishAudio) {
if (!stream->mStream->HaveEnoughBuffered(kAudioTrack)) {
return false;
@ -551,6 +558,11 @@ bool MediaDecoderStateMachine::HaveEnoughDecodedVideo()
}
DecodedStreamData* stream = mDecoder->GetDecodedStream();
if (stream && !stream->mStreamInitialized) {
return false;
}
if (stream && stream->mStreamInitialized && !stream->mHaveSentFinishVideo) {
if (!stream->mStream->HaveEnoughBuffered(kVideoTrack)) {
return false;