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

Backed out changeset 625452e32c3b (bug 1247138) also needed for backout to fix crashes

Browse Source 
--HG--
extra : rebase_source : 1d025513dbb5183e059b58dc81c529969a048d8e
This commit is contained in:
Carsten "Tomcat" Book 2016-04-18 14:41:16 +02:00
parent bebb8900bb
commit 80156aa1ad
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dom/media/mediasource/TrackBuffersManager.cpp
View File

@ -1094,6 +1094,14 @@ TrackBuffersManager::OnDemuxerInitDone(nsresult)
// 6. Set first initialization segment received flag to true.
mFirstInitializationSegmentReceived = true;
} else {
// Check that audio configuration hasn't changed as this is something
// we do not support yet (bug 1185827).
if (mAudioTracks.mNumTracks &&
(info.mAudio.mChannels != mAudioTracks.mInfo->GetAsAudioInfo()->mChannels ||
info.mAudio.mRate != mAudioTracks.mInfo->GetAsAudioInfo()->mRate)) {
RejectAppend(NS_ERROR_FAILURE, __func__);
return;
}
mAudioTracks.mLastInfo = new SharedTrackInfo(info.mAudio, streamID);
mVideoTracks.mLastInfo = new SharedTrackInfo(info.mVideo, streamID);
}