mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-27 16:59:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix/audio_crash_initialization'

Browse source
This commit is contained in:
Julien Wadel 2020-03-27 10:35:49 +01:00
commit b22c1c3f99
2 changed files with 38 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
linphone-app/src/utils/MediastreamerUtils.cpp
View file

@ -25,6 +25,8 @@
#include "components/core/CoreManager.hpp"
#include "MediastreamerUtils.hpp"
#include <qlogging.h>
using namespace MediastreamerUtils;
SimpleCaptureGraph::SimpleCaptureGraph(const std::string &capture, const std::string &playback)
@ -34,9 +36,14 @@ SimpleCaptureGraph::SimpleCaptureGraph(const std::string &capture, const std::st
msFactory = linphone_core_get_ms_factory(ccore);
playbackCard = ms_snd_card_manager_get_card(ms_factory_get_snd_card_manager(msFactory), playbackCardId.c_str());
if (!playbackCard)
qWarning("Cannot get playback card from MSFactory with : %s", playbackCardId.c_str());
captureCard = ms_snd_card_manager_get_card(ms_factory_get_snd_card_manager(msFactory), captureCardId.c_str());
if (!captureCard)
qWarning("Cannot get capture card from MSFactory with : %s", captureCardId.c_str());
init();
if(playbackCard && captureCard)// Assure to initialize when playback and capture are available
init();
}
SimpleCaptureGraph::~SimpleCaptureGraph()
@ -64,20 +71,22 @@ void SimpleCaptureGraph::init() {
//Mute playback
float muteGain = 0.0f;
ms_filter_call_method(playbackVolumeFilter, static_cast<unsigned int>(MS_VOLUME_SET_GAIN), &muteGain);
ms_filter_call_method(playbackVolumeFilter, static_cast<unsigned int>(MS_VOLUME_SET_GAIN), &muteGain);
ticker = ms_ticker_new();
running = false;
}
void SimpleCaptureGraph::start() {
if (!running) {
ms_ticker_attach(ticker, audioCapture);
if (!running && audioCapture) {
running = true;
ms_ticker_attach(ticker, audioCapture);
}
}
void SimpleCaptureGraph::stop() {
if (running) {
if (running && audioCapture){
ms_ticker_detach(ticker, audioCapture);
running = false;
}
@ -87,14 +96,29 @@ void SimpleCaptureGraph::destroy() {
if (running) {
stop();
}
ms_ticker_destroy(ticker);
ms_filter_unlink(playbackVolumeFilter, 0, audioSink, 0);
ms_filter_unlink(captureVolumeFilter, 0, playbackVolumeFilter, 0);
ms_filter_unlink(audioCapture, 0, captureVolumeFilter, 0);
ms_filter_destroy(playbackVolumeFilter);
ms_filter_destroy(captureVolumeFilter);
ms_filter_destroy(audioSink);
ms_filter_destroy(audioCapture);
if (audioSink)
ms_filter_unlink(playbackVolumeFilter, 0, audioSink, 0);
if (captureVolumeFilter && playbackVolumeFilter)
ms_filter_unlink(captureVolumeFilter, 0, playbackVolumeFilter, 0);
if (audioCapture)
ms_filter_unlink(audioCapture, 0, captureVolumeFilter, 0);
if (playbackVolumeFilter)
ms_filter_destroy(playbackVolumeFilter);
if (captureVolumeFilter)
ms_filter_destroy(captureVolumeFilter);
if (audioSink)
ms_filter_destroy(audioSink);
if (audioCapture)
ms_filter_destroy(audioCapture);
if (ticker) {
ms_ticker_destroy(ticker);// Destroy ticker at the end to avoid conflicts between attached filters
}
ticker = nullptr;
playbackVolumeFilter = nullptr;
captureVolumeFilter = nullptr;
audioSink = nullptr;
audioCapture = nullptr;
}
float SimpleCaptureGraph::getCaptureGain() {

2
linphone-sdk

@ -1 +1 @@
Subproject commit b1b8f63c3b7629950a2689303792836f73e0b1b7
Subproject commit f8422b1cadbbe24277a7289a479580f9c8b8f302