etc/obs-StreamFX
0
0
Fork 0
mirror of https://github.com/Xaymar/obs-StreamFX synced 2024-12-29 11:01:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

source-mirror: Refactoring

Browse source
This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2018-04-28 12:45:11 +02:00
parent 410ba9df88
commit c4942da235
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
source/source-mirror.cpp
View file

@ -251,7 +251,7 @@ Source::Mirror::Mirror(obs_data_t* data, obs_source_t* src) {
}
Source::Mirror::~Mirror() {
m_audioKill = true;
m_killAudioThread = true;
m_audioNotify.notify_all();
if (m_audioThread.joinable())
m_audioThread.join();
@ -281,8 +281,8 @@ void Source::Mirror::update(obs_data_t* data) {
if (sourceName != m_mirrorName) {
try {
m_mirrorSource = std::make_unique<gfx::source_texture>(sourceName, m_source);
m_mirrorAudio = std::make_unique<obs::audio_capture>(m_mirrorSource->get_object());
m_mirrorAudio->set_callback(std::bind(&Source::Mirror::audio_capture_cb, this,
m_audioCapture = std::make_unique<obs::audio_capture>(m_mirrorSource->get_object());
m_audioCapture->set_callback(std::bind(&Source::Mirror::audio_capture_cb, this,
std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
m_mirrorName = sourceName;
} catch (...) {
@ -471,19 +471,19 @@ void Source::Mirror::audio_capture_cb(void* data, const audio_data* audio, bool
m_audioOutput.samples_per_sec = aoi->samples_per_sec;
m_audioOutput.speakers = aoi->speakers;
m_audioExists = true;
m_haveAudioOutput = true;
m_audioNotify.notify_all();
}
void Source::Mirror::audio_output_cb() {
std::unique_lock<std::mutex> ulock(m_audioLock);
while (!m_audioKill) {
if (m_audioExists) {
while (!m_killAudioThread) {
if (m_haveAudioOutput) {
obs_source_output_audio(m_source, &m_audioOutput);
m_audioExists = false;
m_haveAudioOutput = false;
}
m_audioNotify.wait(ulock, [this]() { return m_audioExists || m_audioKill; });
m_audioNotify.wait(ulock, [this]() { return m_haveAudioOutput || m_killAudioThread; });
}
}

6
source/source-mirror.h
View file

@ -76,14 +76,14 @@ namespace Source {
// Audio
bool m_enableAudio = false;
std::unique_ptr<obs::audio_capture> m_mirrorAudio;
std::unique_ptr<obs::audio_capture> m_audioCapture;
std::mutex m_audioLock;
std::condition_variable m_audioNotify;
obs_source_audio m_audioOutput;
std::vector<std::vector<float_t>> m_audioData;
std::thread m_audioThread;
bool m_audioKill = false;
bool m_audioExists = false;
bool m_killAudioThread = false;
bool m_haveAudioOutput = false;
public:
Mirror(obs_data_t*, obs_source_t*);