griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix animation player scrubbing with multiple file arguments

Browse Source 
While passing in multiple files is supported, scrubbing both images
an movies wasn't working properly when multiple files were passed in.

For images, arguments such as "*.png" expand to multiple image files
which were each assigned a frame index of 0, this would play but stopped
scrubbing from working completely.

For movies, passing in multiple files would play back all files but
only properly scrub the first file, if other videos were longer than
the first scrubbing would jump to those.

Resolve by starting the frame index where the previous files left off.

Also resolve divide by zero when showing the indiciator for a single
frame.
This commit is contained in:
Campbell Barton
2023-10-10 11:02:37 +11:00
parent 951ae52912
commit 256ace4c57
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
source/blender/windowmanager/intern/wm_playanim.cc
View File

@@ -730,8 +730,14 @@ static void playanim_toscreen(PlayState *ps, const PlayAnimPict *picture, ImBuf
{
float indicator_factor = -1.0f;
if (ps->indicator) {
indicator_factor = picture->frame / double(((PlayAnimPict *)picsbase.last)->frame -
((PlayAnimPict *)picsbase.first)->frame);
const int frame_range = static_cast<const PlayAnimPict *>(picsbase.last)->frame -
static_cast<const PlayAnimPict *>(picsbase.first)->frame;
if (frame_range > 0) {
indicator_factor = float(double(picture->frame) / double(frame_range));
}
else {
BLI_assert_msg(BLI_listbase_is_single(&picsbase), "Multiple frames without a valid range!");
}
}
int fontid = -1;
@@ -756,7 +762,8 @@ static void playanim_toscreen(PlayState *ps, const PlayAnimPict *picture, ImBuf
static void build_pict_list_from_anim(GhostData *ghost_data,
const PlayDisplayContext *display_ctx,
const char *filepath_first)
const char *filepath_first,
const int frame_offset)
{
/* OCIO_TODO: support different input color space */
anim *anim = IMB_open_anim(filepath_first, IB_rect, 0, nullptr);
@@ -774,7 +781,7 @@ static void build_pict_list_from_anim(GhostData *ghost_data,
for (int pic = 0; pic < IMB_anim_get_duration(anim, IMB_TC_NONE); pic++) {
PlayAnimPict *picture = (PlayAnimPict *)MEM_callocN(sizeof(PlayAnimPict), "Pict");
picture->anim = anim;
picture->frame = pic;
picture->frame = pic + frame_offset;
picture->IB_flags = IB_rect;
picture->filepath = BLI_sprintfN("%s : %4.d", filepath_first, pic + 1);
BLI_addtail(&picsbase, picture);
@@ -784,6 +791,7 @@ static void build_pict_list_from_anim(GhostData *ghost_data,
static void build_pict_list_from_image_sequence(GhostData *ghost_data,
const PlayDisplayContext *display_ctx,
const char *filepath_first,
const int frame_offset,
const int totframes,
const int fstep,
const bool *loading_p)
@@ -831,7 +839,7 @@ static void build_pict_list_from_image_sequence(GhostData *ghost_data,
picture->IB_flags = IB_rect;
picture->mem = static_cast<uchar *>(mem);
picture->filepath = BLI_strdup(filepath);
picture->frame = pic;
picture->frame = pic + frame_offset;
BLI_addtail(&picsbase, picture);
pupdate_time();
@@ -891,12 +899,19 @@ static void build_pict_list(GhostData *ghost_data,
bool *loading_p)
{
*loading_p = true;
/* NOTE(@ideasman42): When loading many files (expanded from shell globing for e.g.)
* it's important the frame number increases each time. Otherwise playing `*.png`
* in a directory will expand into many arguments, each calling this function adding
* a frame that's set to zero. */
const int frame_offset = picsbase.last ? ((PlayAnimPict *)picsbase.last)->frame + 1 : 0;
if (IMB_isanim(filepath_first)) {
build_pict_list_from_anim(ghost_data, display_ctx, filepath_first);
build_pict_list_from_anim(ghost_data, display_ctx, filepath_first, frame_offset);
}
else {
build_pict_list_from_image_sequence(
ghost_data, display_ctx, filepath_first, totframes, fstep, loading_p);
ghost_data, display_ctx, filepath_first, frame_offset, totframes, fstep, loading_p);
}
*loading_p = false;
}