Skip to content

Commit 51f7ebe

Browse files
RDK-56624: Set GST Quirks envs
Reason for change: Export GST Quirks envs for Webkit TestProcedure: Ensure WEBKIT_GST_QUIRKS and WEBKIT_GST_HOLE_PUNCH_QUIRK are correctly set Priority: P1 Risks: Low Signed-off-by: Andrzej Surdej <[email protected]>
1 parent e06d18f commit 51f7ebe

File tree

8 files changed

+32
-0
lines changed

8 files changed

+32
-0
lines changed

WebKitBrowser/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ set(PLUGIN_WEBKITBROWSER_THUNDER_DECRYPTOR_PREFERENCE "true" CACHE STRING "Enabl
8888
set(PLUGIN_WEBKITBROWSER_PERSISTENTPATHPOSTFIX "" CACHE STRING "Specify callsign persistent path postfix")
8989
set(PLUGIN_WEBKITBROWSER_PTSOFFSET "0" CACHE STRING "Set ptsoffset for webkit")
9090
set(PLUGIN_WEBKITBROWSER_USE_EXACT_PATHS "false" CACHE STRING "Use paths specified in configuration options without further modifying them")
91+
set(PLUGIN_WEBKITBROWSER_GST_QUIRKS "" CACHE STRING "A list of GStreamer quirks to be used by the browser")
92+
set(PLUGIN_WEBKITBROWSER_GST_HOLE_PUNCH_QUIRK "" CACHE STRING "GStreamer hole punch quirk to be used by the browser")
9193

9294
set(PLUGIN_YOUTUBE_AUTOSTART "false" CACHE STRING "Automatically start Youtube plugin")
9395
set(PLUGIN_YOUTUBE_STARTUPORDER "" CACHE STRING "To configure startup order of YouTube plugin")

WebKitBrowser/HtmlApp.conf.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,3 +99,5 @@ memory.add("serviceworkerprocesssettings", serviceworkerprocesssettings)
9999

100100
configuration.add("memory", memory)
101101

102+
configuration.add("gstquirks", "@PLUGIN_WEBKITBROWSER_GST_QUIRKS@")
103+
configuration.add("gstholepunchquirk", "@PLUGIN_WEBKITBROWSER_GST_HOLE_PUNCH_QUIRK@")

WebKitBrowser/JSPP.conf.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,3 +151,5 @@ memory.add("serviceworkerprocesssettings", serviceworkerprocesssettings)
151151

152152
configuration.add("memory", memory)
153153

154+
configuration.add("gstquirks", "@PLUGIN_WEBKITBROWSER_GST_QUIRKS@")
155+
configuration.add("gstholepunchquirk", "@PLUGIN_WEBKITBROWSER_GST_HOLE_PUNCH_QUIRK@")

WebKitBrowser/LightningApp.conf.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,3 +98,6 @@ if ("@PLUGIN_LIGHTNING_APP_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_LIMIT@ A
9898
memory.add("serviceworkerprocesssettings", serviceworkerprocesssettings)
9999

100100
configuration.add("memory", memory)
101+
102+
configuration.add("gstquirks", "@PLUGIN_WEBKITBROWSER_GST_QUIRKS@")
103+
configuration.add("gstholepunchquirk", "@PLUGIN_WEBKITBROWSER_GST_HOLE_PUNCH_QUIRK@")

WebKitBrowser/ResidentApp.conf.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,3 +93,6 @@ if ("@PLUGIN_RESIDENT_APP_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_LIMIT@ AN
9393
memory.add("serviceworkerprocesssettings", serviceworkerprocesssettings)
9494

9595
configuration.add("memory", memory)
96+
97+
configuration.add("gstquirks", "@PLUGIN_WEBKITBROWSER_GST_QUIRKS@")
98+
configuration.add("gstholepunchquirk", "@PLUGIN_WEBKITBROWSER_GST_HOLE_PUNCH_QUIRK@")

WebKitBrowser/SearchAndDiscoveryApp.conf.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,3 +94,6 @@ if ("@PLUGIN_SEARCH_AND_DISCOVERY_APP_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTIN
9494
memory.add("serviceworkerprocesssettings", serviceworkerprocesssettings)
9595

9696
configuration.add("memory", memory)
97+
98+
configuration.add("gstquirks", "@PLUGIN_WEBKITBROWSER_GST_QUIRKS@")
99+
configuration.add("gstholepunchquirk", "@PLUGIN_WEBKITBROWSER_GST_HOLE_PUNCH_QUIRK@")

WebKitBrowser/WebKitBrowser.conf.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,3 +108,6 @@ if ("@PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_LIMIT@ A
108108
memory.add("serviceworkerprocesssettings", serviceworkerprocesssettings)
109109

110110
configuration.add("memory", memory)
111+
112+
configuration.add("gstquirks", "@PLUGIN_WEBKITBROWSER_GST_QUIRKS@")
113+
configuration.add("gstholepunchquirk", "@PLUGIN_WEBKITBROWSER_GST_HOLE_PUNCH_QUIRK@")

WebKitBrowser/WebKitImplementation.cpp

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -635,6 +635,8 @@ static GSourceFuncs _handlerIntervention =
635635
, Testing(false)
636636
, ServiceWorkerEnabled(false)
637637
, ICECandidateFilteringEnabled()
638+
, GstQuirks()
639+
, GstHolePunchQuirk()
638640
{
639641
Add(_T("useragent"), &UserAgent);
640642
Add(_T("url"), &URL);
@@ -704,6 +706,8 @@ static GSourceFuncs _handlerIntervention =
704706
Add(_T("testing"), &Testing);
705707
Add(_T("serviceworker"), &ServiceWorkerEnabled);
706708
Add(_T("icecandidatefiltering"), &ICECandidateFilteringEnabled);
709+
Add(_T("gstquirks"), &GstQuirks);
710+
Add(_T("gstholepunchquirk"), &GstHolePunchQuirk);
707711
}
708712
~Config()
709713
{
@@ -778,6 +782,8 @@ static GSourceFuncs _handlerIntervention =
778782
Core::JSON::Boolean Testing;
779783
Core::JSON::Boolean ServiceWorkerEnabled;
780784
Core::JSON::Boolean ICECandidateFilteringEnabled;
785+
Core::JSON::String GstQuirks;
786+
Core::JSON::String GstHolePunchQuirk;
781787
};
782788

783789
class HangDetector
@@ -2439,6 +2445,14 @@ static GSourceFuncs _handlerIntervention =
24392445
Core::SystemInfo::SetEnvironment(_T("GST_VIRTUAL_DISP_HEIGHT"), height, !environmentOverride);
24402446
}
24412447

2448+
if (_config.GstQuirks.IsSet() == true) {
2449+
Core::SystemInfo::SetEnvironment(_T("WEBKIT_GST_QUIRKS"), _config.GstQuirks.Value(), !environmentOverride);
2450+
}
2451+
2452+
if (_config.GstHolePunchQuirk.IsSet() == true) {
2453+
Core::SystemInfo::SetEnvironment(_T("WEBKIT_GST_HOLE_PUNCH_QUIRK"), _config.GstHolePunchQuirk.Value(), !environmentOverride);
2454+
}
2455+
24422456
for (auto environmentVariableIndex = 0; environmentVariableIndex < _config.EnvironmentVariables.Length(); environmentVariableIndex++) {
24432457
const auto& environmentVariable = _config.EnvironmentVariables[environmentVariableIndex];
24442458
Core::SystemInfo::SetEnvironment(environmentVariable.Name.Value(), environmentVariable.Value.Value());

0 commit comments

Comments
 (0)