refactor: adjust svg player code

Signed-off-by: zhangjipeng <zhangjipeng@xiaomi.com>

Author: zhangjipeng

ext/svg/psx_svg_player.cpp

@@ -423,14 +423,6 @@ static INLINE float _attr_as_number(const psx_svg_attr* a)
     return a->value.fval;
 }
 
-static psx_svg_player_options _default_options(void)
-{
-    psx_svg_player_options opt;
-    opt.loop = false;
-    opt.dpi = 96;
-    return opt;
-}
-
 static INLINE const psx_svg_attr* _find_attr(const psx_svg_node* node, psx_svg_attr_type type)
 {
     if (!node) {
@@ -2130,9 +2122,7 @@ static void _collect_anims(psx_svg_player* p, const psx_svg_node* node)
 extern "C" {
 #endif
 
-static psx_svg_player* _psx_svg_player_create_impl(const psx_svg_node* root,
-                                                   const psx_svg_player_options* opt_in,
-                                                   psx_result* out)
+psx_svg_player* psx_svg_player_create(const psx_svg_node* root, psx_result* out)
 {
     if (out) {
         *out = S_OK;
@@ -2144,8 +2134,6 @@ static psx_svg_player* _psx_svg_player_create_impl(const psx_svg_node* root,
         return NULL;
     }
 
-    psx_svg_player_options opt = opt_in ? *opt_in : _default_options();
-
     psx_svg_player* p = (psx_svg_player*)mem_malloc(sizeof(psx_svg_player));
     if (!p) {
         if (out) {
@@ -2156,8 +2144,8 @@ static psx_svg_player* _psx_svg_player_create_impl(const psx_svg_node* root,
     memset(p, 0, sizeof(psx_svg_player));
 
     p->root = root;
-    p->loop = opt.loop;
-    p->dpi = (opt.dpi > 0) ? opt.dpi : 96;
+    p->loop = false;
+    p->dpi = 96; // default dpi
 
     p->render_list = psx_svg_render_list_create(root);
     if (!p->render_list) {
@@ -2211,16 +2199,6 @@ static psx_svg_player* _psx_svg_player_create_impl(const psx_svg_node* root,
     return p;
 }
 
-psx_svg_player* psx_svg_player_create(const psx_svg_node* root,
-                                      const psx_svg_player_options* opt_in,
-                                      psx_result* out)
-{
-    // We may need non-const access internally for indices/caches, but we do not
-    // mutate the DOM in this minimal implementation.
-    return _psx_svg_player_create_impl((psx_svg_node*)root, opt_in, out);
-}
-
-
 void psx_svg_player_destroy(psx_svg_player* p)
 {
     if (!p) {
@@ -2428,6 +2406,19 @@ bool psx_svg_player_get_loop(const psx_svg_player* p)
     return p ? p->loop : false;
 }
 
+void psx_svg_player_set_dpi(psx_svg_player* p, int32_t dpi)
+{
+    if (!p) {
+        return;
+    }
+    p->dpi = dpi;
+}
+
+int32_t psx_svg_player_get_dpi(const psx_svg_player* p)
+{
+    return p ? p->dpi : 0;
+}
+
 void psx_svg_player_draw(psx_svg_player* p, ps_context* ctx)
 {
     if (!p || !ctx || !p->render_list) {
@@ -2531,7 +2522,6 @@ const psx_svg_node* psx_svg_player_get_node_by_id(const psx_svg_player* p, const
 
     // FIXME: change to tree travls
 
-
     // Parser stores element id into node->content(). We do a simple DFS.
     const psx_svg_node* stack[64];
     uint32_t sp = 0;

ext/svg/psx_svg_player.h

@@ -38,16 +38,6 @@ extern "C" {
 
 typedef struct psx_svg_player psx_svg_player;
 
-// Player create options
-typedef struct {
-    // If true, player will loop when reaching end time.
-    // Default: false.
-    bool loop;
-
-    // Document dpi for unit conversion (px/in/cm/mm/pt/pc). Default: 96.
-    int32_t dpi;
-} psx_svg_player_options;
-
 // Player status
 typedef enum {
     PSX_SVG_PLAYER_STOPPED = 0,
@@ -62,18 +52,21 @@ typedef enum {
     PSX_SVG_ANIM_EVENT_REPEAT,
 } psx_svg_anim_event_type;
 
-typedef void (*psx_svg_anim_event_cb)(psx_svg_anim_event_type type,
-                                      const char* anim_id,
-                                      void* user);
+typedef void (*psx_svg_anim_event_cb)(psx_svg_anim_event_type type, const char* anim_id, void* user_data);
 
 // Create a player from an already-parsed SVG DOM root.
 // The player internally builds a render list once and reuses it each frame.
-psx_svg_player* psx_svg_player_create(const psx_svg_node* root,
-                                      const psx_svg_player_options* opt,
-                                      psx_result* err);
-
+psx_svg_player* psx_svg_player_create(const psx_svg_node* root, psx_result* err);
 void psx_svg_player_destroy(psx_svg_player* p);
 
+// Loop
+void psx_svg_player_set_loop(psx_svg_player* p, bool loop);
+bool psx_svg_player_get_loop(const psx_svg_player* p);
+
+// Dpi
+void psx_svg_player_set_dpi(psx_svg_player* p, int32_t dpi);
+int32_t psx_svg_player_get_dpi(const psx_svg_player* p);
+
 // Playback control
 void psx_svg_player_play(psx_svg_player* p);
 void psx_svg_player_pause(psx_svg_player* p);
@@ -86,10 +79,6 @@ float psx_svg_player_get_time(const psx_svg_player* p);
 float psx_svg_player_get_duration(const psx_svg_player* p); // -1 for indefinite/unknown
 psx_svg_player_state psx_svg_player_get_state(const psx_svg_player* p);
 
-// Loop
-void psx_svg_player_set_loop(psx_svg_player* p, bool loop);
-bool psx_svg_player_get_loop(const psx_svg_player* p);
-
 // Rendering
 // Draws current frame into the provided Picasso context.
 void psx_svg_player_draw(psx_svg_player* p, ps_context* ctx);