diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 51610e7a..483c09ee 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -114,7 +114,6 @@ else() file(GLOB CLIENT_V4L2_SOURCE CONFIGURE_DEPENDS "decoder/v4l2/*.cpp") list(APPEND PLATFORM_SOURCE ${CLIENT_V4L2_SOURCE}) - target_compile_definitions(wivrn PRIVATE WIVRN_USE_V4L2) else() target_link_libraries(wivrn PkgConfig::LIBAV_CLIENT) file(GLOB PLATFORM_SOURCE CONFIGURE_DEPENDS diff --git a/client/application.cpp b/client/application.cpp index 6a028e33..2b374c25 100644 --- a/client/application.cpp +++ b/client/application.cpp @@ -900,7 +900,7 @@ void application::initialize_vulkan() optional_device_extensions.emplace(VK_KHR_TIMELINE_SEMAPHORE_EXTENSION_NAME); optional_device_extensions.emplace(VK_EXT_FRAGMENT_DENSITY_MAP_EXTENSION_NAME); -#ifdef WIVRN_USE_V4L2 +#if WIVRN_USE_V4L2 // V4L2 decoders expose their output through DMA-buf optional_device_extensions.emplace(VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME); optional_device_extensions.emplace(VK_EXT_EXTERNAL_MEMORY_DMA_BUF_EXTENSION_NAME); diff --git a/client/decoder/decoder.cpp b/client/decoder/decoder.cpp index 12943258..4c1765d0 100644 --- a/client/decoder/decoder.cpp +++ b/client/decoder/decoder.cpp @@ -20,13 +20,11 @@ #ifdef __ANDROID__ #include "decoder/android/android_decoder.h" -#else -#ifdef WIVRN_USE_V4L2 +#elif WIVRN_USE_V4L2 #include "decoder/v4l2/v4l2_decoder.h" #else #include "decoder/ffmpeg/ffmpeg_decoder.h" #endif -#endif #include "decoder/raw_decoder.h" wivrn::decoder::~decoder() = default; @@ -53,7 +51,7 @@ std::shared_ptr wivrn::decoder::make( stream_index, scene, acc); -#elifdef WIVRN_USE_V4L2 +#elif WIVRN_USE_V4L2 return std::make_shared( device, phys_dev, vk_queue_family_index, description, stream_index, scene, acc); #else @@ -78,7 +76,7 @@ static std::vector supported_codecs_() std::vector res; #ifdef __ANDROID__ wivrn::android::decoder::supported_codecs(res); -#elifdef WIVRN_USE_V4L2 +#elif WIVRN_USE_V4L2 wivrn::v4l2::decoder::supported_codecs(res); #else wivrn::ffmpeg::decoder::supported_codecs(res); diff --git a/client/decoder/decoder.h b/client/decoder/decoder.h index 93c955a1..83f08aa7 100644 --- a/client/decoder/decoder.h +++ b/client/decoder/decoder.h @@ -20,6 +20,8 @@ #include "wivrn_packets.h" +#include "wivrn_config.h" + #include #include #include @@ -46,7 +48,7 @@ public: vk::ImageLayout & current_layout; vk::Semaphore semaphore = nullptr; uint64_t * semaphore_val = nullptr; -#ifdef WIVRN_USE_V4L2 +#if WIVRN_USE_V4L2 // DMA-buf images from V4L2 require queue-family ownership // transfers between Vulkan and external engine uint32_t foreign_queue_family = vk::QueueFamilyIgnored; diff --git a/client/scenes/stream.cpp b/client/scenes/stream.cpp index e3b11ed1..7cd3bcfd 100644 --- a/client/scenes/stream.cpp +++ b/client/scenes/stream.cpp @@ -945,7 +945,7 @@ void scenes::stream::render(const XrFrameState & frame_state) use_alpha = blit_handle->view_info.alpha; -#ifdef WIVRN_USE_V4L2 +#if WIVRN_USE_V4L2 if (blit_handle->foreign_queue_family != vk::QueueFamilyIgnored) { // decoder completed its write before handing us this image @@ -1105,7 +1105,7 @@ void scenes::stream::render(const XrFrameState & frame_state) {bias, bias, bias, 0.}, image_index); -#ifdef WIVRN_USE_V4L2 +#if WIVRN_USE_V4L2 // the blit handles keep CAPTURE buffers alive until this cmd buffer's fence has completed inplace_vector foreign_release_barriers; for (const auto & handle: current_blit_handles) diff --git a/common/wivrn_config.h.in b/common/wivrn_config.h.in index cf5ffa2b..2d7548b0 100644 --- a/common/wivrn_config.h.in +++ b/common/wivrn_config.h.in @@ -32,6 +32,7 @@ static const int64_t max_extrapolation_ns = 80'000'000; #cmakedefine01 WIVRN_USE_VAAPI #cmakedefine01 WIVRN_USE_VULKAN_ENCODE #cmakedefine01 WIVRN_USE_X264 +#cmakedefine01 WIVRN_USE_V4L2 #cmakedefine01 WIVRN_USE_PIPEWIRE