Mirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2025-12-22 10:57:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

player/javascript: fix mp.set_property_number for integer properties

Browse Source 
Fixes: #16911
This commit is contained in:
Kacper Michajłow
2025-10-11 11:58:49 +02:00
parent f9d4e19888
commit 339ad7e49e
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
player/javascript.c
View File

@@ -701,12 +701,27 @@ static void script_get_property_bool(js_State *J)
js_pushboolean(J, result); js_pushboolean(J, result);
} }
// true if we don't lose (too much) precision when casting to int64
static bool same_as_int64(double d)
{
// The range checks also validly filter inf and nan, so behavior is defined
return d >= INT64_MIN && d <= (double) INT64_MAX && d == (int64_t)d;
}
// args: name, number // args: name, number
static void script_set_property_number(js_State *J) static void script_set_property_number(js_State *J)
{ {
double v = js_tonumber(J, 2); double v = js_tonumber(J, 2);
mpv_handle *h = jclient(J); mpv_handle *h = jclient(J);
int e = mpv_set_property(h, js_tostring(J, 1), MPV_FORMAT_DOUBLE, &v); // If the number might be an integer, then set it as integer. The mpv core
// will (probably) convert INT64 to DOUBLE when setting, but not the other
// way around.
int e;
if (same_as_int64(v)) {
e = mpv_set_property(h, js_tostring(J, 1), MPV_FORMAT_INT64, &(int64_t){v});
} else {
e = mpv_set_property(h, js_tostring(J, 1), MPV_FORMAT_DOUBLE, &v);
}
push_status(J, e); push_status(J, e);
} }
@@ -1053,13 +1068,6 @@ static int get_obj_properties(void *ta_ctx, char ***keys, js_State *J, int idx)
return length; return length;
} }
// true if we don't lose (too much) precision when casting to int64
static bool same_as_int64(double d)
{
// The range checks also validly filter inf and nan, so behavior is defined
return d >= INT64_MIN && d <= (double) INT64_MAX && d == (int64_t)d;
}
static int jsL_checkint(js_State *J, int idx) static int jsL_checkint(js_State *J, int idx)
{ {
double d = js_tonumber(J, idx); double d = js_tonumber(J, idx);