From cc09b1d1176397c347a7c94459bb439afeb9fd8b Mon Sep 17 00:00:00 2001 From: zztkm Date: Fri, 27 Dec 2024 19:56:59 +0900 Subject: [PATCH] =?UTF-8?q?=E4=BE=9D=E5=AD=98=E3=83=A9=E3=82=A4=E3=83=96?= =?UTF-8?q?=E3=83=A9=E3=83=AA=E3=81=AE=E5=9E=8B=E5=A4=89=E6=9B=B4=E3=81=AB?= =?UTF-8?q?=E8=BF=BD=E5=BE=93=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 2 ++ src/nop_video_decoder.cpp | 2 +- src/zakuro.h | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 8902431..2f117fb 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -32,6 +32,8 @@ - OpenH264 のバージョンを `2.5.0` に上げる - `#include ` を `#include ` に置き換える - `boost::json::error_code` を `boost::system::error_code` に置き換える + - `absl::nullopt` を `std::nullopt` に置き換える + - ZakuroConfig の `sora_data_channel_signaling` と `sora_ignore_disconnect_websocket` の型を `std::optional` に置き換える - @melpon @voluntas @zztkm - [UPDATE] Blend2D, AsmJit を最新版に上げる - @melpon, @torikizi diff --git a/src/nop_video_decoder.cpp b/src/nop_video_decoder.cpp index 22bba84..aaa5f39 100644 --- a/src/nop_video_decoder.cpp +++ b/src/nop_video_decoder.cpp @@ -28,7 +28,7 @@ int32_t NopVideoDecoder::Decode(const webrtc::EncodedImage& input_image, .set_video_frame_buffer(i420_buffer) .set_timestamp_rtp(input_image.RtpTimestamp()) .build(); - callback_->Decoded(decoded_image, absl::nullopt, absl::nullopt); + callback_->Decoded(decoded_image, std::nullopt, std::nullopt); return WEBRTC_VIDEO_CODEC_OK; } diff --git a/src/zakuro.h b/src/zakuro.h index 17a0a6f..2aeed2a 100644 --- a/src/zakuro.h +++ b/src/zakuro.h @@ -67,9 +67,9 @@ struct ZakuroConfig { int sora_spotlight_number = 0; std::string sora_spotlight_focus_rid; std::string sora_spotlight_unfocus_rid; - boost::optional sora_data_channel_signaling; + std::optional sora_data_channel_signaling; int sora_data_channel_signaling_timeout = 180; - boost::optional sora_ignore_disconnect_websocket; + std::optional sora_ignore_disconnect_websocket; int sora_disconnect_wait_timeout = 5; boost::json::value sora_metadata; boost::json::value sora_signaling_notify_metadata;