From dd27c3530432ea0b09f01e604bf577f31d8ef841 Mon Sep 17 00:00:00 2001 From: jacqueline Date: Thu, 1 Jun 2023 15:41:47 +1000 Subject: convert lvgl from submodule to a plain old directory --- lib/lvgl | 1 - lib/lvgl/examples/libs/ffmpeg/birds.mp4 | Bin 0 -> 1358537 bytes lib/lvgl/examples/libs/ffmpeg/ffmpeg.png | Bin 0 -> 21942 bytes lib/lvgl/examples/libs/ffmpeg/index.rst | 12 +++++++ lib/lvgl/examples/libs/ffmpeg/lv_example_ffmpeg.h | 39 +++++++++++++++++++++ .../examples/libs/ffmpeg/lv_example_ffmpeg_1.c | 29 +++++++++++++++ .../examples/libs/ffmpeg/lv_example_ffmpeg_2.c | 32 +++++++++++++++++ 7 files changed, 112 insertions(+), 1 deletion(-) delete mode 160000 lib/lvgl create mode 100644 lib/lvgl/examples/libs/ffmpeg/birds.mp4 create mode 100644 lib/lvgl/examples/libs/ffmpeg/ffmpeg.png create mode 100644 lib/lvgl/examples/libs/ffmpeg/index.rst create mode 100644 lib/lvgl/examples/libs/ffmpeg/lv_example_ffmpeg.h create mode 100644 lib/lvgl/examples/libs/ffmpeg/lv_example_ffmpeg_1.c create mode 100644 lib/lvgl/examples/libs/ffmpeg/lv_example_ffmpeg_2.c (limited to 'lib/lvgl/examples/libs/ffmpeg') diff --git a/lib/lvgl b/lib/lvgl deleted file mode 160000 index 0732400e..00000000 --- a/lib/lvgl +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0732400e7b564dd0e7dc4a924619d8e19c5b23a0 diff --git a/lib/lvgl/examples/libs/ffmpeg/birds.mp4 b/lib/lvgl/examples/libs/ffmpeg/birds.mp4 new file mode 100644 index 00000000..df1f19cd Binary files /dev/null and b/lib/lvgl/examples/libs/ffmpeg/birds.mp4 differ diff --git a/lib/lvgl/examples/libs/ffmpeg/ffmpeg.png b/lib/lvgl/examples/libs/ffmpeg/ffmpeg.png new file mode 100644 index 00000000..76360b9d Binary files /dev/null and b/lib/lvgl/examples/libs/ffmpeg/ffmpeg.png differ diff --git a/lib/lvgl/examples/libs/ffmpeg/index.rst b/lib/lvgl/examples/libs/ffmpeg/index.rst new file mode 100644 index 00000000..13108f9e --- /dev/null +++ b/lib/lvgl/examples/libs/ffmpeg/index.rst @@ -0,0 +1,12 @@ +Decode image +""""""""""""""""""""""""""""""""""""" + +.. lv_example:: libs/ffmpeg/lv_example_ffmpeg_1 + :language: c + +Decode video +""""""""""""""""""""""""""""""""""" + +.. lv_example:: libs/ffmpeg/lv_example_ffmpeg_2 + :language: c + diff --git a/lib/lvgl/examples/libs/ffmpeg/lv_example_ffmpeg.h b/lib/lvgl/examples/libs/ffmpeg/lv_example_ffmpeg.h new file mode 100644 index 00000000..69485527 --- /dev/null +++ b/lib/lvgl/examples/libs/ffmpeg/lv_example_ffmpeg.h @@ -0,0 +1,39 @@ +/** + * @file lv_example_ffmpeg.h + * + */ + +#ifndef LV_EXAMPLE_FFMPEG_H +#define LV_EXAMPLE_FFMPEG_H + +#ifdef __cplusplus +extern "C" { +#endif + +/********************* + * INCLUDES + *********************/ + +/********************* + * DEFINES + *********************/ + +/********************** + * TYPEDEFS + **********************/ + +/********************** + * GLOBAL PROTOTYPES + **********************/ +void lv_example_ffmpeg_1(void); +void lv_example_ffmpeg_2(void); + +/********************** + * MACROS + **********************/ + +#ifdef __cplusplus +} /*extern "C"*/ +#endif + +#endif /*LV_EXAMPLE_FFMPEG_H*/ diff --git a/lib/lvgl/examples/libs/ffmpeg/lv_example_ffmpeg_1.c b/lib/lvgl/examples/libs/ffmpeg/lv_example_ffmpeg_1.c new file mode 100644 index 00000000..58159857 --- /dev/null +++ b/lib/lvgl/examples/libs/ffmpeg/lv_example_ffmpeg_1.c @@ -0,0 +1,29 @@ +#include "../../lv_examples.h" +#if LV_BUILD_EXAMPLES +#if LV_USE_FFMPEG + + +/** + * Open an image from a file + */ +void lv_example_ffmpeg_1(void) +{ + lv_obj_t * img = lv_img_create(lv_scr_act()); + lv_img_set_src(img, "./lvgl/examples/libs/ffmpeg/ffmpeg.png"); + lv_obj_center(img); +} + +#else + +void lv_example_ffmpeg_1(void) +{ + /*TODO + *fallback for online examples*/ + + lv_obj_t * label = lv_label_create(lv_scr_act()); + lv_label_set_text(label, "FFmpeg is not installed"); + lv_obj_center(label); +} + +#endif +#endif diff --git a/lib/lvgl/examples/libs/ffmpeg/lv_example_ffmpeg_2.c b/lib/lvgl/examples/libs/ffmpeg/lv_example_ffmpeg_2.c new file mode 100644 index 00000000..3a8de1e2 --- /dev/null +++ b/lib/lvgl/examples/libs/ffmpeg/lv_example_ffmpeg_2.c @@ -0,0 +1,32 @@ +#include "../../lv_examples.h" +#if LV_BUILD_EXAMPLES +#if LV_USE_FFMPEG + +/** + * Open a video from a file + */ +void lv_example_ffmpeg_2(void) +{ + /*birds.mp4 is downloaded from http://www.videezy.com (Free Stock Footage by Videezy!) + *https://www.videezy.com/abstract/44864-silhouettes-of-birds-over-the-sunset*/ + lv_obj_t * player = lv_ffmpeg_player_create(lv_scr_act()); + lv_ffmpeg_player_set_src(player, "./lvgl/examples/libs/ffmpeg/birds.mp4"); + lv_ffmpeg_player_set_auto_restart(player, true); + lv_ffmpeg_player_set_cmd(player, LV_FFMPEG_PLAYER_CMD_START); + lv_obj_center(player); +} + +#else + +void lv_example_ffmpeg_2(void) +{ + /*TODO + *fallback for online examples*/ + + lv_obj_t * label = lv_label_create(lv_scr_act()); + lv_label_set_text(label, "FFmpeg is not installed"); + lv_obj_center(label); +} + +#endif +#endif -- cgit v1.2.3