зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1355252 - Backed out changeset ddb3969de046. r=backout
MozReview-Commit-ID: cdH0WSFOaz --HG-- extra : rebase_source : 3b1eebcf7323cbcc037d1a2e0d92a923f217d811
This commit is contained in:
Родитель
72cf96c3de
Коммит
1a44af43a6
|
@ -926,13 +926,8 @@ GetSupportedConfig(const KeySystemConfig& aKeySystem,
|
|||
|
||||
// If the videoCapabilities and audioCapabilities members in candidate
|
||||
// configuration are both empty, return NotSupported.
|
||||
if (aCandidate.mAudioCapabilities.IsEmpty() &&
|
||||
aCandidate.mVideoCapabilities.IsEmpty()) {
|
||||
EME_LOG("MediaKeySystemConfiguration (label='%s') rejected; "
|
||||
"no supported audio or video capabilities specified",
|
||||
NS_ConvertUTF16toUTF8(aCandidate.mLabel).get());
|
||||
return false;
|
||||
}
|
||||
// TODO: Most sites using EME still don't pass capabilities, so we
|
||||
// can't reject on it yet without breaking them. So add this later.
|
||||
|
||||
// If the videoCapabilities member in candidate configuration is non-empty:
|
||||
if (!aCandidate.mVideoCapabilities.IsEmpty()) {
|
||||
|
|
|
@ -35,8 +35,8 @@
|
|||
|
||||
function LoadEME() {
|
||||
var options = [{
|
||||
initDataTypes: ['cenc'],
|
||||
audioCapabilities: [{ contentType: 'audio/mp4; codecs="mp4a.40.2"' }],
|
||||
initDataType: 'cenc',
|
||||
audioType: 'audio/mp4; codecs="mp4a.40.2"',
|
||||
}];
|
||||
navigator.requestMediaKeySystemAccess("org.w3.clearkey", options)
|
||||
.then((keySystemAccess) => {
|
||||
|
|
|
@ -472,15 +472,6 @@ var tests = [
|
|||
],
|
||||
shouldPass: false,
|
||||
},
|
||||
{
|
||||
name: 'Unspecified capabilities',
|
||||
options: [
|
||||
{
|
||||
initDataTypes: ['cenc'],
|
||||
}
|
||||
],
|
||||
shouldPass: false,
|
||||
},
|
||||
];
|
||||
|
||||
function beginTest() {
|
||||
|
|
Загрузка…
Ссылка в новой задаче