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

Feature/cmcd settings from manifest #13

Open
wants to merge 36 commits into
base: development
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
b34b476
Parse ClientDataReporting from manifest file
santimintegui Jan 8, 2024
502277e
add applyCMCDParameters
santimintegui Jan 8, 2024
d5bcee5
Using the CMCDParameters configuration under ClientDataReporting in t…
matiasrb97 Jan 8, 2024
52567d7
Check if cmcd is enabled by checking mdp and player settings. Using m…
matiasrb97 Jan 9, 2024
efd2b05
apply serviceLocation filter to data reporting
santimintegui Jan 9, 2024
957aa2d
add adapter set filter
santimintegui Jan 11, 2024
28f82bd
improve apply filters
santimintegui Jan 11, 2024
ca8725e
improve apply filters
santimintegui Jan 11, 2024
d8d2f0e
delete unnecessary atribute in client data reporting
santimintegui Jan 11, 2024
938f613
Change getCmcdParametersMDP to getCmcdParametersFromManifest
matiasrb97 Mar 11, 2024
050b528
add client data reporting model
santimintegui Jan 11, 2024
a746fa5
refactor client data reporting model
santimintegui Jan 12, 2024
99d77cc
implemented include in request filter
santimintegui Jan 12, 2024
aa23f6a
add none include request case
santimintegui Jan 16, 2024
fbb9e2f
change segment type into filter
santimintegui Jan 16, 2024
dbb2e31
Add test to check if cmcd data from manifest is correct
santimintegui Jan 16, 2024
32b7fa3
delete comments
santimintegui Jan 16, 2024
d8d58aa
Update tests with latest changes for cmcd reporting data
matiasrb97 Jan 16, 2024
067ecac
add test for getQueryParameter
santimintegui Jan 17, 2024
069ddef
delete comment in streaming.models.CmcdModel.js
santiagomintegui Jan 17, 2024
8cd3ff6
add test to get correctly cmcd data from getHeadersParameters()
santimintegui Jan 18, 2024
7f7324a
Adding tests for ClientDataReportingModel
matiasrb97 Jan 18, 2024
426a2dd
add test to get correctly cmcd data from getHeadersParameters()
santimintegui Jan 18, 2024
8728319
add funcionality to service description controller mock
santimintegui Jan 18, 2024
cb61882
reset serviceDescriptionControllerMock after tests run
matiasrb97 Jan 18, 2024
f2fa528
More tests added for ClientDataReportingModel
matiasrb97 Jan 18, 2024
85c7164
Add tests for applyCMCDParameters setting
matiasrb97 Jan 18, 2024
969d30f
Add includeInRequests attribute to player settings
matiasrb97 Jan 23, 2024
3d18450
add logger
N1Knight Feb 9, 2024
a7481dc
improve edge cases checks
N1Knight Feb 9, 2024
8065c24
fix a detail
N1Knight Feb 9, 2024
4b5f629
fix parsing
N1Knight Feb 13, 2024
ed5c182
fix parsing keys
N1Knight Feb 13, 2024
d8b1aed
improve error messages
N1Knight Feb 13, 2024
64d86d0
Fix failing tests
matiasrb97 Mar 12, 2024
ae348bc
Fix Settings.js comment
matiasrb97 Mar 12, 2024
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
Prev Previous commit
Next Next commit
add funcionality to service description controller mock
  • Loading branch information
santimintegui authored and matiasrb97 committed Mar 12, 2024
commit 8728319dee84a4ba040b983f4716a3e07f2b02ad
16 changes: 8 additions & 8 deletions src/streaming/models/CmcdModel.js
Original file line number Diff line number Diff line change
Expand Up @@ -235,15 +235,16 @@ function CmcdModel() {
if(!includeInRequests || includeInRequestsArray.find(include => include === '*')){
return true;
}

const filtersTypes = {
'segment': HTTPRequest.INIT_SEGMENT_TYPE | HTTPRequest.MEDIA_SEGMENT_TYPE,
'xlink': HTTPRequest.XLINK_EXPANSION_TYPE,
'mpd': HTTPRequest.MPD_TYPE,
'steering': HTTPRequest.CONTENT_STEERING_TYPE,
}
[HTTPRequest.INIT_SEGMENT_TYPE]: 'segment',
[HTTPRequest.MEDIA_SEGMENT_TYPE]: 'segment',
[HTTPRequest.XLINK_EXPANSION_TYPE]: 'xlink',
[HTTPRequest.MPD_TYPE]: 'mpd',
[HTTPRequest.CONTENT_STEERING_TYPE]: 'steering',
};

return includeInRequestsArray.some(include => filtersTypes[include] === type);
return includeInRequestsArray.some(include => filtersTypes[type] === include);
}

function getCmcdData(request) {
Expand All @@ -266,7 +267,6 @@ function CmcdModel() {
return _getCmcdDataForSteering(request);
}
}

return cmcdData;
} catch (e) {
return null;
Expand Down
7 changes: 6 additions & 1 deletion test/unit/mocks/ServiceDescriptionControllerMock.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,12 @@ class ServiceDescriptionControllerMock {
calculateProducerReferenceTimeOffsets() {
}

applyServiceDescription() {
applyServiceDescription(config) {
this.serviceDescriptionSettings = {
...this.serviceDescriptionSettings,
contentSteering: config?.contentSteering || null,
clientDataReporting: config?.clientDataReporting || null,
};
}

reset() {
Expand Down