Loading build/GN_ARGS +0 −1 Original line number Diff line number Diff line Loading @@ -37,7 +37,6 @@ use_debug_fission=true use_errorprone_java_compiler=false use_gnome_keyring=false use_official_google_api_keys=false use_openh264=true use_rtti=false use_sysroot=false webview_includes_weblayer=false build/bromite_patches_list.txt +1 −16 Original line number Diff line number Diff line Disable-third-party-cookies-by-default.patch Password-service-build-fixes.patch Restore-classic-new-tab-page.patch Always-use-new-tab-page-for-default-home-page.patch Always-allow-partner-customisation.patch Loading Loading @@ -56,7 +55,6 @@ Disable-metrics-on-all-I-O-threads.patch Always-respect-async-dns-flag-regardless-of-SDK-version.patch Add-flag-to-configure-maximum-connections-per-host.patch Add-bookmark-import-export-actions.patch Disable-promos-displayed-in-bookmarks-manager.patch Add-an-always-incognito-mode.patch Add-custom-tab-intents-privacy-option.patch Add-option-to-not-persist-tabs-across-sessions.patch Loading @@ -74,17 +72,7 @@ kill-TOS-and-metrics-opt-out.patch kill-Vision.patch kill-Location-fall-back-to-system.patch kill-Auth.patch Remove-dependency-on-com.google.android.gms.auth.patch kill-GCM.patch Remove-dependency-on-com.google.android.gcm.patch Remove-dependency-on-com.google.android.gms.gcm.patch Remove-dependency-on-com.google.android.play.patch Remove-dependency-on-vision-clearcut-and-phenotype.patch Remove-dependency-on-flags-places-and-stats.patch Remove-dependency-on-fido-iid-instantapps-location.patch Remove-dependency-on-com.google.android.gms.cast.patch Remove-dependency-on-auth-signin-dynamic-and-tasks.patch Remove-google_services_gcm.patch Remove-binary-blob-integrations.patch Remove-SMS-integration.patch Do-not-compile-QR-code-sharing.patch Allow-website-sign-in-without-account-sign-in.patch Loading Loading @@ -116,7 +104,6 @@ DoH-secure-mode-by-default.patch Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch Revert-flags-remove-disable-pull-to-refresh-effect.patch Use-dummy-DFM-installer.patch Disable-password-reuse-detection-on-android.patch Disable-feeds-support-by-default.patch Disable-autofill-assistant-by-default.patch Show-site-settings-for-cookies.patch Loading @@ -132,7 +119,6 @@ Add-menu-item-to-view-source.patch Enable-legacy-TLS-interstitital-warning.patch Block-gateway-attacks-via-websockets.patch Enable-prefetch-privacy-changes-by-default.patch Enable-reduced-referrer-granularity-by-default.patch Disable-support-for-RAR-files-inspection.patch Add-history-support-in-incognito-mode.patch Enable-darken-websites-checkbox-in-themes.patch Loading @@ -155,7 +141,6 @@ Disable-unified-autoplay-feature.patch Revert-flags-remove-num-raster-threads.patch webview-Hard-no-to-persistent-histograms.patch Ignore-enterprise-policies-for-secure-DNS.patch Fix-favicons-fallback-search.patch Enable-app-overflow-menu-icons-by-default.patch Add-menu-item-to-bookmark-all-tabs.patch Add-flag-for-save-data-header.patch Loading build/chromium_patches_list.txt +0 −2 Original line number Diff line number Diff line AV1-codec-support.patch Switch-to-fstack-protector-strong.patch Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch Disable-password-reuse-detection-on-android.patch Disable-feeds-support-by-default.patch Password-service-build-fixes.patch build/patches/AImageReader-CFI-crash-mitigations.patch +11 −11 Original line number Diff line number Diff line Loading @@ -83,15 +83,15 @@ diff --git a/base/android/android_image_reader_compat.h b/base/android/android_i diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json @@ -1712,7 +1712,7 @@ @@ -1724,7 +1724,7 @@ { "name": "enable-image-reader", "owners": [ "vikassoni", "khushalsagar" ], "name": "enable-heavy-ad-intervention", "owners": [ "johnidel", "jkarlin" ], - "expiry_milestone": 90 + "expiry_milestone": -1 }, { "name": "enable-immersive-fullscreen-toolbar", "name": "enable-heuristic-stylus-palm-rejection", diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_list.json --- a/gpu/config/gpu_driver_bug_list.json +++ b/gpu/config/gpu_driver_bug_list.json Loading Loading @@ -132,7 +132,7 @@ diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc + // Used to limit GL version to 2.0 for skia raster on Android. const base::Feature kUseGles2ForOopR{"UseGles2ForOopR", base::FEATURE_ENABLED_BY_DEFAULT}; base::FEATURE_DISABLED_BY_DEFAULT}; @@ -55,7 +60,11 @@ const base::FeatureParam<std::string> kAndroidSurfaceControlBlocklist{ // Use AImageReader for MediaCodec and MediaPlyer on android. Loading Loading @@ -170,7 +170,7 @@ diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc if (!gpu_preferences.enable_android_surface_control) return kGpuFeatureStatusDisabled; @@ -327,6 +330,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) { @@ -316,6 +319,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) { gpu_feature_info->status_values[GPU_FEATURE_TYPE_ACCELERATED_WEBGL2] = kGpuFeatureStatusBlocklisted; } Loading @@ -190,13 +190,13 @@ diff --git a/gpu/config/gpu_workaround_list.txt b/gpu/config/gpu_workaround_list disable_2d_canvas_auto_flush disable_accelerated_av1_decode +disable_aimagereader disable_accelerated_av1_decode_d3d11 disable_accelerated_vp8_decode disable_accelerated_vp8_encode disable_accelerated_vp9_decode diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc --- a/gpu/ipc/service/gpu_init.cc +++ b/gpu/ipc/service/gpu_init.cc @@ -464,6 +464,11 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line, @@ -477,6 +477,11 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line, } } Loading @@ -219,7 +219,7 @@ diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_ #include "base/android/scoped_hardware_buffer_fence_sync.h" #include "base/bind.h" #include "base/feature_list.h" @@ -47,7 +48,15 @@ std::unique_ptr<ui::ScopedMakeCurrent> MakeCurrent( @@ -48,7 +49,15 @@ std::unique_ptr<ui::ScopedMakeCurrent> MakeCurrent( } TextureOwner::Mode GetTextureOwnerMode() { Loading @@ -239,7 +239,7 @@ diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc --- a/media/base/media_switches.cc +++ b/media/base/media_switches.cc @@ -571,6 +571,10 @@ const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning", @@ -604,6 +604,10 @@ const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning", const base::Feature kMediaDrmPreprovisioningAtStartup{ "MediaDrmPreprovisioningAtStartup", base::FEATURE_ENABLED_BY_DEFAULT}; Loading @@ -253,7 +253,7 @@ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc diff --git a/media/base/media_switches.h b/media/base/media_switches.h --- a/media/base/media_switches.h +++ b/media/base/media_switches.h @@ -194,6 +194,7 @@ MEDIA_EXPORT extern const base::Feature kMediaControlsExpandGesture; @@ -206,6 +206,7 @@ MEDIA_EXPORT extern const base::Feature kMediaControlsExpandGesture; MEDIA_EXPORT extern const base::Feature kMediaDrmPersistentLicense; MEDIA_EXPORT extern const base::Feature kMediaDrmPreprovisioning; MEDIA_EXPORT extern const base::Feature kMediaDrmPreprovisioningAtStartup; Loading build/patches/AV1-codec-support.patch +14 −33 Original line number Diff line number Diff line Loading @@ -5,7 +5,6 @@ Subject: AV1 codec support libaom build fixes (requires -fPIC) Report AV1 as playable on Android --- media/base/mime_util_internal.cc | 6 +++++- third_party/libaom/BUILD.gn | 6 ++++-- third_party/libaom/libaom_srcs.gni | 5 +++++ .../config/linux/arm-neon-cpu-detect/config/aom_config.asm | 2 +- Loading @@ -20,26 +19,8 @@ Report AV1 as playable on Android .../libaom/source/config/linux/generic/config/aom_config.h | 2 +- .../libaom/source/config/linux/x64/config/aom_config.asm | 2 +- .../libaom/source/config/linux/x64/config/aom_config.h | 2 +- 15 files changed, 26 insertions(+), 15 deletions(-) 14 files changed, 21 insertions(+), 14 deletions(-) diff --git a/media/base/mime_util_internal.cc b/media/base/mime_util_internal.cc --- a/media/base/mime_util_internal.cc +++ b/media/base/mime_util_internal.cc @@ -565,9 +565,13 @@ bool MimeUtil::IsCodecSupportedOnAndroid( case THEORA: return false; - // AV1 is not supported on Android yet. + // AV1 is supported on Android. case AV1: +#if BUILDFLAG(ENABLE_AV1_DECODER) + return true; +#else return false; +#endif // ---------------------------------------------------------------------- // The remaining codecs may be supported depending on platform abilities. diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn --- a/third_party/libaom/BUILD.gn +++ b/third_party/libaom/BUILD.gn Loading Loading @@ -73,7 +54,7 @@ diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn diff --git a/third_party/libaom/libaom_srcs.gni b/third_party/libaom/libaom_srcs.gni --- a/third_party/libaom/libaom_srcs.gni +++ b/third_party/libaom/libaom_srcs.gni @@ -672,6 +672,11 @@ aom_mem_sources = [ @@ -616,6 +616,11 @@ aom_mem_sources = [ aom_ports_asm_x86 = [ "//third_party/libaom/source/libaom/aom_ports/emms.asm" ] Loading @@ -95,7 +76,7 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/a -CONFIG_PIC equ 0 +CONFIG_PIC equ 1 CONFIG_RD_DEBUG equ 0 CONFIG_REALTIME_ONLY equ 0 CONFIG_REALTIME_ONLY equ 1 CONFIG_RUNTIME_CPU_DETECT equ 1 diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h --- a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h Loading @@ -107,7 +88,7 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/a -#define CONFIG_PIC 0 +#define CONFIG_PIC 1 #define CONFIG_RD_DEBUG 0 #define CONFIG_REALTIME_ONLY 0 #define CONFIG_REALTIME_ONLY 1 #define CONFIG_RUNTIME_CPU_DETECT 1 diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm --- a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm Loading @@ -119,7 +100,7 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.a -CONFIG_PIC equ 0 +CONFIG_PIC equ 1 CONFIG_RD_DEBUG equ 0 CONFIG_REALTIME_ONLY equ 0 CONFIG_REALTIME_ONLY equ 1 CONFIG_RUNTIME_CPU_DETECT equ 0 diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h --- a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h Loading @@ -131,7 +112,7 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h -#define CONFIG_PIC 0 +#define CONFIG_PIC 1 #define CONFIG_RD_DEBUG 0 #define CONFIG_REALTIME_ONLY 0 #define CONFIG_REALTIME_ONLY 1 #define CONFIG_RUNTIME_CPU_DETECT 0 diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.asm b/third_party/libaom/source/config/linux/arm/config/aom_config.asm --- a/third_party/libaom/source/config/linux/arm/config/aom_config.asm Loading @@ -143,7 +124,7 @@ diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.asm b/ -CONFIG_PIC equ 0 +CONFIG_PIC equ 1 CONFIG_RD_DEBUG equ 0 CONFIG_REALTIME_ONLY equ 0 CONFIG_REALTIME_ONLY equ 1 CONFIG_RUNTIME_CPU_DETECT equ 0 diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.h b/third_party/libaom/source/config/linux/arm/config/aom_config.h --- a/third_party/libaom/source/config/linux/arm/config/aom_config.h Loading @@ -155,7 +136,7 @@ diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.h b/th -#define CONFIG_PIC 0 +#define CONFIG_PIC 1 #define CONFIG_RD_DEBUG 0 #define CONFIG_REALTIME_ONLY 0 #define CONFIG_REALTIME_ONLY 1 #define CONFIG_RUNTIME_CPU_DETECT 0 diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm b/third_party/libaom/source/config/linux/arm64/config/aom_config.asm --- a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm Loading @@ -167,7 +148,7 @@ diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm -CONFIG_PIC equ 0 +CONFIG_PIC equ 1 CONFIG_RD_DEBUG equ 0 CONFIG_REALTIME_ONLY equ 0 CONFIG_REALTIME_ONLY equ 1 CONFIG_RUNTIME_CPU_DETECT equ 0 diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.h b/third_party/libaom/source/config/linux/arm64/config/aom_config.h --- a/third_party/libaom/source/config/linux/arm64/config/aom_config.h Loading @@ -179,7 +160,7 @@ diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.h b/ -#define CONFIG_PIC 0 +#define CONFIG_PIC 1 #define CONFIG_RD_DEBUG 0 #define CONFIG_REALTIME_ONLY 0 #define CONFIG_REALTIME_ONLY 1 #define CONFIG_RUNTIME_CPU_DETECT 0 diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.asm b/third_party/libaom/source/config/linux/generic/config/aom_config.asm --- a/third_party/libaom/source/config/linux/generic/config/aom_config.asm Loading @@ -191,7 +172,7 @@ diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.as -CONFIG_PIC equ 0 +CONFIG_PIC equ 1 CONFIG_RD_DEBUG equ 0 CONFIG_REALTIME_ONLY equ 0 CONFIG_REALTIME_ONLY equ 1 CONFIG_RUNTIME_CPU_DETECT equ 1 diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.h b/third_party/libaom/source/config/linux/generic/config/aom_config.h --- a/third_party/libaom/source/config/linux/generic/config/aom_config.h Loading @@ -203,7 +184,7 @@ diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.h -#define CONFIG_PIC 0 +#define CONFIG_PIC 1 #define CONFIG_RD_DEBUG 0 #define CONFIG_REALTIME_ONLY 0 #define CONFIG_REALTIME_ONLY 1 #define CONFIG_RUNTIME_CPU_DETECT 1 diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.asm b/third_party/libaom/source/config/linux/x64/config/aom_config.asm --- a/third_party/libaom/source/config/linux/x64/config/aom_config.asm Loading @@ -215,7 +196,7 @@ diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.asm b/ -%define CONFIG_PIC 0 +%define CONFIG_PIC 1 %define CONFIG_RD_DEBUG 0 %define CONFIG_REALTIME_ONLY 0 %define CONFIG_REALTIME_ONLY 1 %define CONFIG_RUNTIME_CPU_DETECT 1 diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.h b/third_party/libaom/source/config/linux/x64/config/aom_config.h --- a/third_party/libaom/source/config/linux/x64/config/aom_config.h Loading @@ -227,7 +208,7 @@ diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.h b/th -#define CONFIG_PIC 0 +#define CONFIG_PIC 1 #define CONFIG_RD_DEBUG 0 #define CONFIG_REALTIME_ONLY 0 #define CONFIG_REALTIME_ONLY 1 #define CONFIG_RUNTIME_CPU_DETECT 1 -- 2.17.1 Loading Loading
build/GN_ARGS +0 −1 Original line number Diff line number Diff line Loading @@ -37,7 +37,6 @@ use_debug_fission=true use_errorprone_java_compiler=false use_gnome_keyring=false use_official_google_api_keys=false use_openh264=true use_rtti=false use_sysroot=false webview_includes_weblayer=false
build/bromite_patches_list.txt +1 −16 Original line number Diff line number Diff line Disable-third-party-cookies-by-default.patch Password-service-build-fixes.patch Restore-classic-new-tab-page.patch Always-use-new-tab-page-for-default-home-page.patch Always-allow-partner-customisation.patch Loading Loading @@ -56,7 +55,6 @@ Disable-metrics-on-all-I-O-threads.patch Always-respect-async-dns-flag-regardless-of-SDK-version.patch Add-flag-to-configure-maximum-connections-per-host.patch Add-bookmark-import-export-actions.patch Disable-promos-displayed-in-bookmarks-manager.patch Add-an-always-incognito-mode.patch Add-custom-tab-intents-privacy-option.patch Add-option-to-not-persist-tabs-across-sessions.patch Loading @@ -74,17 +72,7 @@ kill-TOS-and-metrics-opt-out.patch kill-Vision.patch kill-Location-fall-back-to-system.patch kill-Auth.patch Remove-dependency-on-com.google.android.gms.auth.patch kill-GCM.patch Remove-dependency-on-com.google.android.gcm.patch Remove-dependency-on-com.google.android.gms.gcm.patch Remove-dependency-on-com.google.android.play.patch Remove-dependency-on-vision-clearcut-and-phenotype.patch Remove-dependency-on-flags-places-and-stats.patch Remove-dependency-on-fido-iid-instantapps-location.patch Remove-dependency-on-com.google.android.gms.cast.patch Remove-dependency-on-auth-signin-dynamic-and-tasks.patch Remove-google_services_gcm.patch Remove-binary-blob-integrations.patch Remove-SMS-integration.patch Do-not-compile-QR-code-sharing.patch Allow-website-sign-in-without-account-sign-in.patch Loading Loading @@ -116,7 +104,6 @@ DoH-secure-mode-by-default.patch Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch Revert-flags-remove-disable-pull-to-refresh-effect.patch Use-dummy-DFM-installer.patch Disable-password-reuse-detection-on-android.patch Disable-feeds-support-by-default.patch Disable-autofill-assistant-by-default.patch Show-site-settings-for-cookies.patch Loading @@ -132,7 +119,6 @@ Add-menu-item-to-view-source.patch Enable-legacy-TLS-interstitital-warning.patch Block-gateway-attacks-via-websockets.patch Enable-prefetch-privacy-changes-by-default.patch Enable-reduced-referrer-granularity-by-default.patch Disable-support-for-RAR-files-inspection.patch Add-history-support-in-incognito-mode.patch Enable-darken-websites-checkbox-in-themes.patch Loading @@ -155,7 +141,6 @@ Disable-unified-autoplay-feature.patch Revert-flags-remove-num-raster-threads.patch webview-Hard-no-to-persistent-histograms.patch Ignore-enterprise-policies-for-secure-DNS.patch Fix-favicons-fallback-search.patch Enable-app-overflow-menu-icons-by-default.patch Add-menu-item-to-bookmark-all-tabs.patch Add-flag-for-save-data-header.patch Loading
build/chromium_patches_list.txt +0 −2 Original line number Diff line number Diff line AV1-codec-support.patch Switch-to-fstack-protector-strong.patch Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch Disable-password-reuse-detection-on-android.patch Disable-feeds-support-by-default.patch Password-service-build-fixes.patch
build/patches/AImageReader-CFI-crash-mitigations.patch +11 −11 Original line number Diff line number Diff line Loading @@ -83,15 +83,15 @@ diff --git a/base/android/android_image_reader_compat.h b/base/android/android_i diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json @@ -1712,7 +1712,7 @@ @@ -1724,7 +1724,7 @@ { "name": "enable-image-reader", "owners": [ "vikassoni", "khushalsagar" ], "name": "enable-heavy-ad-intervention", "owners": [ "johnidel", "jkarlin" ], - "expiry_milestone": 90 + "expiry_milestone": -1 }, { "name": "enable-immersive-fullscreen-toolbar", "name": "enable-heuristic-stylus-palm-rejection", diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_list.json --- a/gpu/config/gpu_driver_bug_list.json +++ b/gpu/config/gpu_driver_bug_list.json Loading Loading @@ -132,7 +132,7 @@ diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc + // Used to limit GL version to 2.0 for skia raster on Android. const base::Feature kUseGles2ForOopR{"UseGles2ForOopR", base::FEATURE_ENABLED_BY_DEFAULT}; base::FEATURE_DISABLED_BY_DEFAULT}; @@ -55,7 +60,11 @@ const base::FeatureParam<std::string> kAndroidSurfaceControlBlocklist{ // Use AImageReader for MediaCodec and MediaPlyer on android. Loading Loading @@ -170,7 +170,7 @@ diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc if (!gpu_preferences.enable_android_surface_control) return kGpuFeatureStatusDisabled; @@ -327,6 +330,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) { @@ -316,6 +319,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) { gpu_feature_info->status_values[GPU_FEATURE_TYPE_ACCELERATED_WEBGL2] = kGpuFeatureStatusBlocklisted; } Loading @@ -190,13 +190,13 @@ diff --git a/gpu/config/gpu_workaround_list.txt b/gpu/config/gpu_workaround_list disable_2d_canvas_auto_flush disable_accelerated_av1_decode +disable_aimagereader disable_accelerated_av1_decode_d3d11 disable_accelerated_vp8_decode disable_accelerated_vp8_encode disable_accelerated_vp9_decode diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc --- a/gpu/ipc/service/gpu_init.cc +++ b/gpu/ipc/service/gpu_init.cc @@ -464,6 +464,11 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line, @@ -477,6 +477,11 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line, } } Loading @@ -219,7 +219,7 @@ diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_ #include "base/android/scoped_hardware_buffer_fence_sync.h" #include "base/bind.h" #include "base/feature_list.h" @@ -47,7 +48,15 @@ std::unique_ptr<ui::ScopedMakeCurrent> MakeCurrent( @@ -48,7 +49,15 @@ std::unique_ptr<ui::ScopedMakeCurrent> MakeCurrent( } TextureOwner::Mode GetTextureOwnerMode() { Loading @@ -239,7 +239,7 @@ diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc --- a/media/base/media_switches.cc +++ b/media/base/media_switches.cc @@ -571,6 +571,10 @@ const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning", @@ -604,6 +604,10 @@ const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning", const base::Feature kMediaDrmPreprovisioningAtStartup{ "MediaDrmPreprovisioningAtStartup", base::FEATURE_ENABLED_BY_DEFAULT}; Loading @@ -253,7 +253,7 @@ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc diff --git a/media/base/media_switches.h b/media/base/media_switches.h --- a/media/base/media_switches.h +++ b/media/base/media_switches.h @@ -194,6 +194,7 @@ MEDIA_EXPORT extern const base::Feature kMediaControlsExpandGesture; @@ -206,6 +206,7 @@ MEDIA_EXPORT extern const base::Feature kMediaControlsExpandGesture; MEDIA_EXPORT extern const base::Feature kMediaDrmPersistentLicense; MEDIA_EXPORT extern const base::Feature kMediaDrmPreprovisioning; MEDIA_EXPORT extern const base::Feature kMediaDrmPreprovisioningAtStartup; Loading
build/patches/AV1-codec-support.patch +14 −33 Original line number Diff line number Diff line Loading @@ -5,7 +5,6 @@ Subject: AV1 codec support libaom build fixes (requires -fPIC) Report AV1 as playable on Android --- media/base/mime_util_internal.cc | 6 +++++- third_party/libaom/BUILD.gn | 6 ++++-- third_party/libaom/libaom_srcs.gni | 5 +++++ .../config/linux/arm-neon-cpu-detect/config/aom_config.asm | 2 +- Loading @@ -20,26 +19,8 @@ Report AV1 as playable on Android .../libaom/source/config/linux/generic/config/aom_config.h | 2 +- .../libaom/source/config/linux/x64/config/aom_config.asm | 2 +- .../libaom/source/config/linux/x64/config/aom_config.h | 2 +- 15 files changed, 26 insertions(+), 15 deletions(-) 14 files changed, 21 insertions(+), 14 deletions(-) diff --git a/media/base/mime_util_internal.cc b/media/base/mime_util_internal.cc --- a/media/base/mime_util_internal.cc +++ b/media/base/mime_util_internal.cc @@ -565,9 +565,13 @@ bool MimeUtil::IsCodecSupportedOnAndroid( case THEORA: return false; - // AV1 is not supported on Android yet. + // AV1 is supported on Android. case AV1: +#if BUILDFLAG(ENABLE_AV1_DECODER) + return true; +#else return false; +#endif // ---------------------------------------------------------------------- // The remaining codecs may be supported depending on platform abilities. diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn --- a/third_party/libaom/BUILD.gn +++ b/third_party/libaom/BUILD.gn Loading Loading @@ -73,7 +54,7 @@ diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn diff --git a/third_party/libaom/libaom_srcs.gni b/third_party/libaom/libaom_srcs.gni --- a/third_party/libaom/libaom_srcs.gni +++ b/third_party/libaom/libaom_srcs.gni @@ -672,6 +672,11 @@ aom_mem_sources = [ @@ -616,6 +616,11 @@ aom_mem_sources = [ aom_ports_asm_x86 = [ "//third_party/libaom/source/libaom/aom_ports/emms.asm" ] Loading @@ -95,7 +76,7 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/a -CONFIG_PIC equ 0 +CONFIG_PIC equ 1 CONFIG_RD_DEBUG equ 0 CONFIG_REALTIME_ONLY equ 0 CONFIG_REALTIME_ONLY equ 1 CONFIG_RUNTIME_CPU_DETECT equ 1 diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h --- a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h Loading @@ -107,7 +88,7 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/a -#define CONFIG_PIC 0 +#define CONFIG_PIC 1 #define CONFIG_RD_DEBUG 0 #define CONFIG_REALTIME_ONLY 0 #define CONFIG_REALTIME_ONLY 1 #define CONFIG_RUNTIME_CPU_DETECT 1 diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm --- a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm Loading @@ -119,7 +100,7 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.a -CONFIG_PIC equ 0 +CONFIG_PIC equ 1 CONFIG_RD_DEBUG equ 0 CONFIG_REALTIME_ONLY equ 0 CONFIG_REALTIME_ONLY equ 1 CONFIG_RUNTIME_CPU_DETECT equ 0 diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h --- a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h Loading @@ -131,7 +112,7 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h -#define CONFIG_PIC 0 +#define CONFIG_PIC 1 #define CONFIG_RD_DEBUG 0 #define CONFIG_REALTIME_ONLY 0 #define CONFIG_REALTIME_ONLY 1 #define CONFIG_RUNTIME_CPU_DETECT 0 diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.asm b/third_party/libaom/source/config/linux/arm/config/aom_config.asm --- a/third_party/libaom/source/config/linux/arm/config/aom_config.asm Loading @@ -143,7 +124,7 @@ diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.asm b/ -CONFIG_PIC equ 0 +CONFIG_PIC equ 1 CONFIG_RD_DEBUG equ 0 CONFIG_REALTIME_ONLY equ 0 CONFIG_REALTIME_ONLY equ 1 CONFIG_RUNTIME_CPU_DETECT equ 0 diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.h b/third_party/libaom/source/config/linux/arm/config/aom_config.h --- a/third_party/libaom/source/config/linux/arm/config/aom_config.h Loading @@ -155,7 +136,7 @@ diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.h b/th -#define CONFIG_PIC 0 +#define CONFIG_PIC 1 #define CONFIG_RD_DEBUG 0 #define CONFIG_REALTIME_ONLY 0 #define CONFIG_REALTIME_ONLY 1 #define CONFIG_RUNTIME_CPU_DETECT 0 diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm b/third_party/libaom/source/config/linux/arm64/config/aom_config.asm --- a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm Loading @@ -167,7 +148,7 @@ diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm -CONFIG_PIC equ 0 +CONFIG_PIC equ 1 CONFIG_RD_DEBUG equ 0 CONFIG_REALTIME_ONLY equ 0 CONFIG_REALTIME_ONLY equ 1 CONFIG_RUNTIME_CPU_DETECT equ 0 diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.h b/third_party/libaom/source/config/linux/arm64/config/aom_config.h --- a/third_party/libaom/source/config/linux/arm64/config/aom_config.h Loading @@ -179,7 +160,7 @@ diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.h b/ -#define CONFIG_PIC 0 +#define CONFIG_PIC 1 #define CONFIG_RD_DEBUG 0 #define CONFIG_REALTIME_ONLY 0 #define CONFIG_REALTIME_ONLY 1 #define CONFIG_RUNTIME_CPU_DETECT 0 diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.asm b/third_party/libaom/source/config/linux/generic/config/aom_config.asm --- a/third_party/libaom/source/config/linux/generic/config/aom_config.asm Loading @@ -191,7 +172,7 @@ diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.as -CONFIG_PIC equ 0 +CONFIG_PIC equ 1 CONFIG_RD_DEBUG equ 0 CONFIG_REALTIME_ONLY equ 0 CONFIG_REALTIME_ONLY equ 1 CONFIG_RUNTIME_CPU_DETECT equ 1 diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.h b/third_party/libaom/source/config/linux/generic/config/aom_config.h --- a/third_party/libaom/source/config/linux/generic/config/aom_config.h Loading @@ -203,7 +184,7 @@ diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.h -#define CONFIG_PIC 0 +#define CONFIG_PIC 1 #define CONFIG_RD_DEBUG 0 #define CONFIG_REALTIME_ONLY 0 #define CONFIG_REALTIME_ONLY 1 #define CONFIG_RUNTIME_CPU_DETECT 1 diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.asm b/third_party/libaom/source/config/linux/x64/config/aom_config.asm --- a/third_party/libaom/source/config/linux/x64/config/aom_config.asm Loading @@ -215,7 +196,7 @@ diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.asm b/ -%define CONFIG_PIC 0 +%define CONFIG_PIC 1 %define CONFIG_RD_DEBUG 0 %define CONFIG_REALTIME_ONLY 0 %define CONFIG_REALTIME_ONLY 1 %define CONFIG_RUNTIME_CPU_DETECT 1 diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.h b/third_party/libaom/source/config/linux/x64/config/aom_config.h --- a/third_party/libaom/source/config/linux/x64/config/aom_config.h Loading @@ -227,7 +208,7 @@ diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.h b/th -#define CONFIG_PIC 0 +#define CONFIG_PIC 1 #define CONFIG_RD_DEBUG 0 #define CONFIG_REALTIME_ONLY 0 #define CONFIG_REALTIME_ONLY 1 #define CONFIG_RUNTIME_CPU_DETECT 1 -- 2.17.1 Loading