mirror of
https://github.com/obsproject/obs-studio.git
synced 2024-09-20 13:08:50 +02:00
image-source: Reset gif seek position when source activated
This commit is contained in:
parent
cb9ce7547d
commit
e935056887
@ -23,6 +23,7 @@ struct image_source {
|
||||
time_t file_timestamp;
|
||||
float update_time_elapsed;
|
||||
uint64_t last_time;
|
||||
bool active;
|
||||
|
||||
gs_image_file_t image;
|
||||
};
|
||||
@ -162,6 +163,31 @@ static void image_source_tick(void *data, float seconds)
|
||||
struct image_source *context = data;
|
||||
uint64_t frame_time = obs_get_video_frame_time();
|
||||
|
||||
if (obs_source_active(context->source)) {
|
||||
if (!context->active) {
|
||||
if (context->image.is_animated_gif)
|
||||
context->last_time = frame_time;
|
||||
context->active = true;
|
||||
}
|
||||
|
||||
} else {
|
||||
if (context->active) {
|
||||
if (context->image.is_animated_gif) {
|
||||
context->image.cur_frame = 0;
|
||||
context->image.cur_loop = 0;
|
||||
context->image.cur_time = 0;
|
||||
|
||||
obs_enter_graphics();
|
||||
gs_image_file_update_texture(&context->image);
|
||||
obs_leave_graphics();
|
||||
}
|
||||
|
||||
context->active = false;
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
if (context->last_time && context->image.is_animated_gif) {
|
||||
uint64_t elapsed = frame_time - context->last_time;
|
||||
bool updated = gs_image_file_tick(&context->image, elapsed);
|
||||
@ -175,8 +201,6 @@ static void image_source_tick(void *data, float seconds)
|
||||
|
||||
context->last_time = frame_time;
|
||||
|
||||
if (!obs_source_showing(context->source)) return;
|
||||
|
||||
context->update_time_elapsed += seconds;
|
||||
|
||||
if (context->update_time_elapsed >= 1.0f) {
|
||||
|
Loading…
Reference in New Issue
Block a user