[webkit-changes] [WebKit/WebKit] abf1ad: [WebRTC] vp9_encoder.c: error: arithmetic between ...

[Commit Queue]

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: abf1ad2d935621795408aaa3a0bbb40947c7db31
      https://github.com/WebKit/WebKit/commit/abf1ad2d935621795408aaa3a0bbb40947c7db31
  Author: David Kilzer <ddkilzer at apple.com>
  Date:   2024-01-08 (Mon, 08 Jan 2024)

  Changed paths:
    M Source/ThirdParty/libwebrtc/Configurations/Base-libwebrtc.xcconfig
    M Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig
    M Source/ThirdParty/libwebrtc/Configurations/BaseTarget-libaom.xcconfig
    M Source/ThirdParty/libwebrtc/Configurations/libwebm.xcconfig
    M Source/ThirdParty/libwebrtc/Configurations/opus.xcconfig
    M Source/ThirdParty/libwebrtc/Source/third_party/libvpx/source/libvpx/vp9/encoder/vp9_encoder.c

  Log Message:
  -----------
  [WebRTC] vp9_encoder.c: error: arithmetic between floating-point type 'double' and enumeration type 'vpx_bit_depth_t' (aka 'enum vpx_bit_depth')
https://bugs.webkit.org/show_bug.cgi?id=267148
<rdar://120384890>

Reviewed by Darin Adler.

Use a C-style cast to convert an enum to a double value.  Make sure to
define the WEBRTC_WEBKIT_BUILD macro consistently across all libwebrtc
sub-projects.

* Source/ThirdParty/libwebrtc/Configurations/Base-libwebrtc.xcconfig:
(GCC_PREPROCESSOR_DEFINITIONS):
- Remove two definitions of WEBRTC_WEBKIT_BUILD.
* Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig:
(GCC_PREPROCESSOR_DEFINITIONS): Add WEBRTC_WEBKIT_BUILD.
* Source/ThirdParty/libwebrtc/Configurations/BaseTarget-libaom.xcconfig:
(GCC_PREPROCESSOR_DEFINITIONS):
- Remove WEBRTC_WEBKIT_BUILD.
* Source/ThirdParty/libwebrtc/Configurations/libwebm.xcconfig:
(GCC_PREPROCESSOR_DEFINITIONS): Remove.
- Now defined in Base.xcconfig.
* Source/ThirdParty/libwebrtc/Configurations/opus.xcconfig:
(GCC_PREPROCESSOR_DEFINITIONS):
- Remove WEBRTC_WEBKIT_BUILD.

* Source/ThirdParty/libwebrtc/Source/third_party/libvpx/source/libvpx/vp9/encoder/vp9_encoder.c:
(update_level_info):
- Cast cm->bit_depth from an enum to a double value to fix the
  warning.

Canonical link: https://commits.webkit.org/272771@main