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

autoadapt: add signal to set bitrate dynamically for MediaCodec

Browse Source 
Change-Id: Iba619f891d0412ca4abe4e03e4b2a11d5a3b2488
This commit is contained in:
Pierre Lespagnol
2019-11-05 14:48:29 -05:00
committed by Adrien Béraud
parent f65a652948
commit e5c191fa3d
7 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bin/jni/jni_interface.i
View File

@ -286,6 +286,7 @@ void init(ConfigurationCallback* confM, Callback* callM, PresenceCallback* presM
const std::map<std::string, SharedCallback> videoEvHandlers = {
exportable_callback<VideoSignal::GetCameraInfo>(bind(&VideoCallback::getCameraInfo, videoM, _1, _2, _3, _4)),
exportable_callback<VideoSignal::SetParameters>(bind(&VideoCallback::setParameters, videoM, _1, _2, _3, _4, _5)),
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)),

6
bin/jni/videomanager.i
View File

@ -43,7 +43,8 @@ class VideoCallback {
public:
virtual ~VideoCallback(){}
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 setParameters(const std::string&, const int format, const int width, const int height, const int rate) {}
virtual void setBitrate(const std::string&, const int bitrate) {}
virtual void requestKeyFrame(){}
virtual void startCapture(const std::string& camid) {}
virtual void stopCapture() {}
@ -421,7 +422,8 @@ class VideoCallback {
public:
virtual ~VideoCallback(){}
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 setParameters(const std::string&, const int format, const int width, const int height, const int rate) {}
virtual void setBitrate(const std::string&, const int bitrate) {}
virtual void requestKeyFrame(){}
virtual void startCapture(const std::string& camid) {}
virtual void stopCapture() {}

1
src/client/ring_signal.cpp
View File

@ -110,6 +110,7 @@ getSignalHandlers()
exported_callback<DRing::VideoSignal::GetCameraInfo>(),
exported_callback<DRing::VideoSignal::SetParameters>(),
exported_callback<DRing::VideoSignal::RequestKeyFrame>(),
exported_callback<DRing::VideoSignal::SetBitrate>(),
#endif
exported_callback<DRing::VideoSignal::StartCapture>(),
exported_callback<DRing::VideoSignal::StopCapture>(),

4
src/dring/videomanager_interface.h
View File

@ -224,6 +224,10 @@ struct DRING_PUBLIC VideoSignal {
constexpr static const char* name = "RequestKeyFrame";
using cb_type = void();
};
struct DRING_PUBLIC SetBitrate {
constexpr static const char* name = "SetBitrate";
using cb_type = void(const std::string& device, const int bitrate);
};
#endif
struct DRING_PUBLIC StartCapture {
constexpr static const char* name = "StartCapture";

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

@ -482,7 +482,8 @@ VideoInput::switchInput(const std::string& resource)
return futureDecOpts_;
}
DeviceParams VideoInput::getParams() const
const DeviceParams&
VideoInput::getParams() const
{ return decOpts_; }
MediaStream

2
src/media/video/video_input.h
View File

@ -67,7 +67,7 @@ public:
int getWidth() const;
int getHeight() const;
AVPixelFormat getPixelFormat() const;
DeviceParams getParams() const;
const DeviceParams& getParams() const;
MediaStream getInfo() const;
std::shared_future<DeviceParams> switchInput(const std::string& resource);

5
src/media/video/video_rtp_session.cpp
View File

@ -447,6 +447,11 @@ VideoRtpSession::adaptQualityAndBitrate()
if(oldBitrate != videoBitrateInfo_.videoBitrateCurrent) {
storeVideoBitrateInfo();
#if __ANDROID__
auto input_device = std::static_pointer_cast<VideoInput>(videoLocal_);
emitSignal<DRing::VideoSignal::SetBitrate>(input_device->getParams().name, (int)videoBitrateInfo_.videoBitrateCurrent);
#endif
// If encoder no longer exist do nothing
if(sender_ && sender_->setBitrate(videoBitrateInfo_.videoBitrateCurrent) == 0)
lastMediaRestart_ = now;