mirror of
https://github.com/obsproject/obs-studio.git
synced 2024-09-20 13:08:50 +02:00
f2ee950746
- Fix a bug where the initial audio data insertion would cause all audio data to unintentionally clear (mixed up < and > operators, damn human error) - Fixed a potential interdependant lock scenario with channel mutex locks and graphics mutex locks. The main video thread could lock the graphics mutex and then while in the graphics mutex could lock the channels mutex. Meanwhile in another thread, the channel mutex could get locked, and then the graphics mutex would get locked, causing a deadlock. The best way to deal with this is to not let mutexes lock within other mutexes, but sometimes it's difficult to avoid such as in the main video thread. - Audio devices should now be functional, and the devices in the audio settings can now be changed as desired.
136 lines
3.0 KiB
C
136 lines
3.0 KiB
C
/******************************************************************************
|
|
Copyright (C) 2014 by Hugh Bailey <obs.jim@gmail.com>
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
******************************************************************************/
|
|
|
|
#include "obs.h"
|
|
#include "obs-internal.h"
|
|
|
|
bool obs_view_init(struct obs_view *view)
|
|
{
|
|
if (!view) return false;
|
|
|
|
pthread_mutex_init_value(&view->channels_mutex);
|
|
|
|
if (pthread_mutex_init(&view->channels_mutex, NULL) != 0) {
|
|
blog(LOG_ERROR, "obs_view_init: Failed to create mutex");
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
obs_view_t obs_view_create(void)
|
|
{
|
|
struct obs_view *view = bzalloc(sizeof(struct obs_view));
|
|
|
|
if (!obs_view_init(view)) {
|
|
bfree(view);
|
|
view = NULL;
|
|
}
|
|
|
|
return view;
|
|
}
|
|
|
|
void obs_view_free(struct obs_view *view)
|
|
{
|
|
if (!view) return;
|
|
|
|
for (size_t i = 0; i < MAX_CHANNELS; i++)
|
|
obs_source_release(view->channels[i]);
|
|
|
|
memset(view->channels, 0, sizeof(view->channels));
|
|
pthread_mutex_destroy(&view->channels_mutex);
|
|
}
|
|
|
|
void obs_view_destroy(obs_view_t view)
|
|
{
|
|
if (view) {
|
|
obs_view_free(view);
|
|
bfree(view);
|
|
}
|
|
}
|
|
|
|
obs_source_t obs_view_getsource(obs_view_t view, uint32_t channel)
|
|
{
|
|
obs_source_t source;
|
|
assert(channel < MAX_CHANNELS);
|
|
|
|
if (!view) return NULL;
|
|
if (channel >= MAX_CHANNELS) return NULL;
|
|
|
|
pthread_mutex_lock(&view->channels_mutex);
|
|
|
|
source = view->channels[channel];
|
|
if (source)
|
|
obs_source_addref(source);
|
|
|
|
pthread_mutex_unlock(&view->channels_mutex);
|
|
|
|
return source;
|
|
}
|
|
|
|
void obs_view_setsource(obs_view_t view, uint32_t channel,
|
|
obs_source_t source)
|
|
{
|
|
struct obs_source *prev_source;
|
|
|
|
assert(channel < MAX_CHANNELS);
|
|
|
|
if (!view) return;
|
|
if (channel >= MAX_CHANNELS) return;
|
|
|
|
pthread_mutex_lock(&view->channels_mutex);
|
|
|
|
obs_source_addref(source);
|
|
|
|
prev_source = view->channels[channel];
|
|
view->channels[channel] = source;
|
|
|
|
pthread_mutex_unlock(&view->channels_mutex);
|
|
|
|
if (source)
|
|
obs_source_activate(source, AUX_VIEW);
|
|
|
|
if (prev_source) {
|
|
obs_source_deactivate(prev_source, AUX_VIEW);
|
|
obs_source_release(prev_source);
|
|
}
|
|
}
|
|
|
|
void obs_view_render(obs_view_t view)
|
|
{
|
|
if (!view) return;
|
|
|
|
pthread_mutex_lock(&view->channels_mutex);
|
|
|
|
for (size_t i = 0; i < MAX_CHANNELS; i++) {
|
|
struct obs_source *source;
|
|
|
|
source = view->channels[i];
|
|
|
|
if (source) {
|
|
if (source->removed) {
|
|
obs_source_release(source);
|
|
view->channels[i] = NULL;
|
|
} else {
|
|
obs_source_video_render(source);
|
|
}
|
|
}
|
|
}
|
|
|
|
pthread_mutex_unlock(&view->channels_mutex);
|
|
}
|