-
-
Notifications
You must be signed in to change notification settings - Fork 15k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
qt6.qtwebengine: add aarch64-darwin support
- Loading branch information
Showing
4 changed files
with
183 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 34 additions & 0 deletions
34
pkgs/development/libraries/qt-6/patches/qtwebengine-darwin-no-extensions.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| diff --git a/src/core/common/extensions/extensions_api_provider_qt.cpp b/src/core/common/extensions/extensions_api_provider_qt.cpp | ||
| index 1c8e897..5c4f20b 100644 | ||
| --- a/src/core/common/extensions/extensions_api_provider_qt.cpp | ||
| +++ b/src/core/common/extensions/extensions_api_provider_qt.cpp | ||
| @@ -19,9 +19,9 @@ | ||
| #include "extensions/grit/extensions_resources.h" | ||
| #include "qtwebengine/common/extensions/api/generated_schemas.h" | ||
|
|
||
| -#include "qt_api_features.h" | ||
| +//#include "qt_api_features.h" | ||
| //#include "qt_behavior_features.h" | ||
| -#include "qt_permission_features.h" | ||
| +//#include "qt_permission_features.h" | ||
| //#include "qt_manifest_features.h" | ||
|
|
||
|
|
||
| @@ -37,7 +37,7 @@ void ExtensionsAPIProviderQt::RegisterManifestHandlers() | ||
|
|
||
| void ExtensionsAPIProviderQt::AddAPIFeatures(FeatureProvider *provider) | ||
| { | ||
| - AddQtAPIFeatures(provider); | ||
| + //AddQtAPIFeatures(provider); | ||
| } | ||
|
|
||
| void ExtensionsAPIProviderQt::AddAPIJSONSources(JSONFeatureProviderSource *json_source) | ||
| @@ -47,7 +47,7 @@ void ExtensionsAPIProviderQt::AddAPIJSONSources(JSONFeatureProviderSource *json_ | ||
|
|
||
| void ExtensionsAPIProviderQt::AddPermissionFeatures(FeatureProvider *provider) | ||
| { | ||
| - AddQtPermissionFeatures(provider); | ||
| + //AddQtPermissionFeatures(provider); | ||
| } | ||
|
|
||
| bool ExtensionsAPIProviderQt::IsAPISchemaGenerated(const std::string &name) |
60 changes: 60 additions & 0 deletions
60
pkgs/development/libraries/qt-6/patches/qtwebengine-darwin-no-low-latency.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| diff --git a/src/3rdparty/chromium/media/gpu/mac/vt_video_encode_accelerator_mac.cc b/src/3rdparty/chromium/media/gpu/mac/vt_video_encode_accelerator_mac.cc | ||
| index 6a3a777..249d4cc 100644 | ||
| --- a/src/3rdparty/chromium/media/gpu/mac/vt_video_encode_accelerator_mac.cc | ||
| +++ b/src/3rdparty/chromium/media/gpu/mac/vt_video_encode_accelerator_mac.cc | ||
| @@ -20,12 +20,6 @@ | ||
| #include "media/base/media_log.h" | ||
| #include "media/base/video_frame.h" | ||
|
|
||
| -// This is a min version of macOS where we want to support SVC encoding via | ||
| -// EnableLowLatencyRateControl flag. The flag is actually supported since 11.3, | ||
| -// but there we see frame drops even with ample bitrate budget. Excessive frame | ||
| -// drops were fixed in 12.0.1. | ||
| -#define LOW_LATENCY_FLAG_AVAILABLE_VER 12.0.1 | ||
| - | ||
| namespace media { | ||
|
|
||
| namespace { | ||
| @@ -150,8 +144,6 @@ VTVideoEncodeAccelerator::GetSupportedProfiles() { | ||
| profile.max_framerate_numerator = kMaxFrameRateNumerator; | ||
| profile.max_framerate_denominator = kMaxFrameRateDenominator; | ||
| profile.max_resolution = gfx::Size(kMaxResolutionWidth, kMaxResolutionHeight); | ||
| - if (__builtin_available(macOS LOW_LATENCY_FLAG_AVAILABLE_VER, *)) | ||
| - profile.scalability_modes.push_back(SVCScalabilityMode::kL1T2); | ||
| for (const auto& supported_profile : kSupportedProfiles) { | ||
| profile.profile = supported_profile; | ||
| profiles.push_back(profile); | ||
| @@ -595,13 +587,6 @@ bool VTVideoEncodeAccelerator::CreateCompressionSession( | ||
| kVTVideoEncoderSpecification_RequireHardwareAcceleratedVideoEncoder}; | ||
| std::vector<CFTypeRef> encoder_values{kCFBooleanTrue}; | ||
|
|
||
| - if (__builtin_available(macOS LOW_LATENCY_FLAG_AVAILABLE_VER, *)) { | ||
| - if (require_low_delay_) { | ||
| - encoder_keys.push_back( | ||
| - kVTVideoEncoderSpecification_EnableLowLatencyRateControl); | ||
| - encoder_values.push_back(kCFBooleanTrue); | ||
| - } | ||
| - } | ||
| base::ScopedCFTypeRef<CFDictionaryRef> encoder_spec = | ||
| video_toolbox::DictionaryWithKeysAndValues( | ||
| encoder_keys.data(), encoder_values.data(), encoder_keys.size()); | ||
| @@ -669,19 +654,8 @@ bool VTVideoEncodeAccelerator::ConfigureCompressionSession() { | ||
| } | ||
|
|
||
| if (num_temporal_layers_ == 2) { | ||
| - if (__builtin_available(macOS LOW_LATENCY_FLAG_AVAILABLE_VER, *)) { | ||
| - if (!session_property_setter.IsSupported( | ||
| - kVTCompressionPropertyKey_BaseLayerFrameRateFraction)) { | ||
| - DLOG(ERROR) << "BaseLayerFrameRateFraction is not supported"; | ||
| - return false; | ||
| - } | ||
| - rv &= session_property_setter.Set( | ||
| - kVTCompressionPropertyKey_BaseLayerFrameRateFraction, 0.5); | ||
| - DLOG_IF(ERROR, !rv) << " Setting BaseLayerFrameRate property failed."; | ||
| - } else { | ||
| DLOG(ERROR) << "SVC encoding is not supported on this OS version."; | ||
| rv = false; | ||
| - } | ||
| } | ||
|
|
||
| return rv; |