Merge remote-tracking branch 'refs/remotes/origin/duan/vaapi-hw-codec' into duan/vaapi-hw-codec

Author: cloudwebrtc

.github/workflows/ffi-builds.yml

@@ -68,7 +68,7 @@ jobs:
             buildargs: --no-default-features --features "rustls-tls-webpki-roots"
           - os: ubuntu-latest
             platform: linux
-            build_image: quay.io/pypa/manylinux_2_28_x86_64
+            build_image: sameli/manylinux_2_28_x86_64_cuda_12.3
             dylib: liblivekit_ffi.so
             target: x86_64-unknown-linux-gnu
             name: ffi-linux-x86_64

webrtc-sys/src/video_decoder_factory.cpp

@@ -35,7 +35,7 @@
 #include "livekit/android.h"
 #endif
 
-#if defined(__linux__) && defined(__x86_64__) && !(WEBRTC_ANDROID)
+#if defined(__linux__) && defined(__x86_64__) && !defined(WEBRTC_ANDROID)
 #include "nvidia/nvidia_decoder_factory.h"
 #endif
 
@@ -50,7 +50,7 @@ VideoDecoderFactory::VideoDecoderFactory() {
   factories_.push_back(CreateAndroidVideoDecoderFactory());
 #endif
 
-#if defined(__linux__) && defined(__x86_64__) && !(WEBRTC_ANDROID)
+#if defined(__linux__) && defined(__x86_64__) && !defined(WEBRTC_ANDROID)
   if (webrtc::NvidiaVideoDecoderFactory::IsSupported()) {
     factories_.push_back(std::make_unique<webrtc::NvidiaVideoDecoderFactory>());
   }

webrtc-sys/src/video_encoder_factory.cpp

@@ -37,7 +37,7 @@
 #include "livekit/android.h"
 #endif
 
-#if defined(__linux__) && defined(__x86_64__) && !(WEBRTC_ANDROID)
+#if defined(__linux__) && defined(__x86_64__) && !defined(WEBRTC_ANDROID)
 #include "nvidia/nvidia_encoder_factory.h"
 #include "vaapi/vaapi_encoder_factory.h"
 #endif
@@ -63,7 +63,7 @@ VideoEncoderFactory::InternalFactory::InternalFactory() {
   factories_.push_back(CreateAndroidVideoEncoderFactory());
 #endif
 
-#if defined(__linux__) && defined(__x86_64__) && !(WEBRTC_ANDROID)
+#if defined(__linux__) && defined(__x86_64__) && !defined(WEBRTC_ANDROID)
   if (webrtc::NvidiaVideoEncoderFactory::IsSupported()) {
     factories_.push_back(std::make_unique<webrtc::NvidiaVideoEncoderFactory>());
   } else if (webrtc::VAAPIVideoEncoderFactory::IsSupported()) {