fixed typos

gpac · Apr 5, 2024 · 37f91ce · 37f91ce
1 parent 218ed19
commit 37f91ce
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/share/doc/man/gpac.1 b/share/doc/man/gpac.1
@@ -306,7 +306,7 @@ The following libgpac core options allow customizing the filter session:
 .TP
 .B \-dbg-edges
 .br
-log edges status in filter graph before dijkstra resolution (for debug). Edges are logged as edge_source(status, weight, src_cap_idx, dst_cap_idx)
+log edges status in filter graph before dijkstra resolution (for debug). Edges are logged as edge_source(status(disable_depth), weight, src_cap_idx -> dst_cap_idx)
 .br
 .TP
 .B \-full-link
@@ -1064,7 +1064,7 @@ enable intermediate copy of data in nghttp2 (default is disabled but may report
 .TP
 .B \-dbg-edges
 .br
-log edges status in filter graph before dijkstra resolution (for debug). Edges are logged as edge_source(status, weight, src_cap_idx, dst_cap_idx)
+log edges status in filter graph before dijkstra resolution (for debug). Edges are logged as edge_source(status(disable_depth), weight, src_cap_idx -> dst_cap_idx)
 .br
 .TP
 .B \-full-link

diff --git a/src/filter_core/filter_pid.c b/src/filter_core/filter_pid.c
@@ -3062,13 +3062,13 @@ void gf_filter_sess_reset_graph(GF_FilterSession *fsess, const GF_FilterRegister
 }
 
 #ifndef GPAC_DISABLE_LOG
-void dump_dijstra_edges(Bool is_before, GF_FilterRegDesc *reg_dst, GF_List *dijkstra_nodes)
+void dump_graph_edges(Bool is_before, GF_FilterRegDesc *reg_dst, GF_List *dijkstra_nodes)
 {
 	u32 i, count;
 	if (! gf_log_tool_level_on(GF_LOG_FILTER, GF_LOG_DEBUG))
 		return;
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Dijstra edges %s edge solving\n", is_before ? "before" : "after"));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Graph edges %s solving\n", is_before ? "before" : "after"));
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s sources: ", reg_dst->freg->name));
 	for (i=0; i<reg_dst->nb_edges; i++) {
@@ -3261,7 +3261,7 @@ static void gf_filter_pid_resolve_link_dijkstra(GF_FilterPid *pid, GF_Filter *ds
 
 #ifndef GPAC_DISABLE_LOG
 	if (fsess->flags & GF_FS_FLAG_PRINT_CONNECTIONS) {
-		dump_dijstra_edges(GF_TRUE, reg_dst, dijkstra_nodes);
+		dump_graph_edges(GF_TRUE, reg_dst, dijkstra_nodes);
 	}
 #endif
 
@@ -3314,7 +3314,7 @@ static void gf_filter_pid_resolve_link_dijkstra(GF_FilterPid *pid, GF_Filter *ds
 
 #ifndef GPAC_DISABLE_LOG
 	if (fsess->flags & GF_FS_FLAG_PRINT_CONNECTIONS) {
-		dump_dijstra_edges(GF_FALSE, reg_dst, dijkstra_nodes);
+		dump_graph_edges(GF_FALSE, reg_dst, dijkstra_nodes);
 	}
 #endif
 

diff --git a/src/filter_core/filter_session.c b/src/filter_core/filter_session.c
@@ -2771,7 +2771,6 @@ static void gf_fs_print_filter_outputs(GF_Filter *f, GF_List *filters_done, u32
 			GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("-"));
 			i++;
 		}
-
 		if (src_num_tiled_pids>1) {
 			GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("(tilePID[%d]) ", src_num_tiled_pids));
 		}
@@ -2833,6 +2832,8 @@ static void gf_fs_print_filter_outputs(GF_Filter *f, GF_List *filters_done, u32
 		}
 		GF_LOG(GF_LOG_INFO, GF_LOG_APP, (")\n"));
 	}
+	if (f->num_output_pids<=1)
+		src_num_tiled_pids = 0;
 
 	GF_List *dests = gf_list_new();
 	for (i=0; i<f->num_output_pids; i++) {

diff --git a/src/utils/os_config_init.c b/src/utils/os_config_init.c
@@ -1463,7 +1463,7 @@ GF_GPACArg GPAC_Args[] = {
  GF_DEF_ARG("h2-copy", NULL, "enable intermediate copy of data in nghttp2 (default is disabled but may report as broken frames in wireshark)", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_HTTP),
 #endif
 
- GF_DEF_ARG("dbg-edges", NULL, "log edges status in filter graph before dijkstra resolution (for debug). Edges are logged as edge_source(status, weight, src_cap_idx, dst_cap_idx)", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_FILTERS),
+ GF_DEF_ARG("dbg-edges", NULL, "log edges status in filter graph before dijkstra resolution (for debug). Edges are logged as edge_source(status(disable_depth), weight, src_cap_idx -> dst_cap_idx)", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_FILTERS),
  GF_DEF_ARG("full-link", NULL, "throw error if any PID in the filter graph cannot be linked", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_FILTERS),
  GF_DEF_ARG("no-dynf", NULL, "disable dynamically loaded filters", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_FILTERS),