いろいろ警告が出てたのを修正する

shiguredo · Oct 12, 2024 · 72341da · 72341da
1 parent cc7cd87
commit 72341da
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -495,7 +495,7 @@ elseif (SORA_TARGET_OS STREQUAL "ubuntu")
         third_party/NvCodec/NvCodec/NvDecoder/NvDecoder.cpp
         third_party/NvCodec/NvCodec/NvEncoder/NvEncoderCuda.cpp
       PROPERTIES
-        COMPILE_OPTIONS "-xcuda;--cuda-gpu-arch=sm_35;-std=gnu++17"
+        COMPILE_OPTIONS "-xcuda;--cuda-gpu-arch=sm_35;-std=gnu++17;-Wno-tautological-constant-out-of-range-compare"
     )
 
     # CUDA を要求したくないので libsora.a に含める

diff --git a/src/default_video_formats.cpp b/src/default_video_formats.cpp
@@ -24,7 +24,7 @@ std::vector<webrtc::SdpVideoFormat> GetDefaultVideoFormats(
     }
   } else if (codec == webrtc::kVideoCodecAV1) {
     r.push_back(webrtc::SdpVideoFormat(
-        cricket::kAv1CodecName, webrtc::SdpVideoFormat::Parameters(),
+        cricket::kAv1CodecName, webrtc::CodecParameterMap(),
         webrtc::LibaomAv1EncoderSupportedScalabilityModes()));
   } else if (codec == webrtc::kVideoCodecH264) {
     r.push_back(CreateH264Format(webrtc::H264Profile::kProfileBaseline,

diff --git a/src/hwenc_vpl/vpl_utils.h b/src/hwenc_vpl/vpl_utils.h
@@ -18,11 +18,11 @@
 namespace sora {
 
 static mfxU32 ToMfxCodec(webrtc::VideoCodecType codec) {
-  return codec == webrtc::kVideoCodecVP8    ? MFX_CODEC_VP8
-         : codec == webrtc::kVideoCodecVP9  ? MFX_CODEC_VP9
-         : codec == webrtc::kVideoCodecH264 ? MFX_CODEC_AVC
-         : codec == webrtc::kVideoCodecH265 ? MFX_CODEC_HEVC
-                                            : MFX_CODEC_AV1;
+  return codec == webrtc::kVideoCodecVP8    ? (mfxU32)MFX_CODEC_VP8
+         : codec == webrtc::kVideoCodecVP9  ? (mfxU32)MFX_CODEC_VP9
+         : codec == webrtc::kVideoCodecH264 ? (mfxU32)MFX_CODEC_AVC
+         : codec == webrtc::kVideoCodecH265 ? (mfxU32)MFX_CODEC_HEVC
+                                            : (mfxU32)MFX_CODEC_AV1;
 }
 
 static std::string CodecToString(mfxU32 codec) {

diff --git a/src/hwenc_vpl/vpl_video_encoder.cpp b/src/hwenc_vpl/vpl_video_encoder.cpp
@@ -125,13 +125,13 @@ std::unique_ptr<MFXVideoENCODE> VplVideoEncoderImpl::CreateEncoder(
   std::unique_ptr<MFXVideoENCODE> encoder(
       new MFXVideoENCODE(GetVplSession(session)));
 
-  mfxPlatform platform;
-  memset(&platform, 0, sizeof(platform));
-  MFXVideoCORE_QueryPlatform(GetVplSession(session), &platform);
-  RTC_LOG(LS_VERBOSE) << "--------------- codec=" << CodecToString(codec)
-                      << " CodeName=" << platform.CodeName
-                      << " DeviceId=" << platform.DeviceId
-                      << " MediaAdapterType=" << platform.MediaAdapterType;
+  // mfxPlatform platform;
+  // memset(&platform, 0, sizeof(platform));
+  // MFXVideoCORE_QueryPlatform(GetVplSession(session), &platform);
+  // RTC_LOG(LS_VERBOSE) << "--------------- codec=" << CodecToString(codec)
+  //                     << " CodeName=" << platform.CodeName
+  //                     << " DeviceId=" << platform.DeviceId
+  //                     << " MediaAdapterType=" << platform.MediaAdapterType;
 
   mfxVideoParam param;
   ExtBuffer ext;

diff --git a/src/sora_signaling.cpp b/src/sora_signaling.cpp
@@ -1595,7 +1595,7 @@ void SoraSignaling::OnMessage(
     return;
   }
 
-  boost::json::error_code ec;
+  boost::system::error_code ec;
   auto json = boost::json::parse(data, ec);
   if (ec) {
     RTC_LOG(LS_ERROR) << "JSON Parse Error ec=" << ec.message();