diff --git a/src/client/videomanager.cpp b/src/client/videomanager.cpp index 91980fb791e4176461cb5a518a17605ad4e15880..69aa47a0bee8079b341c18cd3f526e33c966ed0e 100644 --- a/src/client/videomanager.cpp +++ b/src/client/videomanager.cpp @@ -570,9 +570,9 @@ pausePlayer(const std::string& id, bool pause) } bool -closePlayer(const std::string& id) +closeMediaPlayer(const std::string& id) { - return jami::closePlayer(id); + return jami::closeMediaPlayer(id); } bool @@ -758,7 +758,7 @@ pausePlayer(const std::string& id, bool pause) } bool -closePlayer(const std::string& id) +closeMediaPlayer(const std::string& id) { return Manager::instance().getVideoManager().mediaPlayers.erase(id) > 0; } diff --git a/src/client/videomanager.h b/src/client/videomanager.h index 04210fea817a769d5a1cf01a52b4ed92f13a1b18..34767eefdd408293e66b0ae93494ff3d52dbfd94 100644 --- a/src/client/videomanager.h +++ b/src/client/videomanager.h @@ -57,7 +57,8 @@ public: std::map<std::string, std::weak_ptr<video::VideoInput>, std::less<>> videoInputs; std::mutex audioMutex; bool hasRunningPlayers(); - std::shared_ptr<video::VideoInput> getVideoInput(std::string_view id) const { + std::shared_ptr<video::VideoInput> getVideoInput(std::string_view id) const + { auto input = videoInputs.find(id); return input == videoInputs.end() ? nullptr : input->second.lock(); } @@ -65,11 +66,12 @@ public: video::VideoDeviceMonitor& getVideoDeviceMonitor(); std::shared_ptr<AudioInput> getAudioInput(const std::string& id); -std::shared_ptr<video::VideoInput> getVideoInput(const std::string& id, video::VideoInputMode inputMode = video::VideoInputMode::Undefined); +std::shared_ptr<video::VideoInput> getVideoInput( + const std::string& id, video::VideoInputMode inputMode = video::VideoInputMode::Undefined); std::string createMediaPlayer(const std::string& path); std::shared_ptr<MediaPlayer> getMediaPlayer(const std::string& id); bool pausePlayer(const std::string& id, bool pause); -bool closePlayer(const std::string& id); +bool closeMediaPlayer(const std::string& id); bool mutePlayerAudio(const std::string& id, bool mute); bool playerSeekToTime(const std::string& id, int time); int64_t getPlayerPosition(const std::string& id); diff --git a/src/jami/videomanager_interface.h b/src/jami/videomanager_interface.h index 261032e6a12b8c205f1137204fecb9d2440c0dc2..50c4a3c76b4823eef6a719f7d867f20b49f3db2c 100644 --- a/src/jami/videomanager_interface.h +++ b/src/jami/videomanager_interface.h @@ -26,7 +26,7 @@ extern "C" { struct AVFrame; struct AVPacket; -void av_frame_free(AVFrame **frame); +void av_frame_free(AVFrame** frame); } #include "def.h" @@ -154,7 +154,6 @@ private: void setGeometry(int format, int width, int height) noexcept; }; - /* FrameBuffer is a generic video frame container */ struct DRING_PUBLIC FrameBuffer { @@ -165,7 +164,9 @@ struct DRING_PUBLIC FrameBuffer int height {0}; // frame height std::vector<uint8_t> storage; // If set, new frame will be written to this buffer instead - std::unique_ptr<AVFrame, void (*)(AVFrame*)> avframe {nullptr, [](AVFrame* frame) { av_frame_free(&frame); }}; + std::unique_ptr<AVFrame, void (*)(AVFrame*)> avframe {nullptr, [](AVFrame* frame) { + av_frame_free(&frame); + }}; }; struct DRING_PUBLIC SinkTarget @@ -199,7 +200,7 @@ DRING_PUBLIC std::string openVideoInput(const std::string& path); DRING_PUBLIC bool closeVideoInput(const std::string& id); DRING_PUBLIC std::string createMediaPlayer(const std::string& path); -DRING_PUBLIC std::string closeMediaPlayer(const std::string& id); +DRING_PUBLIC bool closeMediaPlayer(const std::string& id); DRING_PUBLIC bool pausePlayer(const std::string& id, bool pause); DRING_PUBLIC bool mutePlayerAudio(const std::string& id, bool mute); DRING_PUBLIC bool playerSeekToTime(const std::string& id, int time); @@ -209,13 +210,13 @@ DRING_PUBLIC void registerSinkTarget(const std::string& sinkId, const SinkTarget DRING_PUBLIC void registerAVSinkTarget(const std::string& sinkId, const AVSinkTarget& target); DRING_PUBLIC std::map<std::string, std::string> getRenderer(const std::string& callId); -DRING_PUBLIC std::string startLocalMediaRecorder(const std::string& videoInputId, const std::string& filepath); +DRING_PUBLIC std::string startLocalMediaRecorder(const std::string& videoInputId, + const std::string& filepath); DRING_PUBLIC void stopLocalRecorder(const std::string& filepath); #if defined(__ANDROID__) || defined(RING_UWP) || (defined(TARGET_OS_IOS) && TARGET_OS_IOS) DRING_PUBLIC void addVideoDevice( - const std::string& node, - const std::vector<std::map<std::string, std::string>>& devInfo = {}); + const std::string& node, const std::vector<std::map<std::string, std::string>>& devInfo = {}); DRING_PUBLIC void removeVideoDevice(const std::string& node); DRING_PUBLIC VideoFrame* getNewFrame(std::string_view id); DRING_PUBLIC void publishFrame(std::string_view id);