StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

fix(audio): connect the correct audio callbacks

Browse Source
This commit is contained in:
sudden6 2018-07-01 10:39:33 +02:00
parent 67f2605971
commit a00af08777
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
3 changed files with 47 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/core/toxcall.cpp
View File

@ -28,39 +28,10 @@
* @brief Keeps sources for users in group calls.
*/
ToxCall::ToxCall(uint32_t CallId, bool VideoEnabled, CoreAV& av)
ToxCall::ToxCall(bool VideoEnabled, CoreAV& av)
: av{&av}
, videoEnabled{VideoEnabled}
{
Audio& audio = Audio::getInstance();
audio.subscribeInput();
audioInConn = QObject::connect(&Audio::getInstance(), &Audio::frameAvailable,
[&av, CallId](const int16_t* pcm, size_t samples, uint8_t chans,
uint32_t rate) {
av.sendCallAudio(CallId, pcm, samples, chans, rate);
});
if (!audioInConn) {
qDebug() << "Audio connection not working";
}
if (videoEnabled) {
videoSource = new CoreVideoSource();
CameraSource& source = CameraSource::getInstance();
if (source.isNone()) {
source.setupDefault();
}
source.subscribe();
videoInConn = QObject::connect(&source, &VideoSource::frameAvailable,
[&av, CallId](std::shared_ptr<VideoFrame> frame) {
av.sendCallVideo(CallId, frame);
});
if (!videoInConn) {
qDebug() << "Video connection not working";
}
}
}
/**
@ -194,10 +165,40 @@ void ToxFriendCall::setAlSource(const quint32& value)
}
ToxFriendCall::ToxFriendCall(uint32_t FriendNum, bool VideoEnabled, CoreAV& av)
: ToxCall(FriendNum, VideoEnabled, av)
: ToxCall(VideoEnabled, av)
{
// register audio
Audio& audio = Audio::getInstance();
audio.subscribeInput();
audioInConn = QObject::connect(&Audio::getInstance(), &Audio::frameAvailable,
[&av, FriendNum](const int16_t* pcm, size_t samples, uint8_t chans,
uint32_t rate) {
av.sendCallAudio(FriendNum, pcm, samples, chans, rate);
});
if (!audioInConn) {
qDebug() << "Audio input connection not working";
}
audio.subscribeOutput(alSource);
// register video
if (videoEnabled) {
videoSource = new CoreVideoSource();
CameraSource& source = CameraSource::getInstance();
if (source.isNone()) {
source.setupDefault();
}
source.subscribe();
videoInConn = QObject::connect(&source, &VideoSource::frameAvailable,
[&av, FriendNum](std::shared_ptr<VideoFrame> frame) {
av.sendCallVideo(FriendNum, frame);
});
if (!videoInConn) {
qDebug() << "Video connection not working";
}
}
}
ToxFriendCall::ToxFriendCall(ToxFriendCall &&other) noexcept
@ -256,8 +257,20 @@ void ToxFriendCall::setState(const TOXAV_FRIEND_CALL_STATE& value)
}
ToxGroupCall::ToxGroupCall(int GroupNum, CoreAV& av)
: ToxCall(static_cast<uint32_t>(GroupNum), false, av)
: ToxCall(false, av)
{
// register audio
Audio& audio = Audio::getInstance();
audio.subscribeInput();
audioInConn = QObject::connect(&Audio::getInstance(), &Audio::frameAvailable,
[&av, GroupNum](const int16_t* pcm, size_t samples, uint8_t chans,
uint32_t rate) {
av.sendGroupCallAudio(GroupNum, pcm, samples, chans, rate);
});
if (!audioInConn) {
qDebug() << "Audio input connection not working";
}
}
ToxGroupCall::ToxGroupCall(ToxGroupCall&& other) noexcept

2
src/core/toxcall.h
View File

@ -18,7 +18,7 @@ class ToxCall
{
protected:
ToxCall() = delete;
ToxCall(uint32_t CallId, bool VideoEnabled, CoreAV& av);
ToxCall(bool VideoEnabled, CoreAV& av);
~ToxCall();
public:

2
src/video/corevideosource.h
View File

@ -50,7 +50,7 @@ private:
std::atomic_bool stopped;
friend class CoreAV;
friend class ToxCall;
friend class ToxFriendCall;
};
#endif // COREVIDEOSOURCE_H