jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libobs: Clear unused pointers for obs_source_output_audio() 

Apparently, some audio filters do not check the audio channel/plane
count, and instead check to see if a pointer is valid. Instead of
requiring the caller to initialize these values to 0 manually (they
shouldn't have to), set them to zero upon input in
obs_source_output_audio() itself.

Closes obsproject/obs-studio#3744
master
jp9000 2021-10-06 16:33:31 -07:00
parent 3c14e4ece2
commit 9ef76e1f9b
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libobs/obs-source.c
View File

@ -3408,16 +3408,24 @@ static void process_audio(obs_source_t *source,
}
void obs_source_output_audio(obs_source_t *source,
const struct obs_source_audio *audio)
const struct obs_source_audio *audio_in)
{
struct obs_audio_data *output;
if (!obs_source_valid(source, "obs_source_output_audio"))
return;
if (!obs_ptr_valid(audio, "obs_source_output_audio"))
if (!obs_ptr_valid(audio_in, "obs_source_output_audio"))
return;
process_audio(source, audio);
/* sets unused data pointers to NULL automatically because apparently
* some filter plugins aren't checking the actual channel count, and
* instead are checking to see whether the pointer is non-zero. */
struct obs_source_audio audio = *audio_in;
size_t channels = get_audio_planes(audio.format, audio.speakers);
for (size_t i = channels; i < MAX_AUDIO_CHANNELS; i++)
audio.data[i] = NULL;
process_audio(source, &audio);
pthread_mutex_lock(&source->filter_mutex);
output = filter_async_audio(source, &source->audio_data);