bundle widevine

arm/win_ARM_args.gn

@@ -2,13 +2,16 @@ google_api_key = ""
 google_default_client_id = ""
 google_default_client_secret = ""
 visual_studio_version = "2022"
+# clang_base_path = "/usr/lib/llvm-16"
+# clang_version = "16"
+# use_polly = true
 target_os = "win"
 is_win_arm64 = true
 target_cpu = "arm64"
 v8_target_cpu = "arm64"
-enable_stripping = true
 is_official_build = true
 is_debug = false
+enable_stripping = true
 dcheck_always_on = false
 exclude_unwind_tables = true
 # enable_debugallocation = false
@@ -19,6 +22,7 @@ enable_resource_allowlist_generation = true
 enable_profiling = false
 is_component_build = false
 symbol_level = 0
+enable_nacl = false
 optimize_webui = true
 enable_webui_tab_strip = true
 is_clang = true
@@ -27,8 +31,8 @@ treat_warnings_as_errors = false
 use_lld = true
 v8_symbol_level = 0
 v8_enable_fast_torque = true
+# v8_enable_builtins_optimization = true
 use_v8_context_snapshot = true
-enable_nacl = false
 blink_symbol_level = 0
 enable_precompiled_headers = false
 media_use_ffmpeg = true
@@ -40,24 +44,27 @@ enable_discovery = false
 enable_cros_media_app = false
 proprietary_codecs = true
 ffmpeg_branding = "Chrome"
+# Set to false for Polly build
+clang_use_chrome_plugins = false
 enable_ffmpeg_video_decoders = true
 is_component_ffmpeg = false
 use_webaudio_ffmpeg = false
 use_webaudio_pffft = true
 # enable_av1_decoder = true
 # enable_dav1d_decoder = true
+enable_library_cdms = true
 enable_widevine = true
-bundle_widevine_cdm = false
+bundle_widevine_cdm = true
 # enable_widevine_cdm_component = true
-enable_cdm_host_verification = false
 # enable_media_foundation_widevine_cdm = true
+enable_cdm_host_verification = false
 ignore_missing_widevine_signing_cert = true
 enable_media_drm_storage = true
 # enable_media_overlay = true
 enable_hangout_services_extension = true
 rtc_use_h264 = true
 rtc_include_ilbc = true
-rtc_build_with_neon = false
+# rtc_build_with_neon = false
 rtc_build_examples = false
 rtc_enable_avx2 = false
 enable_vr = true
@@ -73,5 +80,5 @@ enable_mse_mpeg2ts_stream_parser = true
 use_text_section_splitting = true
 use_thin_lto = true
 thin_lto_enable_optimizations = true
-chrome_pgo_phase = 2
+chrome_pgo_phase = 0
 pgo_data_path = "/home/alex/chromium/src/chrome/build/pgo_profiles/chrome-win64-main-1650682118-4e3f755b1616e713f18922c635416e67b9d69188.profdata"

other/AVX2/win_AVX2_args.gn

@@ -52,9 +52,9 @@ use_webaudio_pffft = true
 # enable_av1_decoder = true
 # enable_dav1d_decoder = true
 enable_widevine = true
-bundle_widevine_cdm = false
+bundle_widevine_cdm = true
 # enable_widevine_cdm_component = true
-enable_media_foundation_widevine_cdm = true
+# enable_media_foundation_widevine_cdm = true
 enable_cdm_host_verification = false
 ignore_missing_widevine_signing_cert = true
 enable_media_drm_storage = true

other/Mac/mac_ARM_args.gn

@@ -50,7 +50,7 @@ enable_cros_media_app = false
 proprietary_codecs = true
 ffmpeg_branding = "Chrome"
 # Set to false for Polly build
-# clang_use_chrome_plugins = false
+clang_use_chrome_plugins = false
 enable_ffmpeg_video_decoders = true
 is_component_ffmpeg = false
 use_webaudio_ffmpeg = false
@@ -59,7 +59,7 @@ use_webaudio_pffft = false
 # enable_dav1d_decoder = true
 enable_library_cdms = true
 enable_widevine = true
-bundle_widevine_cdm = false
+bundle_widevine_cdm = true
 # enable_widevine_cdm_component = true
 enable_cdm_host_verification = false
 ignore_missing_widevine_signing_cert = true

other/Mac/mac_args.gn

@@ -43,7 +43,7 @@ enable_cros_media_app = false
 proprietary_codecs = true
 ffmpeg_branding = "Chrome"
 # Set to false for Polly build
-# clang_use_chrome_plugins = false
+clang_use_chrome_plugins = false
 enable_ffmpeg_video_decoders = true
 is_component_ffmpeg = false
 use_webaudio_ffmpeg = false
@@ -52,7 +52,7 @@ use_webaudio_pffft = false
 # enable_dav1d_decoder = true
 enable_library_cdms = true
 enable_widevine = true
-bundle_widevine_cdm = false
+bundle_widevine_cdm = true
 # enable_widevine_cdm_component = true
 enable_cdm_host_verification = false
 ignore_missing_widevine_signing_cert = true

other/SSE2/win32_args.gn

@@ -53,9 +53,9 @@ use_webaudio_pffft = true
 # enable_dav1d_decoder = true
 enable_library_cdms = true
 enable_widevine = true
-bundle_widevine_cdm = false
+bundle_widevine_cdm = true
 # enable_widevine_cdm_component = true
-enable_media_foundation_widevine_cdm = true
+# enable_media_foundation_widevine_cdm = true
 ignore_missing_widevine_signing_cert = true
 enable_media_drm_storage = true
 # enable_media_overlay = true

other/SSE3/win_SSE3_args.gn

@@ -52,9 +52,9 @@ use_webaudio_pffft = true
 # enable_dav1d_decoder = true
 enable_library_cdms = true
 enable_widevine = true
-bundle_widevine_cdm = false
+bundle_widevine_cdm = true
 # enable_widevine_cdm_component = true
-enable_media_foundation_widevine_cdm = true
+# enable_media_foundation_widevine_cdm = true
 enable_cdm_host_verification = false
 ignore_missing_widevine_signing_cert = true
 enable_media_drm_storage = true

src/third_party/widevine/cdm/linux/x64/LICENSE.txt

@@ -0,0 +1,9 @@
+"Google Inc. and its affiliates ("Google") own all legal right, title and
+interest in and to the content decryption module software ("Software") and
+related documentation, including any intellectual property rights in the
+Software. You may not use, modify, sell, or otherwise distribute the Software
+without a separate license agreement with Google.  The Software is not open
+source software.
+
+If you are interested in licensing the Software, please contact
+widevine@google.com.

src/third_party/widevine/cdm/linux/x64/manifest.json

@@ -0,0 +1,13 @@
+{
+    "arch": "x64",
+    "description": "Widevine Content Decryption Module",
+    "manifest_version": 2,
+    "name": "WidevineCdm",
+    "os": "linux",
+    "version": "4.10.2557.0",
+    "x-cdm-codecs": "vp8,vp09,avc1,av01",
+    "x-cdm-host-versions": "10",
+    "x-cdm-interface-versions": "10",
+    "x-cdm-module-versions": "4",
+    "x-cdm-persistent-license-support": false
+}

src/third_party/widevine/cdm/linux/x64/widevine_cdm_version.h

@@ -0,0 +1,20 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// This is a stand-in for a generated file that is available when the
+// Widevine CDM is available.
+
+#ifndef WIDEVINE_CDM_VERSION_H_
+#define WIDEVINE_CDM_VERSION_H_
+
+#include "third_party/widevine/cdm/widevine_cdm_common.h"
+
+// If the Widevine CDM is available define the following:
+//  - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available
+//    as a string, e.g., "1.0.123.456").
+
+#define WIDEVINE_CDM_AVAILABLE
+#define WIDEVINE_CDM_VERSION_STRING "4.10.2557.0"
+
+#endif  // WIDEVINE_CDM_VERSION_H_

src/third_party/widevine/cdm/mac/arm64/LICENSE.txt

@@ -0,0 +1,9 @@
+"Google Inc. and its affiliates ("Google") own all legal right, title and
+interest in and to the content decryption module software ("Software") and
+related documentation, including any intellectual property rights in the
+Software. You may not use, modify, sell, or otherwise distribute the Software
+without a separate license agreement with Google.  The Software is not open
+source software.
+
+If you are interested in licensing the Software, please contact
+widevine@google.com.

src/third_party/widevine/cdm/mac/arm64/manifest.json

@@ -0,0 +1,13 @@
+{
+    "arch": "arm64",
+    "description": "Widevine Content Decryption Module",
+    "manifest_version": 2,
+    "name": "WidevineCdm",
+    "os": "mac",
+    "version": "4.10.2557.0",
+    "x-cdm-codecs": "vp8,vp09,avc1,av01",
+    "x-cdm-host-versions": "10",
+    "x-cdm-interface-versions": "10",
+    "x-cdm-module-versions": "4",
+    "x-cdm-persistent-license-support": true
+}

src/third_party/widevine/cdm/mac/arm64/widevine_cdm_version.h

@@ -0,0 +1,20 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// This is a stand-in for a generated file that is available when the
+// Widevine CDM is available.
+
+#ifndef WIDEVINE_CDM_VERSION_H_
+#define WIDEVINE_CDM_VERSION_H_
+
+#include "third_party/widevine/cdm/widevine_cdm_common.h"
+
+// If the Widevine CDM is available define the following:
+//  - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available
+//    as a string, e.g., "1.0.123.456").
+
+#define WIDEVINE_CDM_AVAILABLE
+#define WIDEVINE_CDM_VERSION_STRING "4.10.2557.0"
+
+#endif  // WIDEVINE_CDM_VERSION_H_

src/third_party/widevine/cdm/mac/x64/LICENSE.txt

@@ -0,0 +1,9 @@
+"Google Inc. and its affiliates ("Google") own all legal right, title and
+interest in and to the content decryption module software ("Software") and
+related documentation, including any intellectual property rights in the
+Software. You may not use, modify, sell, or otherwise distribute the Software
+without a separate license agreement with Google.  The Software is not open
+source software.
+
+If you are interested in licensing the Software, please contact
+widevine@google.com.

src/third_party/widevine/cdm/mac/x64/manifest.json

@@ -0,0 +1,13 @@
+{
+    "arch": "x64",
+    "description": "Widevine Content Decryption Module",
+    "manifest_version": 2,
+    "name": "WidevineCdm",
+    "os": "mac",
+    "version": "4.10.2557.0",
+    "x-cdm-codecs": "vp8,vp09,avc1,av01",
+    "x-cdm-host-versions": "10",
+    "x-cdm-interface-versions": "10",
+    "x-cdm-module-versions": "4",
+    "x-cdm-persistent-license-support": true
+}

src/third_party/widevine/cdm/mac/x64/widevine_cdm_version.h

@@ -0,0 +1,20 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// This is a stand-in for a generated file that is available when the
+// Widevine CDM is available.
+
+#ifndef WIDEVINE_CDM_VERSION_H_
+#define WIDEVINE_CDM_VERSION_H_
+
+#include "third_party/widevine/cdm/widevine_cdm_common.h"
+
+// If the Widevine CDM is available define the following:
+//  - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available
+//    as a string, e.g., "1.0.123.456").
+
+#define WIDEVINE_CDM_AVAILABLE
+#define WIDEVINE_CDM_VERSION_STRING "4.10.2557.0"
+
+#endif  // WIDEVINE_CDM_VERSION_H_

src/third_party/widevine/cdm/widevine.gni

@@ -43,7 +43,7 @@ enable_library_widevine_cdm =
 # Note: Not enabled on ChromeOS. See https://crbug.com/971433
 enable_widevine_cdm_component =
     enable_library_widevine_cdm &&
-    (is_win || is_mac || is_linux || is_chromeos_lacros)
+    (is_linux || is_chromeos_lacros)
 
 # Enable (Windows) Media Foundation Widevine CDM component.
 declare_args() {

src/third_party/widevine/cdm/win/arm64/LICENSE.txt

@@ -0,0 +1,9 @@
+"Google Inc. and its affiliates ("Google") own all legal right, title and
+interest in and to the content decryption module software ("Software") and
+related documentation, including any intellectual property rights in the
+Software. You may not use, modify, sell, or otherwise distribute the Software
+without a separate license agreement with Google.  The Software is not open
+source software.
+
+If you are interested in licensing the Software, please contact
+widevine@google.com.

src/third_party/widevine/cdm/win/arm64/manifest.json

@@ -0,0 +1,13 @@
+{
+    "arch": "arm64",
+    "description": "Widevine Content Decryption Module",
+    "manifest_version": 2,
+    "name": "WidevineCdm",
+    "os": "win",
+    "version": "4.10.2557.0",
+    "x-cdm-codecs": "vp8,vp09,avc1,av01",
+    "x-cdm-host-versions": "10",
+    "x-cdm-interface-versions": "10",
+    "x-cdm-module-versions": "4",
+    "x-cdm-persistent-license-support": true
+}

src/third_party/widevine/cdm/win/arm64/widevine_cdm_version.h

@@ -0,0 +1,20 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// This is a stand-in for a generated file that is available when the
+// Widevine CDM is available.
+
+#ifndef WIDEVINE_CDM_VERSION_H_
+#define WIDEVINE_CDM_VERSION_H_
+
+#include "third_party/widevine/cdm/widevine_cdm_common.h"
+
+// If the Widevine CDM is available define the following:
+//  - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available
+//    as a string, e.g., "1.0.123.456").
+
+#define WIDEVINE_CDM_AVAILABLE
+#define WIDEVINE_CDM_VERSION_STRING "4.10.2557.0"
+
+#endif  // WIDEVINE_CDM_VERSION_H_

src/third_party/widevine/cdm/win/x64/LICENSE.txt

@@ -0,0 +1,9 @@
+"Google Inc. and its affiliates ("Google") own all legal right, title and
+interest in and to the content decryption module software ("Software") and
+related documentation, including any intellectual property rights in the
+Software. You may not use, modify, sell, or otherwise distribute the Software
+without a separate license agreement with Google.  The Software is not open
+source software.
+
+If you are interested in licensing the Software, please contact
+widevine@google.com.

src/third_party/widevine/cdm/win/x64/manifest.json

@@ -0,0 +1,13 @@
+{
+    "arch": "x64",
+    "description": "Widevine Content Decryption Module",
+    "manifest_version": 2,
+    "name": "WidevineCdm",
+    "os": "win",
+    "version": "4.10.2557.0",
+    "x-cdm-codecs": "vp8,vp09,avc1,av01",
+    "x-cdm-host-versions": "10",
+    "x-cdm-interface-versions": "10",
+    "x-cdm-module-versions": "4",
+    "x-cdm-persistent-license-support": true
+}

src/third_party/widevine/cdm/win/x64/widevine_cdm_version.h

@@ -0,0 +1,20 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// This is a stand-in for a generated file that is available when the
+// Widevine CDM is available.
+
+#ifndef WIDEVINE_CDM_VERSION_H_
+#define WIDEVINE_CDM_VERSION_H_
+
+#include "third_party/widevine/cdm/widevine_cdm_common.h"
+
+// If the Widevine CDM is available define the following:
+//  - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available
+//    as a string, e.g., "1.0.123.456").
+
+#define WIDEVINE_CDM_AVAILABLE
+#define WIDEVINE_CDM_VERSION_STRING "4.10.2557.0"
+
+#endif  // WIDEVINE_CDM_VERSION_H_

src/third_party/widevine/cdm/win/x86/LICENSE.txt

@@ -0,0 +1,9 @@
+"Google Inc. and its affiliates ("Google") own all legal right, title and
+interest in and to the content decryption module software ("Software") and
+related documentation, including any intellectual property rights in the
+Software. You may not use, modify, sell, or otherwise distribute the Software
+without a separate license agreement with Google.  The Software is not open
+source software.
+
+If you are interested in licensing the Software, please contact
+widevine@google.com.

src/third_party/widevine/cdm/win/x86/manifest.json

@@ -0,0 +1,13 @@
+{
+    "arch": "x86",
+    "description": "Widevine Content Decryption Module",
+    "manifest_version": 2,
+    "name": "WidevineCdm",
+    "os": "win",
+    "version": "4.10.2557.0",
+    "x-cdm-codecs": "vp8,vp09,avc1,av01",
+    "x-cdm-host-versions": "10",
+    "x-cdm-interface-versions": "10",
+    "x-cdm-module-versions": "4",
+    "x-cdm-persistent-license-support": true
+}

src/third_party/widevine/cdm/win/x86/widevine_cdm_version.h

@@ -0,0 +1,20 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// This is a stand-in for a generated file that is available when the
+// Widevine CDM is available.
+
+#ifndef WIDEVINE_CDM_VERSION_H_
+#define WIDEVINE_CDM_VERSION_H_
+
+#include "third_party/widevine/cdm/widevine_cdm_common.h"
+
+// If the Widevine CDM is available define the following:
+//  - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available
+//    as a string, e.g., "1.0.123.456").
+
+#define WIDEVINE_CDM_AVAILABLE
+#define WIDEVINE_CDM_VERSION_STRING "4.10.2557.0"
+
+#endif  // WIDEVINE_CDM_VERSION_H_

win_args.gn

@@ -52,9 +52,9 @@ use_webaudio_pffft = true
 # enable_dav1d_decoder = true
 enable_library_cdms = true
 enable_widevine = true
-bundle_widevine_cdm = false
+bundle_widevine_cdm = true
 # enable_widevine_cdm_component = true
-enable_media_foundation_widevine_cdm = true
+# enable_media_foundation_widevine_cdm = true
 enable_cdm_host_verification = false
 ignore_missing_widevine_signing_cert = true
 enable_media_drm_storage = true