Mirrors_UI_SDK/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2026-08-17 01:31:53 +08:00
Code Issues Actions 39 Packages Projects Releases Wiki Activity

fix(lottie): use source animation duration (#10457)

Browse Source
This commit is contained in:
wszxy123
2026-08-12 12:52:28 +02:00
committed by GitHub
parent 6673cb3b2f
commit 940c86ae3a
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/lottie/lv_lottie.c
+6 -2
View File
@@ -133,8 +133,10 @@ void lv_lottie_set_src_data(lv_obj_t * obj, const void * src, size_t src_size)
}
float f_total;
float duration;
tvg_animation_get_total_frame(lottie->tvg_anim, &f_total);
lv_anim_set_duration(lottie->anim, (int32_t)f_total * 1000 / 60); /*60 FPS*/
tvg_animation_get_duration(lottie->tvg_anim, &duration);
lv_anim_set_duration(lottie->anim, (uint32_t)(duration * 1000.0f + 0.5f)); /*0.5f rounds to the nearest ms*/
lottie->anim->act_time = 0;
lottie->anim->end_value = (int32_t)f_total;
lottie->anim->reverse_play_in_progress = false;
@@ -151,8 +153,10 @@ void lv_lottie_set_src_file(lv_obj_t * obj, const char * src)
}
float f_total;
float duration;
tvg_animation_get_total_frame(lottie->tvg_anim, &f_total);
lv_anim_set_duration(lottie->anim, (int32_t)f_total * 1000 / 60); /*60 FPS*/
tvg_animation_get_duration(lottie->tvg_anim, &duration);
lv_anim_set_duration(lottie->anim, (uint32_t)(duration * 1000.0f + 0.5f)); /*0.5f rounds to the nearest ms*/
lottie->anim->act_time = 0;
lottie->anim->end_value = (int32_t)f_total;
lottie->anim->reverse_play_in_progress = false;
tests/src/test_cases/widgets/test_lottie.c
+10
View File
@@ -5,6 +5,8 @@
static uint32_t buf[LV_TEST_WIDTH_TO_STRIDE(100, 4) * 100 + LV_DRAW_BUF_ALIGN];
static const char lottie_30_fps[] =
"{\"v\":\"5.7.4\",\"fr\":30,\"ip\":0,\"op\":60,\"w\":1,\"h\":1,\"layers\":[]}";
extern const uint8_t test_lottie_approve[];
extern const size_t test_lottie_approve_size;
@@ -75,6 +77,14 @@ void test_lottie_load_from_file(void)
TEST_ASSERT_EQUAL_SCREENSHOT("widgets/lottie_2.png");
}
void test_lottie_uses_source_duration(void)
{
lv_obj_t * lottie = lv_lottie_create(lv_screen_active());
lv_lottie_set_src_data(lottie, lottie_30_fps, sizeof(lottie_30_fps) - 1);
TEST_ASSERT_EQUAL_UINT32(2000, lv_lottie_get_anim(lottie)->duration);
}
void test_lottie_missing_settings(void)
{
uint32_t tmp_buf[LV_TEST_WIDTH_TO_STRIDE(100, 4) * 100 + LV_DRAW_BUF_ALIGN];