Merge branch 'gpac:master' into dolby_vision

MingxinChen · web-flow · commit 8a4dd72196f4 · 2026-03-03T15:17:51.000+08:00
diff --git a/share/mcp/package-lock.json b/share/mcp/package-lock.json
diff --git a/share/rmtws/jsrmt.js b/share/rmtws/jsrmt.js
@@ -228,7 +228,7 @@ function JSClient(id, client) {
 
 
 
-				return 5000;
+				return 1000;
 			});
 
 
diff --git a/src/filter_core/filter_register.c b/src/filter_core/filter_register.c
@@ -195,10 +195,13 @@ REG_DEC(ghidmx)
 REG_DEC(evgs)
 REG_DEC(ccdec)
 REG_DEC(ccenc)
-REG_DEC(scte35dec)
 REG_DEC(mpeghdec)
 REG_DEC(seiload)
 
+#ifndef GPAC_DISABLE_ISOM
+REG_DEC(scte35dec)
+#endif
+
 typedef const GF_FilterRegister *(*filter_reg_fun)(GF_FilterSession *session);
 
 typedef struct
@@ -360,7 +363,9 @@ BuiltinReg BuiltinFilters [] = {
 	REG_IT(evgs),
 	REG_IT(ccdec),
 	REG_IT(ccenc),
+#ifndef GPAC_DISABLE_ISOM
 	REG_IT(scte35dec),
+#endif
 	REG_IT(seiload),
 
 #if !defined(GPAC_CONFIG_IOS) && !defined(GPAC_CONFIG_ANDROID)
diff --git a/src/filter_core/filter_session.c b/src/filter_core/filter_session.c
@@ -834,8 +834,9 @@ void gf_fs_del(GF_FilterSession *fsess)
 #endif
 	if (fsess->prop_maps_entry_reservoir)
 		gf_fq_del(fsess->prop_maps_entry_reservoir, gf_void_del);
-	if (fsess->prop_maps_entry_data_alloc_reservoir)
+	if (fsess->prop_maps_entry_data_alloc_reservoir) {
 		gf_fq_del(fsess->prop_maps_entry_data_alloc_reservoir, gf_propalloc_del);
+	}
 	if (fsess->pcks_refprops_reservoir)
 		gf_fq_del(fsess->pcks_refprops_reservoir, gf_void_del);
 
diff --git a/src/filter_core/filter_session_js.c b/src/filter_core/filter_session_js.c
@@ -959,8 +959,9 @@ static void get_filter_args(JSContext *ctx, GF_FilterSession *fs,  const GF_Filt
 						JS_SetPropertyStr(ctx, aval, "value", jsf_NewProp(ctx, &p) );
 					} else {
 						if (arg->arg_default_val) {
-							gf_props_parse_value(arg->arg_type, arg->arg_name, arg->arg_default_val, arg->min_max_enum, f_inst->session->sep_list);
+							p = gf_props_parse_value(arg->arg_type, arg->arg_name, arg->arg_default_val, arg->min_max_enum, f_inst->session->sep_list);
 							JS_SetPropertyStr(ctx, aval, "value", jsf_NewProp(ctx, &p) );
+							gf_props_reset_single(&p);
 						} else {
 							JS_SetPropertyStr(ctx, aval, "value", JS_NULL);
 						}
diff --git a/src/filters/dec_scte35.c b/src/filters/dec_scte35.c
@@ -26,6 +26,10 @@
 #include <gpac/filters.h>
 #include <gpac/internal/isomedia_dev.h>
 
+
+#ifndef GPAC_DISABLE_ISOM
+
+
 #define IS_SEGMENTED (ctx->sampdur.den && ctx->sampdur.num>0)
 #define IS_PASSTHRU  (ctx->mode == 1)
 
@@ -937,3 +941,6 @@ const GF_FilterRegister *scte35dec_register(GF_FilterSession *session)
 {
 	return &SCTE35DecRegister;
 }
+
+
+#endif /* GPAC_DISABLE_ISOM */
diff --git a/src/filters/dec_uncv.c b/src/filters/dec_uncv.c
@@ -845,8 +845,8 @@ static GF_Err uncv_config(UNCVDecCtx *ctx, u8 *dsi, u32 dsi_size)
 
 	ctx->stride = ctx->bpp * ctx->width;
 	ctx->output_size = ctx->stride * ctx->height;
-	ctx->tile_width = ctx->width / config->num_tile_cols;
-	ctx->tile_height = ctx->height / config->num_tile_rows;
+	ctx->tile_width = config->num_tile_cols ? ctx->width / config->num_tile_cols : 0;
+	ctx->tile_height = config->num_tile_rows ? ctx->height / config->num_tile_rows : 0;
 	ctx->blocksize_bits = config->block_size * 8;
 
 	if (config->interleave==INTERLEAVE_COMPONENT) {
diff --git a/src/filters/dmx_nhml.c b/src/filters/dmx_nhml.c
@@ -340,6 +340,9 @@ static void nhmldmx_set_props(GF_NHMLDmxCtx *ctx, GF_XMLNode *props, GF_FilterPa
 		} else {
 			prop_type = GF_PROP_STRING;
 		}
+		if (prop_type == GF_PROP_STRING_LIST) {
+			reset = GF_FALSE;
+		}
 		GF_PropertyValue prop_val;
 		if (has_bs) {
 			GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
@@ -357,16 +360,18 @@ static void nhmldmx_set_props(GF_NHMLDmxCtx *ctx, GF_XMLNode *props, GF_FilterPa
 		if (p4cc) {
 			if (pck)
 				gf_filter_pck_set_property(pck, p4cc, &prop_val );
-			else
+			else {
 				gf_filter_pid_set_property(ctx->opid, p4cc, &prop_val );
+			}
 		} else {
 			if (pck)
 				gf_filter_pck_set_property_dyn(pck, pname, &prop_val );
 			else
 				gf_filter_pid_set_property_dyn(ctx->opid, pname, &prop_val );
 		}
-		if (reset)
+		if (reset) {
 			gf_props_reset_single(&prop_val);
+		}
 	}
 }
 
@@ -842,7 +847,7 @@ static GF_Err nhmldmx_config_output(GF_Filter *filter, GF_NHMLDmxCtx *ctx, GF_XM
 			if (init_name) gf_free(init_name);
 			return e;
 		}
-	} else if (ctx->header_end) {
+	} else if (ctx->header_end && ctx->header_end < GF_UINT_MAX) {
 		/* for text based streams, the decoder specific info can be at the beginning of the file */
 		specInfoSize = ctx->header_end;
 		specInfo = (char*)gf_malloc(sizeof(char) * (specInfoSize+1));
@@ -859,11 +864,12 @@ static GF_Err nhmldmx_config_output(GF_Filter *filter, GF_NHMLDmxCtx *ctx, GF_XM
 			if (init_name) gf_free(init_name);
 			return e;
 		}
-
-		specInfo = (char*)gf_malloc(sizeof(char) * (ctx->samp_buffer_size +1));
-		memcpy(specInfo, ctx->samp_buffer, ctx->samp_buffer_size);
-		specInfoSize = ctx->samp_buffer_size;
-		specInfo[specInfoSize] = 0;
+		if (ctx->samp_buffer && ctx->samp_buffer_size < GF_UINT_MAX) {
+			specInfo = (char*)gf_malloc(sizeof(char) * (ctx->samp_buffer_size +1));
+			memcpy(specInfo, ctx->samp_buffer, ctx->samp_buffer_size);
+			specInfoSize = ctx->samp_buffer_size;
+			specInfo[specInfoSize] = 0;
+		}
 	}
 
 	i = 0;
@@ -873,6 +879,11 @@ static GF_Err nhmldmx_config_output(GF_Filter *filter, GF_NHMLDmxCtx *ctx, GF_XM
 		if (!stricmp(node->name, ctx->is_dims ? "DIMSUnit" : "NHNTSample") ) break;
 		if (stricmp(node->name, "DecoderSpecificInfo") ) continue;
 
+		if (specInfo) {
+			gf_free(specInfo);
+			specInfo = NULL;
+			specInfoSize = 0;
+		}
 		e = gf_xml_parse_bit_sequence(node, ctx->src_url, &specInfo, &specInfoSize);
 		if (e) {
 			if (specInfo) gf_free(specInfo);
@@ -1511,6 +1522,11 @@ static GF_Err nhmldmx_send_sample(GF_Filter *filter, GF_NHMLDmxCtx *ctx)
 
 			char *content = gf_xml_dom_serialize(node, GF_TRUE, GF_FALSE);
 
+			if (!content) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[NHMLDmx] import failure in sample %d: unable to serialize node\n", ctx->sample_num));
+				return GF_NON_COMPLIANT_BITSTREAM;
+			}
+
 			ctx->samp_buffer_size = 3 + (u32) strlen(content);
 			if (ctx->samp_buffer_alloc < ctx->samp_buffer_size+1) {
 				ctx->samp_buffer_alloc = ctx->samp_buffer_size+1;
diff --git a/src/filters/jsfilter.c b/src/filters/jsfilter.c
@@ -644,7 +644,9 @@ JSValue jsf_NewProp(JSContext *ctx, const GF_PropertyValue *new_val)
 
 	default:
 		if (gf_props_type_is_enum(new_val->type)) {
-			return JS_NewString(ctx, gf_props_enum_name(new_val->type, new_val->value.uint));
+			const char* enum_name = gf_props_enum_name(new_val->type, new_val->value.uint);
+			if (enum_name)
+				return JS_NewString(ctx, enum_name);
 		}
 		return JS_NULL;
 	}
diff --git a/src/filters/load_svg.c b/src/filters/load_svg.c
@@ -205,7 +205,7 @@ static GF_Err svgin_process(GF_Filter *filter)
 				size = gf_bs_read_u32(bs);
 				nb_bytes = 6;
 			}
-			if (pos+nb_bytes+size >= pck_size) {
+			if (pos+nb_bytes+size > pck_size) {
 				e = GF_NON_COMPLIANT_BITSTREAM;
 				break;
 			}
diff --git a/src/filters/mux_isom.c b/src/filters/mux_isom.c
@@ -325,7 +325,7 @@ typedef struct
 	GF_MP4MuxTagInjectionMode itags;
 	Double start;
 	GF_MP4MuxChapterMode chapm;
-
+	u32 sfrag_tolerance;
 
 	//internal
 	GF_Filter *filter;
@@ -6987,15 +6987,34 @@ static GF_Err mp4_mux_process_fragmented(GF_MP4MuxCtx *ctx)
 			} else if (ctx->fragdur && (!ctx->dash_mode || !tkw->fragment_done) ) {
 				Bool frag_done = GF_FALSE;
 				u32 dur = gf_filter_pck_get_duration(pck);
+				GF_FilterSAPType sap = mp4_mux_get_sap(ctx, pck);
 				if (tkw->dur_in_frag && gf_timestamp_greater_or_equal(tkw->dur_in_frag, tkw->src_timescale, ctx->cdur.num, ctx->cdur.den)) {
-					frag_done = GF_TRUE;
-				} else if ((ctx->store==MP4MX_MODE_SFRAG)
-					&& gf_timestamp_greater_or_equal(check_ts, tkw->src_timescale, ctx->adjusted_next_frag_start, ctx->cdur.den)
-				) {
-					GF_FilterSAPType sap = mp4_mux_get_sap(ctx, pck);
-					if ((sap && sap<GF_FILTER_SAP_3)) {
+
+					if (ctx->sfrag_tolerance) {
+						//if sfrag+tolerance, do NOT use the accumulated dur, only use target stop time
+						//so that we maintain the desired amount if fragments
+						if (gf_timestamp_greater_or_equal(check_ts, tkw->src_timescale, ctx->adjusted_next_frag_start, ctx->cdur.den)) {
+							frag_done = GF_TRUE;
+						}
+					} else {
 						frag_done = GF_TRUE;
 					}
+				} else if ((ctx->store==MP4MX_MODE_SFRAG) && sap && (sap<GF_FILTER_SAP_3)) {
+					if (ctx->sfrag_tolerance) {
+						//get diff in source timescale to avoid rounding at low res
+						s32 diff = gf_timestamp_rescale(ctx->adjusted_next_frag_start, ctx->cdur.den, tkw->src_timescale);
+						diff -= check_ts;
+						if (diff<0) diff = -1;
+						//check tolerance in cdur timescale
+						diff = gf_timestamp_rescale(diff, tkw->src_timescale, ctx->cdur.den);
+						if (diff * 100 < ctx->sfrag_tolerance * ctx->cdur.num) {
+							frag_done = GF_TRUE;
+						}
+					} else {
+						if (gf_timestamp_greater_or_equal(check_ts, tkw->src_timescale, ctx->adjusted_next_frag_start, ctx->cdur.den)) {
+							frag_done = GF_TRUE;
+						}
+					}
 				}
 				if (frag_done) {
 					ctx->adjusted_next_frag_start = gf_timestamp_rescale(check_ts, tkw->src_timescale, ctx->cdur.den);
@@ -8080,6 +8099,9 @@ static GF_Err mp4_mux_initialize(GF_Filter *filter)
 	gf_filter_set_max_extra_input_pids(filter, -1);
 	ctx->filter = filter;
 	time_t current_time =time(NULL);
+	if (ctx->sfrag_tolerance)
+		ctx->store = MP4MX_MODE_SFRAG;
+
 	ctx->id3_id_sequence=(long)current_time;
 #ifdef GPAC_DISABLE_ISOM_FRAGMENTS
 	if (ctx->store>=MP4MX_MODE_FRAG) {
@@ -8799,6 +8821,7 @@ static const GF_FilterArgs MP4MuxArgs[] =
 	"- tiny: enabled and write reduced version if profile known and compatible", GF_PROP_UINT, "prof", "off|gen|prof|tiny", GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(trunv1), "force using version 1 of trun regardless of media type or CMAF brand", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(rsot), "inject redundant sample timing information when present", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(sfrag_tolerance), "start fragment on SAP if previous fragment is not shorter than the indicated percentage of cdur", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_EXPERT},
 	{0}
 };
 
@@ -8817,7 +8840,10 @@ GF_FilterRegister MP4MuxRegister = {
 	"EX gpac -i source.jpg:#ItemID=1 -o file.mp4\n"
 	"  \n"
 	"# Storage\n"
-	"The [-store]() option allows controlling if the file is fragmented or not, and when not fragmented, how interleaving is done. For cases where disk requirements are tight and fragmentation cannot be used, it is recommended to use either `flat` or `fstart` modes.\n"
+	"The [-store]() option allows controlling if the file is fragmented (`frag`) or not, and when not fragmented, how interleaving (`inter`) is done.\n"
+	"For cases where disk requirements are tight and fragmentation cannot be used, it is recommended to use either `flat` or `fstart` (fast-start) modes.\n"
+	"`sfrag` mode is similar `frag` mode but aligns fragments on SAP samples. It is implied when using `sfrag_tolerance`.\n"
+	"`sfrag_tolerance` is expressed as a percentage of the fragment duration (`cdur`). It allows to modulate the fragment durations while keeping the same number of fragments per segment. This is useful to align fragments on randomly placed SAP samples (typically scene-cuts or events).\n"
 	"  \n"
 	"The [-vodcache]() option allows controlling how DASH onDemand segments are generated:\n"
 	"- If set to `on`, file data is stored to a temporary file on disk and flushed upon completion, no padding is present.\n"
diff --git a/src/isomedia/box_code_base.c b/src/isomedia/box_code_base.c
@@ -14344,7 +14344,7 @@ GF_Err xtra_box_read(GF_Box *s, GF_BitStream *bs)
 		u32 prop_size = gf_bs_read_u32(bs);
 		tag_size-=8;
 
-		if (prop_size>4) {
+		if (prop_size>6 ) {
 			tag_size-=2;
 			prop_type = gf_bs_read_u16(bs);
 			prop_size -= 6;
diff --git a/src/jsmods/core.c b/src/jsmods/core.c
@@ -131,11 +131,11 @@ void gf_js_delete_context(JSContext *ctx)
 		}
 	}
 
-	rmt = (RMT_WS*) gf_sys_get_userws();
-	if (rmt) {
-		JS_Sys_Task* task = (JS_Sys_Task*) gf_rmt_get_on_new_client_task(rmt);
+	RMT_WS* urmt = (RMT_WS*) gf_sys_get_userws();
+	if (urmt) {
+		JS_Sys_Task* task = (JS_Sys_Task*) gf_rmt_get_on_new_client_task(urmt);
 		if (task && task->type == RMT_CALLBACK_JS) {
-			gf_rmt_set_on_new_client_cbk(rmt, NULL, NULL);
+			gf_rmt_set_on_new_client_cbk(urmt, NULL, NULL);
 			JS_FreeValue(ctx, task->fun);
 			JS_FreeValue(ctx, task->_obj);
 			gf_free(task);
@@ -166,6 +166,8 @@ void gf_js_delete_runtime()
 		qjs_uninit_runtime_libc(js_rt->js_runtime);
 		JS_FreeRuntime(js_rt->js_runtime);
 		gf_list_del(js_rt->allocated_contexts);
+		if (js_rt->js_orig_logs) gf_free(js_rt->js_orig_logs);
+		if (js_rt->js_log_buf) gf_free(js_rt->js_log_buf);
 		gf_mx_del(js_rt->mx);
 		gf_free(js_rt);
 		js_rt = NULL;
@@ -1025,17 +1027,17 @@ static void js_sys_rmt_client_gc_mark(JSRuntime *rt, JSValueConst val, JS_MarkFu
 	RMT_ClientCtx* client = JS_GetOpaque(val, js_sys_rmt_client_class_id);
 	if (!client) return;
 
-	JS_Sys_Task* task = gf_rmt_client_get_on_data_task(client);
-	if (task && task->type == RMT_CALLBACK_JS) {
-		JS_MarkValue(rt, task->fun, mark_func);
-		JS_MarkValue(rt, task->_obj, mark_func);
-	}
+	// JS_Sys_Task* task = gf_rmt_client_get_on_data_task(client);
+	// if (task && task->type == RMT_CALLBACK_JS) {
+	// 	JS_MarkValue(rt, task->fun, mark_func);
+	// 	JS_MarkValue(rt, task->_obj, mark_func);
+	// }
 
-	task = gf_rmt_client_get_on_del_task(client);
-	if (task && task->type == RMT_CALLBACK_JS) {
-		JS_MarkValue(rt, task->fun, mark_func);
-		JS_MarkValue(rt, task->_obj, mark_func);
-	}
+	// task = gf_rmt_client_get_on_del_task(client);
+	// if (task && task->type == RMT_CALLBACK_JS) {
+	// 	JS_MarkValue(rt, task->fun, mark_func);
+	// 	JS_MarkValue(rt, task->_obj, mark_func);
+	// }
 
 }
 
@@ -1497,6 +1499,7 @@ extern GF_Mutex *logs_mx;
 static void js_log_cbk(void *cbck, GF_LOG_Level log_level, GF_LOG_Tool log_tool, const char* fmt, va_list vlist)
 {
 	JSContext *ctx = js_rt->log_ctx;
+	if (!ctx) return;
 	JSValue args[5];
 	u32 nb_args = 3;
 	//in case mutex@debug is set, unlock logs mutex before locking JS runtime
@@ -2922,8 +2925,9 @@ static JSValue js_sys_set_logs(JSContext *ctx, JSValueConst this_val, int argc,
 	if (argc>1)
 		reset = JS_ToBool(ctx, argv[1]);
 
-	if (!js_rt->js_orig_logs)
+	if (!js_rt->js_orig_logs) {
 		js_rt->js_orig_logs = gf_log_get_tools_levels();
+	}
 
 	logs = JS_ToCString(ctx, argv[0]);
 	if (!logs) {
@@ -4327,8 +4331,8 @@ static JSValue fileio_constructor(JSContext *ctx, JSValueConst new_target, int a
 static void js_core_gc_mark(JSRuntime *rt, JSValueConst this_val, JS_MarkFunc *mark_func)
 {
 	if (js_rt->log_ctx) {
-		JS_MarkValue(rt, js_rt->log_fun, mark_func);
-		JS_MarkValue(rt, js_rt->log_obj, mark_func);
+		// JS_MarkValue(rt, js_rt->log_fun, mark_func);
+		// JS_MarkValue(rt, js_rt->log_obj, mark_func);
 	}
 }
 JSClassDef coreClass = {
diff --git a/src/media_tools/av_parsers.c b/src/media_tools/av_parsers.c
diff --git a/src/media_tools/avilib.c b/src/media_tools/avilib.c
diff --git a/src/media_tools/isom_tools.c b/src/media_tools/isom_tools.c
diff --git a/src/utils/xml_bin_custom.c b/src/utils/xml_bin_custom.c
diff --git a/testsuite b/testsuite

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ function JSClient(id, client) {`
`228`	`228`
`229`	`229`
`230`	`230`
`231`		`- return 5000;`
	`231`	`+ return 1000;`
`232`	`232`	`});`
`233`	`233`
`234`	`234`
Original file line number	Diff line number	Diff line change
`@@ -644,7 +644,9 @@ JSValue jsf_NewProp(JSContext ctx, const GF_PropertyValue new_val)`
`644`	`644`
`645`	`645`	`default:`
`646`	`646`	`if (gf_props_type_is_enum(new_val->type)) {`
`647`		`- return JS_NewString(ctx, gf_props_enum_name(new_val->type, new_val->value.uint));`
	`647`	`+ const char* enum_name = gf_props_enum_name(new_val->type, new_val->value.uint);`
	`648`	`+ if (enum_name)`
	`649`	`+ return JS_NewString(ctx, enum_name);`
`648`	`650`	`}`
`649`	`651`	`return JS_NULL;`
`650`	`652`	`}`
Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ static GF_Err svgin_process(GF_Filter *filter)`
`205`	`205`	`size = gf_bs_read_u32(bs);`
`206`	`206`	`nb_bytes = 6;`
`207`	`207`	`}`
`208`		`- if (pos+nb_bytes+size >= pck_size) {`
	`208`	`+ if (pos+nb_bytes+size > pck_size) {`
`209`	`209`	`e = GF_NON_COMPLIANT_BITSTREAM;`
`210`	`210`	`break;`
`211`	`211`	`}`