lagertonne/yolobs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

New upstream version 23.2.1+dfsg1

Browse source
This commit is contained in:
Simon Chopin 2019-07-27 14:47:10 +02:00
parent cdc9a9fc87
commit b14f9eae6d
1017 changed files with 37232 additions and 11111 deletions
Download patch file Download diff file Expand all files Collapse all files

34
plugins/image-source/obs-slideshow.c
View file

@ -57,6 +57,11 @@
/* ------------------------------------------------------------------------- */
extern uint64_t image_source_get_memory_usage(void *data);
#define BYTES_TO_MBYTES (1024 * 1024)
#define MAX_MEM_USAGE (250 * BYTES_TO_MBYTES)
struct image_file_data {
char *path;
obs_source_t *source;
@ -91,6 +96,7 @@ struct slideshow {
uint32_t cx;
uint32_t cy;
uint64_t mem_usage;
pthread_mutex_t mutex;
DARRAY(struct image_file_data) files;
@ -203,6 +209,9 @@ static void add_file(struct slideshow *ss, struct darray *array,
if (new_cx > *cx) *cx = new_cx;
if (new_cy > *cy) *cy = new_cy;
void *source_data = obs_obj_get_data(new_source);
ss->mem_usage += image_source_get_memory_usage(source_data);
}
*array = new_files.da;
@ -308,6 +317,8 @@ static void ss_update(void *data, obs_data_t *settings)
/* ------------------------------------- */
/* create new list of sources */
ss->mem_usage = 0;
for (size_t i = 0; i < count; i++) {
obs_data_t *item = obs_data_array_item(array, i);
const char *path = obs_data_get_string(item, "value");
@ -335,6 +346,9 @@ static void ss_update(void *data, obs_data_t *settings)
dstr_cat(&dir_path, ent->d_name);
add_file(ss, &new_files.da, dir_path.array,
&cx, &cy);
if (ss->mem_usage >= MAX_MEM_USAGE)
break;
}
dstr_free(&dir_path);
@ -344,6 +358,9 @@ static void ss_update(void *data, obs_data_t *settings)
}
obs_data_release(item);
if (ss->mem_usage >= MAX_MEM_USAGE)
break;
}
/* ------------------------------------- */
@ -358,10 +375,15 @@ static void ss_update(void *data, obs_data_t *settings)
ss->transition = new_tr;
}
if (new_duration < 50)
new_duration = 50;
if (new_speed > (new_duration - 50))
new_speed = new_duration - 50;
if (strcmp(tr_name, "cut_transition") != 0) {
if (new_duration < 100)
new_duration = 100;
new_duration += new_speed;
} else {
if (new_duration < 50)
new_duration = 50;
}
ss->tr_speed = new_speed;
ss->tr_name = tr_name;
@ -475,7 +497,7 @@ static void ss_next_slide(void *data)
{
struct slideshow *ss = data;
if (!ss->files.num)
if (!ss->files.num || obs_transition_get_time(ss->transition) < 1.0f)
return;
if (++ss->cur_item >= ss->files.num)
@ -488,7 +510,7 @@ static void ss_previous_slide(void *data)
{
struct slideshow *ss = data;
if (!ss->files.num)
if (!ss->files.num || obs_transition_get_time(ss->transition) < 1.0f)
return;
if (ss->cur_item == 0)