From b254fbd926d32d06e84bedd085f82c805be7fe3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Cerveau?= Date: Tue, 1 Apr 2025 13:00:31 +0200 Subject: [PATCH] DecoderConfig: enable stream demuxing by default By default, if FFmpeg is present, the stream demuxer should be enabled. --- common/libs/VkCodecUtils/DecoderConfig.h | 7 +------ vk_video_decoder/demos/vk-video-dec/Main.cpp | 4 ++-- vk_video_decoder/test/vulkan-video-dec/Main.cpp | 4 ++-- vk_video_decoder/test/vulkan-video-simple-dec/Main.cpp | 2 +- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/common/libs/VkCodecUtils/DecoderConfig.h b/common/libs/VkCodecUtils/DecoderConfig.h index 1f863281..0f9819b7 100644 --- a/common/libs/VkCodecUtils/DecoderConfig.h +++ b/common/libs/VkCodecUtils/DecoderConfig.h @@ -69,7 +69,7 @@ struct DecoderConfig { forceParserType = VK_VIDEO_CODEC_OPERATION_NONE_KHR; decoderQueueSize = 5; enablePostProcessFilter = -1, - enableStreamDemuxing = false; + enableStreamDemuxing = true; deviceId = (uint32_t)-1; directMode = false; enableHwLoadBalancing = false; @@ -111,11 +111,6 @@ struct DecoderConfig { exit(EXIT_SUCCESS); return rtn; }}, - {"--enableStrDemux", nullptr, 0, "Enable stream demuxing", - [this](const char **, const ProgramArgs &a) { - enableStreamDemuxing = true; - return true; - }}, {"--disableStrDemux", nullptr, 0, "Disable stream demuxing", [this](const char **, const ProgramArgs &a) { enableStreamDemuxing = false; diff --git a/vk_video_decoder/demos/vk-video-dec/Main.cpp b/vk_video_decoder/demos/vk-video-dec/Main.cpp index 056d9309..8579362e 100644 --- a/vk_video_decoder/demos/vk-video-dec/Main.cpp +++ b/vk_video_decoder/demos/vk-video-dec/Main.cpp @@ -129,7 +129,7 @@ int main(int argc, const char **argv) { VkSharedBaseObj videoStreamDemuxer; result = VideoStreamDemuxer::Create(decoderConfig.videoFileName.c_str(), decoderConfig.forceParserType, - (decoderConfig.enableStreamDemuxing == 1), + decoderConfig.enableStreamDemuxing, decoderConfig.initialWidth, decoderConfig.initialHeight, decoderConfig.initialBitdepth, @@ -207,7 +207,7 @@ int main(int argc, const char **argv) { VkSharedBaseObj videoStreamDemuxer; result = VideoStreamDemuxer::Create(decoderConfig.videoFileName.c_str(), decoderConfig.forceParserType, - (decoderConfig.enableStreamDemuxing == 1), + decoderConfig.enableStreamDemuxing, decoderConfig.initialWidth, decoderConfig.initialHeight, decoderConfig.initialBitdepth, diff --git a/vk_video_decoder/test/vulkan-video-dec/Main.cpp b/vk_video_decoder/test/vulkan-video-dec/Main.cpp index 365cf827..2c5d4d0a 100644 --- a/vk_video_decoder/test/vulkan-video-dec/Main.cpp +++ b/vk_video_decoder/test/vulkan-video-dec/Main.cpp @@ -141,7 +141,7 @@ int main(int argc, const char** argv) VkSharedBaseObj videoStreamDemuxer; result = VideoStreamDemuxer::Create(decoderConfig.videoFileName.c_str(), decoderConfig.forceParserType, - (decoderConfig.enableStreamDemuxing == 1), + decoderConfig.enableStreamDemuxing, decoderConfig.initialWidth, decoderConfig.initialHeight, decoderConfig.initialBitdepth, @@ -222,7 +222,7 @@ int main(int argc, const char** argv) VkSharedBaseObj videoStreamDemuxer; result = VideoStreamDemuxer::Create(decoderConfig.videoFileName.c_str(), decoderConfig.forceParserType, - (decoderConfig.enableStreamDemuxing == 1), + decoderConfig.enableStreamDemuxing, decoderConfig.initialWidth, decoderConfig.initialHeight, decoderConfig.initialBitdepth, diff --git a/vk_video_decoder/test/vulkan-video-simple-dec/Main.cpp b/vk_video_decoder/test/vulkan-video-simple-dec/Main.cpp index 80e6a378..3e446832 100644 --- a/vk_video_decoder/test/vulkan-video-simple-dec/Main.cpp +++ b/vk_video_decoder/test/vulkan-video-simple-dec/Main.cpp @@ -124,7 +124,7 @@ int main(int argc, const char** argv) VkSharedBaseObj videoStreamDemuxer; VkResult result = VideoStreamDemuxer::Create(decoderConfig.videoFileName.c_str(), decoderConfig.forceParserType, - (decoderConfig.enableStreamDemuxing == 1), + decoderConfig.enableStreamDemuxing, decoderConfig.initialWidth, decoderConfig.initialHeight, decoderConfig.initialBitdepth,