fix compile issue for linux.

Author: cloudwebrtc

webrtc-sys/build.rs

@@ -186,7 +186,9 @@ fn main() {
                 _ => {}
             }
 
-            builder.flag("-std=c++2a");
+            builder
+                .flag("-Wno-changes-meaning")
+                .flag("-std=c++20");
         }
         "macos" => {
             println!("cargo:rustc-link-lib=framework=Foundation");

webrtc-sys/libwebrtc/build_android.sh

@@ -72,10 +72,6 @@ git apply "$COMMAND_DIR/patches/ssl_verify_callback_with_native_handle.patch" -v
 git apply "$COMMAND_DIR/patches/add_deps.patch" -v --ignore-space-change --ignore-whitespace --whitespace=nowarn
 git apply "$COMMAND_DIR/patches/android_use_libunwind.patch" -v --ignore-space-change --ignore-whitespace --whitespace=nowarn
 
-cd third_party
-git apply "$COMMAND_DIR/patches/abseil_use_optional.patch" -v --ignore-space-change --ignore-whitespace --whitespace=nowarn
-cd ..
-
 cd ..
 
 mkdir -p "$ARTIFACTS_DIR/lib"

webrtc-sys/libwebrtc/build_linux.sh

@@ -71,10 +71,6 @@ git apply "$COMMAND_DIR/patches/add_licenses.patch" -v --ignore-space-change --i
 git apply "$COMMAND_DIR/patches/ssl_verify_callback_with_native_handle.patch" -v --ignore-space-change --ignore-whitespace --whitespace=nowarn
 git apply "$COMMAND_DIR/patches/add_deps.patch" -v --ignore-space-change --ignore-whitespace --whitespace=nowarn
 
-cd third_party
-git apply "$COMMAND_DIR/patches/abseil_use_optional.patch" -v --ignore-space-change --ignore-whitespace --whitespace=nowarn
-cd ..
-
 cd ..
 
 mkdir -p "$ARTIFACTS_DIR/lib"
@@ -99,9 +95,9 @@ args="is_debug=$debug  \
   enable_libaom=true \
   is_component_build=false \
   enable_stripping=true \
-  use_goma=false \
   ffmpeg_branding=\"Chrome\" \
   rtc_use_h264=true \
+  rtc_use_h265=true \
   rtc_use_pipewire=false \
   symbol_level=0 \
   enable_iterator_debugging=false \
@@ -117,7 +113,7 @@ ninja -C "$OUTPUT_DIR" :default
 # make libwebrtc.a
 # don't include nasm
 ar -rc "$ARTIFACTS_DIR/lib/libwebrtc.a" `find "$OUTPUT_DIR/obj" -name '*.o' -not -path "*/third_party/nasm/*"`
-objcopy --redefine-syms="$COMMAND_DIR/boringssl_prefix_symbols.txt" "$ARTIFACTS_DIR/lib/libwebrtc.a"
+objcopy --target=elf64-x86-64 --redefine-syms="$COMMAND_DIR/boringssl_prefix_symbols.txt" "$ARTIFACTS_DIR/lib/libwebrtc.a"
 
 python3 "./src/tools_webrtc/libs/generate_licenses.py" \
   --target :default "$OUTPUT_DIR" "$OUTPUT_DIR"

webrtc-sys/libwebrtc/patches/abseil_use_optional.patch

@@ -1,5 +1,5 @@
 diff --git a/BUILD.gn b/BUILD.gn
-index d5289b85d7..76823f6cff 100644
+index ca8d8faa61..13e07a2f28 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
 @@ -24,6 +24,9 @@
@@ -12,7 +12,7 @@ index d5289b85d7..76823f6cff 100644
  if (rtc_enable_protobuf) {
    import("//third_party/protobuf/proto_library.gni")
  }
-@@ -292,6 +295,10 @@ config("common_config") {
+@@ -331,6 +334,10 @@ config("common_config") {
      defines += [ "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE" ]
    }
 
@@ -23,7 +23,7 @@ index d5289b85d7..76823f6cff 100644
    if (rtc_libvpx_build_vp9) {
      defines += [ "RTC_ENABLE_VP9" ]
    }
-@@ -517,6 +524,10 @@ if (!build_with_chromium) {
+@@ -565,6 +572,10 @@ if (!build_with_chromium) {
        "pc:rtc_pc",
        "sdk",
        "video",

webrtc-sys/libwebrtc/patches/add_deps.patch

@@ -1,8 +1,8 @@
 diff --git a/rtc_base/boringssl_certificate.cc b/rtc_base/boringssl_certificate.cc
-index 99b2ab3e24..c37d6d963f 100644
+index 016b4dabba..1a0c1b8d42 100644
 --- a/rtc_base/boringssl_certificate.cc
 +++ b/rtc_base/boringssl_certificate.cc
-@@ -253,6 +253,12 @@ BoringSSLCertificate::BoringSSLCertificate(
+@@ -259,6 +259,12 @@ BoringSSLCertificate::BoringSSLCertificate(
    RTC_DCHECK(cert_buffer_ != nullptr);
  }
 
@@ -16,18 +16,18 @@ index 99b2ab3e24..c37d6d963f 100644
      OpenSSLKeyPair* key_pair,
      const SSLIdentityParams& params) {
 diff --git a/rtc_base/boringssl_certificate.h b/rtc_base/boringssl_certificate.h
-index 8b4577a17c..e1fe26cba5 100644
+index 926dd332ec..5c62c63390 100644
 --- a/rtc_base/boringssl_certificate.h
 +++ b/rtc_base/boringssl_certificate.h
-@@ -33,6 +33,7 @@ class OpenSSLKeyPair;
+@@ -34,6 +34,7 @@ namespace webrtc {
  class BoringSSLCertificate final : public SSLCertificate {
   public:
    explicit BoringSSLCertificate(bssl::UniquePtr<CRYPTO_BUFFER> cert_buffer);
 +  BoringSSLCertificate(bssl::UniquePtr<CRYPTO_BUFFER> cert_buffer, SSL* ssl);
 
    static std::unique_ptr<BoringSSLCertificate> Generate(
        OpenSSLKeyPair* key_pair,
-@@ -74,6 +75,11 @@ class BoringSSLCertificate final : public SSLCertificate {
+@@ -66,6 +67,11 @@ class BoringSSLCertificate final : public SSLCertificate {
   private:
    // A handle to the DER encoded certificate data.
    bssl::UniquePtr<CRYPTO_BUFFER> cert_buffer_;
@@ -38,12 +38,12 @@ index 8b4577a17c..e1fe26cba5 100644
 +  SSL* ssl() const { return ssl_; }
  };
 
- }  // namespace rtc
+ }  //  namespace webrtc
 diff --git a/rtc_base/openssl_adapter.cc b/rtc_base/openssl_adapter.cc
-index bc10e619eb..836ef9ea18 100644
+index cb5dfc6a85..a2de51ee74 100644
 --- a/rtc_base/openssl_adapter.cc
 +++ b/rtc_base/openssl_adapter.cc
-@@ -822,7 +822,7 @@ enum ssl_verify_result_t OpenSSLAdapter::SSLVerifyInternal(SSL* ssl,
+@@ -840,7 +840,7 @@ enum ssl_verify_result_t OpenSSLAdapter::SSLVerifyInternal(SSL* ssl,
      return ssl_verify_invalid;
    }
 
@@ -52,20 +52,20 @@ index bc10e619eb..836ef9ea18 100644
    if (!ssl_cert_verifier_->Verify(cert)) {
      RTC_LOG(LS_WARNING) << "Failed to verify certificate using custom callback";
      return ssl_verify_invalid;
-@@ -894,7 +894,7 @@ int OpenSSLAdapter::SSLVerifyInternal(int previous_status,
+@@ -912,7 +912,7 @@ int OpenSSLAdapter::SSLVerifyInternal(int previous_status,
      RTC_LOG(LS_ERROR) << "Failed to allocate CRYPTO_BUFFER.";
      return previous_status;
    }
 -  const BoringSSLCertificate cert(std::move(crypto_buffer));
 +  const BoringSSLCertificate cert(std::move(crypto_buffer), ssl);
  #else
-   const OpenSSLCertificate cert(X509_STORE_CTX_get_current_cert(store));
+   const webrtc::OpenSSLCertificate cert(X509_STORE_CTX_get_current_cert(store));
  #endif
 diff --git a/rtc_base/openssl_stream_adapter.cc b/rtc_base/openssl_stream_adapter.cc
-index dd82e4f061..6d7e39c534 100644
+index b46faff911..537171b1f3 100644
 --- a/rtc_base/openssl_stream_adapter.cc
 +++ b/rtc_base/openssl_stream_adapter.cc
-@@ -1154,7 +1154,7 @@ enum ssl_verify_result_t OpenSSLStreamAdapter::SSLVerifyCallback(
+@@ -1181,7 +1181,7 @@ enum ssl_verify_result_t OpenSSLStreamAdapter::SSLVerifyCallback(
    // Creates certificate chain.
    std::vector<std::unique_ptr<SSLCertificate>> cert_chain;
    for (CRYPTO_BUFFER* cert : chain) {

webrtc-sys/libwebrtc/patches/ssl_verify_callback_with_native_handle.patch

@@ -80,7 +80,8 @@ NvidiaH264EncoderImpl::NvidiaH264EncoderImpl(
     CUmemorytype memory_type,
     NV_ENC_BUFFER_FORMAT nv_format,
     const SdpVideoFormat& format)
-    : encoder_(nullptr),
+    : env_(env),
+      encoder_(nullptr),
       cu_context_(context),
       cu_memory_type_(memory_type),
       cu_scaled_array_(nullptr),
@@ -237,7 +238,7 @@ int32_t NvidiaH264EncoderImpl::InitEncode(
     return WEBRTC_VIDEO_CODEC_ERROR;
   }
 
-  SimulcastRateAllocator init_allocator(codec_);
+  SimulcastRateAllocator init_allocator(env_, codec_);
   VideoBitrateAllocation allocation =
       init_allocator.Allocate(VideoBitrateAllocationParameters(
           DataRate::KilobitsPerSec(codec_.startBitrate), codec_.maxFramerate));
@@ -361,7 +362,7 @@ int32_t NvidiaH264EncoderImpl::ProcessEncodedFrame(
     const ::webrtc::VideoFrame& inputFrame) {
   encoded_image_._encodedWidth = encoder_->GetEncodeWidth();
   encoded_image_._encodedHeight = encoder_->GetEncodeHeight();
-  encoded_image_.SetRtpTimestamp(inputFrame.timestamp());
+  encoded_image_.SetRtpTimestamp(inputFrame.rtp_timestamp());
   encoded_image_.SetSimulcastIndex(0);
   encoded_image_.ntp_time_ms_ = inputFrame.ntp_time_ms();
   encoded_image_.capture_time_ms_ = inputFrame.render_time_ms();
@@ -371,7 +372,7 @@ int32_t NvidiaH264EncoderImpl::ProcessEncodedFrame(
   encoded_image_._frameType = VideoFrameType::kVideoFrameDelta;
   encoded_image_.SetColorSpace(inputFrame.color_space());
   std::vector<H264::NaluIndex> naluIndices =
-      H264::FindNaluIndices(packet.data(), packet.size());
+      H264::FindNaluIndices(MakeArrayView(packet.data(), packet.size()));
   for (uint32_t i = 0; i < naluIndices.size(); i++) {
     const H264::NaluType naluType =
         H264::ParseNaluType(packet[naluIndices[i].payload_start_offset]);

webrtc-sys/src/nvidia/h264_encoder_impl.cpp

@@ -67,6 +67,7 @@ class NvidiaH264EncoderImpl : public VideoEncoder {
   int32_t ProcessEncodedFrame(std::vector<uint8_t>& packet,
                               const ::webrtc::VideoFrame& inputFrame);
  private:
+  const webrtc::Environment& env_;
   EncodedImageCallback* encoded_image_callback_ = nullptr;
 
   std::unique_ptr<NvEncoder> encoder_;

webrtc-sys/src/nvidia/h264_encoder_impl.h

@@ -34,7 +34,8 @@ enum H264EncoderImplEvent {
 
 VAAPIH264EncoderWrapper::VAAPIH264EncoderWrapper(const webrtc::Environment& env,
                                                  const SdpVideoFormat& format)
-    : encoder_(new livekit::VaapiH264EncoderWrapper()),
+    : env_(env),
+      encoder_(new livekit::VaapiH264EncoderWrapper()),
       packetization_mode_(
           H264EncoderSettings::Parse(format).packetization_mode),
       format_(format) {
@@ -152,7 +153,7 @@ int32_t VAAPIH264EncoderWrapper::InitEncode(
                          va_profile, VA_RC_CBR);
   }
 
-  SimulcastRateAllocator init_allocator(codec_);
+  SimulcastRateAllocator init_allocator(env_, codec_);
   VideoBitrateAllocation allocation =
       init_allocator.Allocate(VideoBitrateAllocationParameters(
           DataRate::KilobitsPerSec(codec_.startBitrate), codec_.maxFramerate));

webrtc-sys/src/vaapi/h264_encoder_impl.cpp

@@ -61,6 +61,7 @@ class VAAPIH264EncoderWrapper : public VideoEncoder {
   VAProfile GetVAProfile() const;
 
  private:
+  const webrtc::Environment& env_;
   EncodedImageCallback* encoded_image_callback_ = nullptr;
   std::unique_ptr<livekit::VaapiH264EncoderWrapper> encoder_;
   LayerConfig configuration_;