diff --git a/client/decoder/android/android_decoder.cpp b/client/decoder/android/android_decoder.cpp index f979c133..5c9067fe 100644 --- a/client/decoder/android/android_decoder.cpp +++ b/client/decoder/android/android_decoder.cpp @@ -413,6 +413,7 @@ decoder::decoder( VkPhysicalDevice physical_device, const xrt::drivers::wivrn::to_headset::video_stream_description::item & description, float fps, + uint8_t stream_index, std::weak_ptr weak_scene, shard_accumulator * accumulator) : description(description), fps(fps), device(device), weak_scene(weak_scene), accumulator(accumulator) @@ -451,6 +452,7 @@ decoder::decoder( } } }); + pthread_setname_np(output_releaser.native_handle(), ("decoder-" + std::to_string(stream_index)).c_str()); } decoder::~decoder() diff --git a/client/decoder/android/android_decoder.h b/client/decoder/android/android_decoder.h index cdec84ec..374c1e27 100644 --- a/client/decoder/android/android_decoder.h +++ b/client/decoder/android/android_decoder.h @@ -133,7 +133,8 @@ public: VkDevice device, VkPhysicalDevice physical_device, const xrt::drivers::wivrn::to_headset::video_stream_description::item & description, - float fps, + float fps, + uint8_t stream_index, std::weak_ptr scene, shard_accumulator * accumulator); diff --git a/client/decoder/ffmpeg/ffmpeg_decoder.cpp b/client/decoder/ffmpeg/ffmpeg_decoder.cpp index 1ee87b3d..787ae5f7 100644 --- a/client/decoder/ffmpeg/ffmpeg_decoder.cpp +++ b/client/decoder/ffmpeg/ffmpeg_decoder.cpp @@ -73,6 +73,7 @@ decoder::decoder( VkPhysicalDevice physical_device, const xrt::drivers::wivrn::to_headset::video_stream_description::item & description, float fps, + uint8_t stream_index, std::weak_ptr scene, shard_accumulator * accumulator) : device(device), description(description), codec(nullptr, free_codec_context), sws(nullptr, sws_freeContext), weak_scene(scene), accumulator(accumulator) diff --git a/client/decoder/ffmpeg/ffmpeg_decoder.h b/client/decoder/ffmpeg/ffmpeg_decoder.h index 223f832d..1a91f6a3 100644 --- a/client/decoder/ffmpeg/ffmpeg_decoder.h +++ b/client/decoder/ffmpeg/ffmpeg_decoder.h @@ -88,7 +88,8 @@ public: VkDevice device, VkPhysicalDevice physical_device, const xrt::drivers::wivrn::to_headset::video_stream_description::item & description, - float fps, + float fps, + uint8_t stream_index, std::weak_ptr scene, shard_accumulator * accumulator); diff --git a/client/decoder/shard_accumulator.h b/client/decoder/shard_accumulator.h index 5de3d663..6400bf82 100644 --- a/client/decoder/shard_accumulator.h +++ b/client/decoder/shard_accumulator.h @@ -82,10 +82,10 @@ public: VkDevice device, VkPhysicalDevice physical_device, const xrt::drivers::wivrn::to_headset::video_stream_description::item & description, - float fps, + float fps, std::weak_ptr scene, uint8_t stream_index) : - decoder(std::make_shared(device, physical_device, description, fps, scene, this)), + decoder(std::make_shared(device, physical_device, description, fps, stream_index, scene, this)), current(stream_index), next(stream_index), weak_scene(scene)