diff --git a/client/decoder/decoder.cpp b/client/decoder/decoder.cpp index cb588117..162bc9f3 100644 --- a/client/decoder/decoder.cpp +++ b/client/decoder/decoder.cpp @@ -71,14 +71,20 @@ std::shared_ptr wivrn::decoder::make( __builtin_unreachable(); } -std::vector wivrn::decoder::supported_codecs() +static std::vector supported_codecs_() { std::vector res; #ifdef __ANDROID__ - android::decoder::supported_codecs(res); + wivrn::android::decoder::supported_codecs(res); #else - ffmpeg::decoder::supported_codecs(res); + wivrn::ffmpeg::decoder::supported_codecs(res); #endif - res.push_back(video_codec::raw); + res.push_back(wivrn::video_codec::raw); + return res; +} + +const std::vector & wivrn::decoder::supported_codecs() +{ + static std::vector res = supported_codecs_(); return res; } diff --git a/client/decoder/decoder.h b/client/decoder/decoder.h index 081fdbbd..629256fe 100644 --- a/client/decoder/decoder.h +++ b/client/decoder/decoder.h @@ -66,6 +66,6 @@ public: virtual vk::Sampler sampler() = 0; - static std::vector supported_codecs(); + static const std::vector & supported_codecs(); }; } // namespace wivrn diff --git a/client/scenes/lobby.cpp b/client/scenes/lobby.cpp index 327c6f71..44430e7f 100644 --- a/client/scenes/lobby.cpp +++ b/client/scenes/lobby.cpp @@ -1262,8 +1262,6 @@ void scenes::lobby::on_focused() vps, image_cache); - supported_codecs = wivrn::decoder::supported_codecs(); - auto t = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now()); auto tm = std::localtime(&t); switch (tm->tm_mon) diff --git a/client/scenes/lobby.h b/client/scenes/lobby.h index f4abd67b..a8bd1a30 100644 --- a/client/scenes/lobby.h +++ b/client/scenes/lobby.h @@ -132,8 +132,6 @@ class lobby : public scene_impl tab last_current_tab = tab::server_list; int optional_feature_index = 0; // Which step of the first run screen are we in - std::vector supported_codecs; - ImTextureID about_picture; virtual_keyboard keyboard; diff --git a/client/scenes/lobby_gui.cpp b/client/scenes/lobby_gui.cpp index b27fe8fa..e449f469 100644 --- a/client/scenes/lobby_gui.cpp +++ b/client/scenes/lobby_gui.cpp @@ -747,7 +747,7 @@ void scenes::lobby::gui_settings() config.codec = std::nullopt; config.save(); } - for (auto codec: supported_codecs) + for (auto codec: decoder::supported_codecs()) { // don't show raw in GUI if (codec == wivrn::raw)