Skip to content
This repository has been archived by the owner on Mar 1, 2024. It is now read-only.

Force URL param settings when receiving initial application settings #134

Merged
merged 1 commit into from
Mar 1, 2023
Merged

Force URL param settings when receiving initial application settings #134

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 25 additions & 8 deletions Frontend/library/src/PixelStreaming/PixelStreaming.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,28 +471,45 @@ export class PixelStreaming {
);
}
}

const useUrlParams = this.config.useUrlParams;
const urlParams = new URLSearchParams(window.location.search);
if (settings.EncoderSettings) {
this.config.setNumericSetting(
NumericParameters.MinQP,
settings.EncoderSettings.MinQP
// If a setting is set in the URL, make sure we respect that value as opposed to what the application sends us
(useUrlParams && urlParams.has(NumericParameters.MinQP))
? Number.parseInt(urlParams.get(NumericParameters.MinQP))
: settings.EncoderSettings.MinQP
);


this.config.setNumericSetting(
NumericParameters.MaxQP,
settings.EncoderSettings.MaxQP
(useUrlParams && urlParams.has(NumericParameters.MaxQP))
? Number.parseInt(urlParams.get(NumericParameters.MaxQP))
: settings.EncoderSettings.MaxQP
);
}
if (settings.WebRTCSettings) {
this.config.setNumericSetting(
NumericParameters.WebRTCMinBitrate,
settings.WebRTCSettings.MinBitrate / 1000 /* bps to kbps */
(useUrlParams && urlParams.has(NumericParameters.WebRTCMinBitrate))
? Number.parseInt(urlParams.get(NumericParameters.WebRTCMinBitrate)) / 1000 /* bps to kbps */
: settings.WebRTCSettings.MinBitrate / 1000 /* bps to kbps */
);
this.config.setNumericSetting(
NumericParameters.WebRTCMaxBitrate,
settings.WebRTCSettings.MaxBitrate / 1000 /* bps to kbps */
(useUrlParams && urlParams.has(NumericParameters.WebRTCMaxBitrate))
? Number.parseInt(urlParams.get(NumericParameters.WebRTCMaxBitrate)) / 1000 /* bps to kbps */
: settings.WebRTCSettings.MaxBitrate / 1000 /* bps to kbps */

);
this.config.setNumericSetting(
NumericParameters.WebRTCFPS,
settings.WebRTCSettings.FPS
(useUrlParams && urlParams.has(NumericParameters.WebRTCFPS))
? Number.parseInt(urlParams.get(NumericParameters.WebRTCFPS))
: settings.WebRTCSettings.FPS
);
}
}
Expand Down Expand Up @@ -547,16 +564,16 @@ export class PixelStreaming {
return true;
}

/**
/**
* Dispatch a new event.
* @param e event
* @returns
*/
public dispatchEvent(e: PixelStreamingEvent): boolean {
return this._eventEmitter.dispatchEvent(e);
}
/**
/**
* Register an event handler.
* @param type event name
* @param listener event handler function
Expand Down