jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

videomanager api: add deviceId to stopCapture

Browse Source 
Change-Id: Ie1b88abf5790e2f17251e2c34ed229e34cdc496c
This commit is contained in:
Adrien Béraud
2021-11-17 17:23:21 -05:00
parent f4a57d918d
commit eacbec668d
5 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/jni/jni_interface.i
View File

@ -313,7 +313,7 @@ void init(ConfigurationCallback* confM, Callback* callM, PresenceCallback* presM
exportable_callback<VideoSignal::SetBitrate>(bind(&VideoCallback::setBitrate, videoM, _1, _2)),
exportable_callback<VideoSignal::RequestKeyFrame>(bind(&VideoCallback::requestKeyFrame, videoM)),
exportable_callback<VideoSignal::StartCapture>(bind(&VideoCallback::startCapture, videoM, _1)),
exportable_callback<VideoSignal::StopCapture>(bind(&VideoCallback::stopCapture, videoM)),
exportable_callback<VideoSignal::StopCapture>(bind(&VideoCallback::stopCapture, videoM, _1)),
exportable_callback<VideoSignal::DecodingStarted>(bind(&VideoCallback::decodingStarted, videoM, _1, _2, _3, _4, _5)),
exportable_callback<VideoSignal::DecodingStopped>(bind(&VideoCallback::decodingStopped, videoM, _1, _2, _3)),
};

4
bin/jni/videomanager.i
View File

@ -47,7 +47,7 @@ public:
virtual void setBitrate(const std::string&, const int bitrate) {}
virtual void requestKeyFrame(){}
virtual void startCapture(const std::string& camid) {}
virtual void stopCapture() {}
virtual void stopCapture(const std::string& camid) {}
virtual void decodingStarted(const std::string& id, const std::string& shm_path, int w, int h, bool is_mixer) {}
virtual void decodingStopped(const std::string& id, const std::string& shm_path, bool is_mixer) {}
};
@ -445,7 +445,7 @@ public:
virtual void setBitrate(const std::string&, const int bitrate) {}
virtual void requestKeyFrame(){}
virtual void startCapture(const std::string& camid) {}
virtual void stopCapture() {}
virtual void stopCapture(const std::string& camid) {}
virtual void decodingStarted(const std::string& id, const std::string& shm_path, int w, int h, bool is_mixer) {}
virtual void decodingStopped(const std::string& id, const std::string& shm_path, bool is_mixer) {}
};

4
bin/nodejs/videomanager.i
View File

@ -33,7 +33,7 @@ public:
virtual void getCameraInfo(const std::string& device, std::vector<int> *formats, std::vector<unsigned> *sizes, std::vector<unsigned> *rates) {}
virtual void setParameters(const std::string, const int format, const int width, const int height, const int rate) {}
virtual void startCapture(const std::string& camid) {}
virtual void stopCapture() {}
virtual void stopCapture(const std::string& camid) {}
virtual void decodingStarted(const std::string& id, const std::string& shm_path, int w, int h, bool is_mixer) {}
virtual void decodingStopped(const std::string& id, const std::string& shm_path, bool is_mixer) {}
};
@ -65,7 +65,7 @@ public:
virtual void getCameraInfo(const std::string& device, std::vector<int> *formats, std::vector<unsigned> *sizes, std::vector<unsigned> *rates){}
virtual void setParameters(const std::string, const int format, const int width, const int height, const int rate) {}
virtual void startCapture(const std::string& camid) {}
virtual void stopCapture() {}
virtual void stopCapture(const std::string& camid) {}
virtual void decodingStarted(const std::string& id, const std::string& shm_path, int w, int h, bool is_mixer) {}
virtual void decodingStopped(const std::string& id, const std::string& shm_path, bool is_mixer) {}
};

2
src/jami/videomanager_interface.h
View File

@ -298,7 +298,7 @@ struct DRING_PUBLIC VideoSignal
struct DRING_PUBLIC StopCapture
{
constexpr static const char* name = "StopCapture";
using cb_type = void(void);
using cb_type = void(const std::string& /*device*/);
};
struct DRING_PUBLIC DeviceAdded
{

3
src/media/video/video_input.cpp
View File

@ -83,7 +83,7 @@ VideoInput::~VideoInput()
{
isStopped_ = true;
if (videoManagedByClient()) {
emitSignal<DRing::VideoSignal::StopCapture>();
emitSignal<DRing::VideoSignal::StopCapture>(decOpts_.input);
capturing_ = false;
return;
}
@ -111,7 +111,6 @@ VideoInput::switchDevice()
return;
}
emitSignal<DRing::VideoSignal::StopCapture>();
emitSignal<DRing::VideoSignal::StartCapture>(decOpts_.input);
capturing_ = true;
}