player: only coalesce callbacks from parsed config files

This relaxes what bbac628a1b01261766459c6556e36d2443a42534 introduced. Although it is rare, there may be scripts out there that depend on the old timing. We'd still like to process config files in a sane manner and not cause OOMs so keep the general coalescing mechanism in place but use it selectively. There is one special case with the --input-commands option. We want this coalesced as well so some special handling needs to be added for that.

Dudemanguy committed 1 year ago

Commit 533a6841 parent f1526747 files · +30 −5Browse files

Unified · Split

7 files

input/cmd.h +1 −0
options/m_config_frontend.c +3 −0
options/m_config_frontend.h +1 −0
options/m_property.h +2 −0
player/command.c +21 −3
player/command.h +1 −1
player/playloop.c +1 −1

input/cmd.h+1−0

@@ -114,6 +114,7 @@ typedef struct mp_cmd { · 113 unmodified lines
114	bool repeated : 1;	114	bool repeated : 1;
115	bool mouse_move : 1;	115	bool mouse_move : 1;
116	bool canceled : 1;	116	bool canceled : 1;
		117	bool coalesce : 1;
117	int mouse_x, mouse_y;	118	int mouse_x, mouse_y;
118	struct mp_cmd *queue_next;	119	struct mp_cmd *queue_next;
119	double scale; // for scaling numeric arguments	120	double scale; // for scaling numeric arguments

options/m_config_frontend.c+3−0

@@ -737,6 +737,9 @@ int m_config_set_option_cli(struct m_config *config, struct bstr name, · 736 unmodified lines
737	param = bstr0("no");	737	param = bstr0("no");
738	}	738	}
739		739
		740	if (flags & M_SETOPT_FROM_CONFIG_FILE)
		741	co->coalesce = true;
		742
740	// This is the only mandatory function	743	// This is the only mandatory function
741	mp_assert(co->opt->type->parse);	744	mp_assert(co->opt->type->parse);
742		745

options/m_config_frontend.h+1−0

@@ -49,6 +49,7 @@ struct m_config_option { · 48 unmodified lines
49	bool is_set_from_config : 1; // Set by a config file	49	bool is_set_from_config : 1; // Set by a config file
50	bool is_set_locally : 1; // Has a backup entry	50	bool is_set_locally : 1; // Has a backup entry
51	bool warning_was_printed : 1;	51	bool warning_was_printed : 1;
		52	bool coalesce : 1; // Property changes should be coalesced
52	int32_t opt_id; // For some m_config APIs	53	int32_t opt_id; // For some m_config APIs
53	const char *name; // Full name (ie option-subopt)	54	const char *name; // Full name (ie option-subopt)
54	const struct m_option *opt; // Option description	55	const struct m_option *opt; // Option description

options/m_property.h+2−0

@@ -147,6 +147,8 @@ struct m_property { · 146 unmodified lines
147	void *priv;	147	void *priv;
148	// Special-case: mark options for which command.c uses the option-bridge	148	// Special-case: mark options for which command.c uses the option-bridge
149	bool is_option;	149	bool is_option;
		150	// Special-case: option-bridge properties should be coalesced
		151	bool coalesce;
150	};	152	};
151		153
152	struct m_property m_property_list_find(const struct m_property list,	154	struct m_property m_property_list_find(const struct m_property list,

player/command.c+21−3

         m_option_copy(opt->opt, arg, opt->data);
         return M_PROPERTY_OK;
     case M_PROPERTY_SET:
+        opt->coalesce = prop->coalesce;
         if (m_config_set_option_raw(mpctx->mconfig, opt, arg, 0) < 0)
             return M_PROPERTY_ERROR;
         return M_PROPERTY_OK;
 static void change_property_cmd(struct mp_cmd_ctx *cmd,
                                 const char *name, int action, void *arg)
 {
+    struct m_property *prop = NULL;
+    if (cmd->cmd->coalesce) {
+        struct command_ctx *ctx = cmd->mpctx->command_ctx;
+        prop = m_property_list_find(ctx->properties, name);
+        if (prop)
+            prop->coalesce = true;
+    }
     int r = mp_property_do(name, action, arg, cmd->mpctx);
     show_property_status(cmd, name, r);
+    if (prop)
+        prop->coalesce = false;
 }
 static void cmd_cycle_values(void *p)
     for (int i = 0; opts->input_commands[i]; i++) {
         struct mp_cmd *cmd = mp_input_parse_cmd(mpctx->input, bstr0(opts->input_commands[i]),
                                                 "the command line");
+        cmd->coalesce = true;
         mp_input_queue_cmd(mpctx->input, cmd);
     }
     ctx->command_opts_processed = true;
     if (self_update)
         return;
+    // Run these immediately.
+    if (co && !co->coalesce) {
+        struct mp_option_callback callback = {.co = co, .flags = flags};
+        mp_option_run_callback(mpctx, &callback);
+        return;
+    }
     // Coalesce redundant updates and only keep the newest one.
     bool drop = false;
     for (int i = 0; i < mpctx->num_option_callbacks; i++) {
     }
 }
-void mp_option_run_callback(struct MPContext *mpctx, int index)
+void mp_option_run_callback(struct MPContext *mpctx, struct mp_option_callback *callback)
 {
     struct MPOpts *opts = mpctx->opts;
-    struct m_config_option *co = mpctx->option_callbacks[index].co;
+    struct m_config_option *co = callback->co;
     void *opt_ptr = co ? co->data : NULL;
-    uint64_t flags = mpctx->option_callbacks[index].flags;
+    uint64_t flags = callback->flags;
     if (flags & UPDATE_TERM)
         mp_update_logging(mpctx, false);

player/command.h+1−1

@@ -87,7 +87,7 @@ int mp_property_do(const char* name, int action, void* val, · 86 unmodified lines
87		87
88	void mp_option_change_callback(void ctx, struct m_config_option co, uint64_t flags,	88	void mp_option_change_callback(void ctx, struct m_config_option co, uint64_t flags,
89	bool self_update);	89	bool self_update);
90	void mp_option_run_callback(struct MPContext *mpctx, int index);	90	void mp_option_run_callback(struct MPContext mpctx, struct mp_option_callback callback);
91		91
92	void mp_notify(struct MPContext mpctx, int event, void arg);	92	void mp_notify(struct MPContext mpctx, int event, void arg);
93	void mp_notify_property(struct MPContext mpctx, const char property);	93	void mp_notify_property(struct MPContext mpctx, const char property);

player/playloop.c+1−1

@@ -125,7 +125,7 @@ static void mp_process_input(struct MPContext *mpctx) · 124 unmodified lines
125	void handle_option_callbacks(struct MPContext *mpctx)	125	void handle_option_callbacks(struct MPContext *mpctx)
126	{	126	{
127	for (int i = 0; i < mpctx->num_option_callbacks; i++)	127	for (int i = 0; i < mpctx->num_option_callbacks; i++)
128	mp_option_run_callback(mpctx, i);	128	mp_option_run_callback(mpctx, &mpctx->option_callbacks[i]);
129	mpctx->num_option_callbacks = 0;	129	mpctx->num_option_callbacks = 0;
130	}	130	}
131		131

player: only coalesce callbacks from parsed config files

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code