media/obs-studio
media/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio synced 2024-10-23 08:01:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

libobs: Merge obs_encoder_stop() and ..._stop_internal()

Browse source 
There is no longer any need for them to be separate functions. This is
just code cleanup.
This commit is contained in:
tt2468 2024-06-19 16:30:34 -07:00 committed by Ryan Foster
parent 06291c7201
commit 8892edde05
1 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
libobs/obs-encoder.c
View file

@ -786,14 +786,19 @@ void obs_encoder_start(obs_encoder_t *encoder,
pthread_mutex_unlock(&encoder->init_mutex);
}
static inline void obs_encoder_stop_internal(
obs_encoder_t *encoder,
void (*new_packet)(void *param, struct encoder_packet *packet),
void *param)
void obs_encoder_stop(obs_encoder_t *encoder,
void (*new_packet)(void *param,
struct encoder_packet *packet),
void *param)
{
bool last = false;
size_t idx;
if (!obs_encoder_valid(encoder, "obs_encoder_stop"))
return;
if (!obs_ptr_valid(new_packet, "obs_encoder_stop"))
return;
pthread_mutex_lock(&encoder->init_mutex);
pthread_mutex_lock(&encoder->callbacks_mutex);
@ -835,21 +840,6 @@ static inline void obs_encoder_stop_internal(
pthread_mutex_unlock(&encoder->init_mutex);
}
void obs_encoder_stop(obs_encoder_t *encoder,
void (*new_packet)(void *param,
struct encoder_packet *packet),
void *param)
{
bool destroyed;
if (!obs_encoder_valid(encoder, "obs_encoder_stop"))
return;
if (!obs_ptr_valid(new_packet, "obs_encoder_stop"))
return;
obs_encoder_stop_internal(encoder, new_packet, param);
}
const char *obs_encoder_get_codec(const obs_encoder_t *encoder)
{
return obs_encoder_valid(encoder, "obs_encoder_get_codec")