Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/filtering #4637

Merged
merged 3 commits into from
Nov 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/dash/WebmSegmentBaseLoader.js
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,8 @@ function WebmSegmentBaseLoader() {
request: request,
url: media,
init: false,
mediaType: mediaType
mediaType: mediaType,
representation
};

request = _getFragmentRequest(info);
Expand Down
6 changes: 5 additions & 1 deletion src/streaming/controllers/ExtUrlQueryInfoController.js
Original file line number Diff line number Diff line change
Expand Up @@ -154,10 +154,14 @@ function ExtUrlQueryInfoController() {
function getFinalQueryString(request) {
try {
if (!mpdQueryStringInformation) {
return
return null;
}
if (request.type === HTTPRequest.MEDIA_SEGMENT_TYPE || request.type === HTTPRequest.INIT_SEGMENT_TYPE) {
const representation = request.representation;

if (!representation) {
return null;
}
const adaptation = representation.adaptation;
const period = adaptation.period;
const queryInfo = mpdQueryStringInformation
Expand Down
20 changes: 17 additions & 3 deletions src/streaming/utils/Capabilities.js
Original file line number Diff line number Diff line change
Expand Up @@ -344,13 +344,27 @@ function Capabilities() {
}

return testedCodecConfigurations.find((current) => {
const audioEqual = configuration && configuration.audio ? objectUtils.areEqual(configuration.audio, current.audio) : true;
const videoEqual = configuration && configuration.video ? objectUtils.areEqual(configuration.video, current.video) : true;
const keySystemEqual = configuration && configuration.keySystemConfiguration ? objectUtils.areEqual(configuration.keySystemConfiguration, current.keySystemConfiguration) : true;
const audioEqual = _isConfigEqual(configuration, current, Constants.AUDIO);
const videoEqual = _isConfigEqual(configuration, current, Constants.VIDEO);
const keySystemEqual = _isConfigEqual(configuration, current, 'keySystemConfiguration');

return audioEqual && videoEqual && keySystemEqual
})
}

function _isConfigEqual(configuration, current, attribute) {

// Config not present in both of them
if (!configuration[attribute] && !current[attribute]) {
return true
}

// Config present in both we need to compare
if (configuration[attribute] && current[attribute]) {
return objectUtils.areEqual(configuration[attribute], current[attribute])
}

return false
}

function _getGenericMediaCapabilitiesVideoConfig(inputConfig) {
Expand Down
15 changes: 15 additions & 0 deletions test/functional/config/test-configurations/streams/smoke.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,21 @@
}
]
},
{
"name": "Shaka Demo Assets: Angel-One Widevine",
"type": "vod",
"url": "https://storage.googleapis.com/shaka-demo-assets/angel-one-widevine/dash.mpd",
"drm": {
"com.widevine.alpha": {
"serverURL": "https://cwip-shaka-proxy.appspot.com/no_auth"
}
},
"excludedPlatforms": [
{
"browser": "safari"
}
]
},
{
"name": "1080p with PlayReady and Widevine DRM, single key",
"type": "vod",
Expand Down
Loading