Pier Angelo Vendrame pushed to branch mullvad-browser-128.8.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser
Commits:
-
9492cb87
by Julian Descottes at 2025-03-06T10:46:29+01:00
-
29861015
by Beatriz Rizental at 2025-03-06T10:47:06+01:00
-
63d64ecc
by Beatriz Rizental at 2025-03-06T10:47:15+01:00
-
2aa78353
by John Lin at 2025-03-10T14:20:42+00:00
6 changed files:
- dom/media/platforms/wrappers/MediaChangeMonitor.cpp
- mozconfig-linux-aarch64-dev
- mozconfig-linux-x86_64-dev
- mozconfig-macos-dev
- testing/marionette/harness/marionette_harness/runner/base.py
- testing/specialpowers/api.js
Changes:
... | ... | @@ -42,6 +42,14 @@ class H264ChangeMonitor : public MediaChangeMonitor::CodecChangeMonitor { |
42 | 42 | : mCurrentConfig(aInfo), mFullParsing(aFullParsing) {
|
43 | 43 | if (CanBeInstantiated()) {
|
44 | 44 | UpdateConfigFromExtraData(aInfo.mExtraData);
|
45 | + auto avcc = AVCCConfig::Parse(mCurrentConfig.mExtraData);
|
|
46 | + if (avcc.isOk() && avcc.unwrap().NALUSize() != 4) {
|
|
47 | + // `CheckForChange()` will use `AnnexB::ConvertSampleToAVCC()` to change
|
|
48 | + // NAL units into 4-byte.
|
|
49 | + // `AVCDecoderConfigurationRecord.lengthSizeMinusOne` in the config
|
|
50 | + // should be modified too.
|
|
51 | + mCurrentConfig.mExtraData->ReplaceElementAt(4, 0xfc | 3);
|
|
52 | + }
|
|
45 | 53 | }
|
46 | 54 | }
|
47 | 55 |
... | ... | @@ -16,3 +16,5 @@ ac_add_options --disable-install-strip |
16 | 16 | |
17 | 17 | ac_add_options --with-base-browser-version=dev-build
|
18 | 18 | ac_add_options --disable-base-browser-update
|
19 | + |
|
20 | +ac_add_options --enable-tests |
... | ... | @@ -19,3 +19,5 @@ ac_add_options --disable-base-browser-update |
19 | 19 | |
20 | 20 | # Let's make sure no preference is enabling either Adobe's or Google's CDM.
|
21 | 21 | ac_add_options --disable-eme
|
22 | + |
|
23 | +ac_add_options --enable-tests |
... | ... | @@ -19,3 +19,5 @@ ac_add_options --disable-update-agent |
19 | 19 | |
20 | 20 | # Let's make sure no preference is enabling either Adobe's or Google's CDM.
|
21 | 21 | ac_add_options --disable-eme
|
22 | + |
|
23 | +ac_add_options --enable-tests |
... | ... | @@ -222,7 +222,7 @@ class MarionetteTestResult(StructuredTestResult, TestResultCollection): |
222 | 222 | self.logger.info("END LOG:")
|
223 | 223 | |
224 | 224 | def stopTest(self, *args, **kwargs):
|
225 | - unittest._TextTestResult.stopTest(self, *args, **kwargs)
|
|
225 | + unittest.TextTestResult.stopTest(self, *args, **kwargs)
|
|
226 | 226 | if self.marionette.check_for_crash():
|
227 | 227 | # this tells unittest.TestSuite not to continue running tests
|
228 | 228 | self.shouldStop = True
|
... | ... | @@ -40,6 +40,18 @@ this.specialpowers = class extends ExtensionAPI { |
40 | 40 | uri,
|
41 | 41 | resProto.ALLOW_CONTENT_ACCESS
|
42 | 42 | );
|
43 | + } else {
|
|
44 | + // This is a hack!
|
|
45 | + // For some reason, this specific substituion has an extra `/` in the path.
|
|
46 | + // This is a workaround to fix it.
|
|
47 | + //
|
|
48 | + // TODO (#43545): Remove this once we have a proper fix.
|
|
49 | + let uri = resProto.getSubstitution("testing-common");
|
|
50 | + resProto.setSubstitution(
|
|
51 | + "testing-common",
|
|
52 | + Services.io.newURI(uri.spec.replace("file:////", "file:///")),
|
|
53 | + resProto.ALLOW_CONTENT_ACCESS
|
|
54 | + );
|
|
43 | 55 | }
|
44 | 56 | |
45 | 57 | SpecialPowersParent.registerActor();
|