diff --git a/client/decoder/decoder.cpp b/client/decoder/decoder.cpp index 4c1765d0..9b673380 100644 --- a/client/decoder/decoder.cpp +++ b/client/decoder/decoder.cpp @@ -71,22 +71,53 @@ std::shared_ptr wivrn::decoder::make( __builtin_unreachable(); } -static std::vector supported_codecs_() +static std::vector supported_codecs_() { - std::vector res; + std::vector codecs; #ifdef __ANDROID__ - wivrn::android::decoder::supported_codecs(res); + wivrn::android::decoder::supported_codecs(codecs); #elif WIVRN_USE_V4L2 - wivrn::v4l2::decoder::supported_codecs(res); + wivrn::v4l2::decoder::supported_codecs(codecs); #else - wivrn::ffmpeg::decoder::supported_codecs(res); + wivrn::ffmpeg::decoder::supported_codecs(codecs); #endif - res.push_back(wivrn::video_codec::raw); + codecs.push_back(wivrn::video_codec::raw); + + std::vector res; + res.reserve(codecs.size()); + for (auto codec: codecs) + res.push_back({.codec = codec, .supports_10bit = wivrn::decoder::supports_10bit(codec)}); return res; } -const std::vector & wivrn::decoder::supported_codecs() +const std::vector & wivrn::decoder::supported_codecs() { - static std::vector res = supported_codecs_(); + static std::vector res = supported_codecs_(); return res; } + +bool wivrn::decoder::supports_10bit(wivrn::video_codec codec) +{ +#ifdef __ANDROID__ + return codec == wivrn::video_codec::h265 or codec == wivrn::video_codec::av1; +#elif WIVRN_USE_V4L2 + switch (codec) + { + case wivrn::video_codec::h265: { + static const bool supported = wivrn::v4l2::decoder::supports_10bit(codec); + return supported; + } + case wivrn::video_codec::av1: { + static const bool supported = wivrn::v4l2::decoder::supports_10bit(codec); + return supported; + } + case wivrn::video_codec::h264: + case wivrn::video_codec::raw: + return false; + } + __builtin_unreachable(); +#else + // ffmpeg + return codec == wivrn::video_codec::h265 or codec == wivrn::video_codec::av1; +#endif +} diff --git a/client/decoder/decoder.h b/client/decoder/decoder.h index 83f08aa7..0d0b35c8 100644 --- a/client/decoder/decoder.h +++ b/client/decoder/decoder.h @@ -73,6 +73,7 @@ public: virtual vk::Sampler sampler() = 0; - static const std::vector & supported_codecs(); + static const std::vector & supported_codecs(); + static bool supports_10bit(wivrn::video_codec codec); }; } // namespace wivrn diff --git a/client/decoder/v4l2/v4l2_decoder.cpp b/client/decoder/v4l2/v4l2_decoder.cpp index dce8e3b9..278d431a 100644 --- a/client/decoder/v4l2/v4l2_decoder.cpp +++ b/client/decoder/v4l2/v4l2_decoder.cpp @@ -88,13 +88,13 @@ bool is_iris_decoder(int fd) (capabilities & V4L2_CAP_VIDEO_M2M_MPLANE) && (capabilities & V4L2_CAP_STREAMING); } -bool supports_format(int fd, uint32_t pixel_format) +bool supports_format(int fd, v4l2_buf_type type, uint32_t pixel_format) { for (uint32_t index = 0;; ++index) { v4l2_fmtdesc fmt{}; fmt.index = index; - fmt.type = output_type; + fmt.type = type; if (xioctl(fd, VIDIOC_ENUM_FMT, &fmt) < 0) return false; if (fmt.pixelformat == pixel_format) @@ -118,7 +118,7 @@ wivrn::fd_base find_device(wivrn::video_codec codec) const bool suitable = is_iris_decoder(probe_fd) && - supports_format(probe_fd, pixel_format); + supports_format(probe_fd, output_type, pixel_format); close(probe_fd); @@ -1028,6 +1028,19 @@ bool decoder::available_for(wivrn::video_codec codec) return true; } +bool decoder::supports_10bit(wivrn::video_codec codec) +{ + try + { + auto device = find_device(codec); + return supports_format(device.get_fd(), capture_type, V4L2_PIX_FMT_P010); + } + catch (...) + { + return false; + } +} + void decoder::supported_codecs(std::vector & result) { if (available_for(wivrn::video_codec::h265)) diff --git a/client/decoder/v4l2/v4l2_decoder.h b/client/decoder/v4l2/v4l2_decoder.h index f9aaf8f6..e02eabc9 100644 --- a/client/decoder/v4l2/v4l2_decoder.h +++ b/client/decoder/v4l2/v4l2_decoder.h @@ -177,6 +177,7 @@ public: } static bool available_for(wivrn::video_codec codec); + static bool supports_10bit(wivrn::video_codec codec); static void supported_codecs(std::vector & result); }; } // namespace wivrn::v4l2 diff --git a/client/scenes/gui_settings.cpp b/client/scenes/gui_settings.cpp index 377fe3d4..0d377e2f 100644 --- a/client/scenes/gui_settings.cpp +++ b/client/scenes/gui_settings.cpp @@ -345,9 +345,9 @@ void settings_streaming(const settings_context & ctx) }; std::vector codecs; - for (auto c: wivrn::decoder::supported_codecs()) - if (c != wivrn::raw) - codecs.push_back(c); + for (auto capability: wivrn::decoder::supported_codecs()) + if (capability.codec != wivrn::raw) + codecs.push_back(capability.codec); list.push_back({ .id = "##codec", @@ -370,7 +370,7 @@ void settings_streaming(const settings_context & ctx) .disabled_tooltip = disconnect_tip, }); - if (config.codec == wivrn::h265 or config.codec == wivrn::av1) + if (config.codec && wivrn::decoder::supports_10bit(*config.codec)) { list.push_back({ .id = "##ten_bit", diff --git a/client/scenes/stream.cpp b/client/scenes/stream.cpp index 9207ef48..1fe81885 100644 --- a/client/scenes/stream.cpp +++ b/client/scenes/stream.cpp @@ -343,7 +343,8 @@ std::shared_ptr scenes::stream::create(std::unique_ptr scenes::stream::create(std::unique_ptr supported_codecs; // from preferred to least preferred - std::optional bit_depth; + std::vector supported_codecs; // from preferred to least preferred + std::optional bit_depth; // explicit preference std::string system_name; // Used for the application list diff --git a/server/encoder/encoder_settings.cpp b/server/encoder/encoder_settings.cpp index f330d7d8..f54cd60a 100644 --- a/server/encoder/encoder_settings.cpp +++ b/server/encoder/encoder_settings.cpp @@ -223,10 +223,22 @@ public: if (config.codec == video_codec::raw or config.name == encoder_raw) return {encoder_raw, video_codec::raw}; + std::vector codecs; + if (config.codec) + { + codecs.push_back(*config.codec); + } + else + { + codecs.reserve(info.supported_codecs.size()); + for (const auto & capability: info.supported_codecs) + codecs.push_back(capability.codec); + } + #if WIVRN_USE_VULKAN_ENCODE if (config.name.empty() or config.name == encoder_vulkan) { - for (auto codec: config.codec ? std::vector{*config.codec} : info.supported_codecs) + for (auto codec: codecs) { if (has_vk(codec)) return {encoder_vulkan, codec}; @@ -237,7 +249,7 @@ public: #if WIVRN_USE_NVENC if ((nvidia and config.name.empty()) or config.name == encoder_nvenc) { - for (auto codec: config.codec ? std::vector{*config.codec} : info.supported_codecs) + for (auto codec: codecs) { if (check_nvenc(codec)) return {encoder_nvenc, codec}; @@ -248,7 +260,7 @@ public: #if WIVRN_USE_VAAPI if (config.name.empty() or config.name == encoder_vaapi) { - for (auto codec: config.codec ? std::vector{*config.codec} : info.supported_codecs) + for (auto codec: codecs) { if (check_vaapi(codec)) return {encoder_vaapi, codec}; @@ -309,11 +321,20 @@ std::array get_encoder_settings(wivrn::vk_bundle & bundle, if (bit_depth and bit_depth != 8 and bit_depth != 10) throw std::runtime_error("invalid bit-depth setting. supported values: 8, 10"); - if (std::ranges::contains(res, video_codec::h264, &encoder_settings::codec) or - std::ranges::contains(res, video_codec::raw, &encoder_settings::codec)) + const bool all_encoders_10bit = std::ranges::all_of(res, [&](const encoder_settings & encoder) { + auto it = std::ranges::find(info.supported_codecs, encoder.codec, &video_codec_capability::codec); + return it != info.supported_codecs.end() and it->supports_10bit; + }); + + if (bit_depth == 10 and not all_encoders_10bit) + { + U_LOG_I("Using 8-bit encoding due to mixed encoder support."); bit_depth = 8; + } else if (not bit_depth) - bit_depth = 10; + { + bit_depth = all_encoders_10bit ? 10 : 8; + } auto check_format = [&](vk::Format format) { try diff --git a/server/main.cpp b/server/main.cpp index de864af1..af2f457d 100644 --- a/server/main.cpp +++ b/server/main.cpp @@ -815,9 +815,9 @@ void on_headset_info_packet(const wivrn::from_headset::headset_info_packet & inf {h264, "h264"}, {h265, "h265"}, {av1, "av1"}}; - for (video_codec codec: info.supported_codecs) + for (const auto & capability: info.supported_codecs) { - auto it = codec_names.find(codec); + auto it = codec_names.find(capability.codec); if (it != codec_names.end()) codecs.push_back(it->second); }