From e60a6416031bbe83e7a929e47f8d1ed1018b9fea Mon Sep 17 00:00:00 2001 From: Romain Bouqueau Date: Wed, 15 May 2024 20:59:58 -0400 Subject: [PATCH] cosmetics --- src/compositor/compositor_2d.c | 2 +- src/filter_core/filter_session.c | 4 ++-- src/filters/out_sock.c | 2 +- src/filters/reframer.c | 2 +- src/jsmods/scene_js.c | 2 +- src/media_tools/dash_client.c | 6 +++--- src/utils/os_net.c | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/compositor/compositor_2d.c b/src/compositor/compositor_2d.c index c3f867b92f..a4bcad8350 100644 --- a/src/compositor/compositor_2d.c +++ b/src/compositor/compositor_2d.c @@ -728,7 +728,7 @@ static Bool compositor_2d_draw_bitmap_ex(GF_VisualManager *visual, GF_TextureHan } video_src.global_alpha = alpha; - //overlay queing + //overlay queuing if (overlay_type==2) { GF_IRect o_rc; GF_OverlayStack *ol, *first; diff --git a/src/filter_core/filter_session.c b/src/filter_core/filter_session.c index 419796ca9b..79f0d383c5 100644 --- a/src/filter_core/filter_session.c +++ b/src/filter_core/filter_session.c @@ -969,7 +969,7 @@ void gf_fs_post_task_ex(GF_FilterSession *fsess, gf_fs_task_callback task_fun, G /*this was a gf_filter_process_task request but direct call could not be done or requeue is requested. process_task_queued was incremented by caller without checking for existing process task - If the task was not treated, dec / inc will give the same state, undo process_task_queued increment - - If the task was requeued, dec will undo the increment done when requeing the task in gf_filter_check_pending_tasks + - If the task was requeued, dec will undo the increment done when requeuing the task in gf_filter_check_pending_tasks In both cases, inc will redo the same logic as in gf_filter_post_process_task_internal, not creating task if gf_filter_process_task is already scheduled for the filter @@ -2214,7 +2214,7 @@ static u32 gf_fs_thread_proc(GF_SessionThread *sess_thread) //requeue task gf_fq_add(current_filter->tasks, task); - //ans swap task for later requeing + //ans swap task for later requeuing if (next_task) task = next_task; } //otherwise (can't swap) keep task first in the list diff --git a/src/filters/out_sock.c b/src/filters/out_sock.c index 38257830f1..55e737e214 100644 --- a/src/filters/out_sock.c +++ b/src/filters/out_sock.c @@ -163,7 +163,7 @@ static GF_Err sockout_initialize(GF_Filter *filter) } gf_filter_override_caps(filter, ctx->in_caps, 2); - /*create our ourput socket*/ + /*create our output socket*/ if (!strnicmp(ctx->dst, "udp://", 6)) { sock_type = GF_SOCK_TYPE_UDP; diff --git a/src/filters/reframer.c b/src/filters/reframer.c index 2aa85717ba..f582fbd22b 100644 --- a/src/filters/reframer.c +++ b/src/filters/reframer.c @@ -2005,7 +2005,7 @@ GF_Err reframer_process(GF_Filter *filter) //time-based extraction or dur split, try to clone packet if (st->can_split && !ctx->start_frame_idx_plus_one) { if (gf_timestamp_less(ts, st->timescale, ctx->cur_end.num, ctx->cur_end.den)) { - //force enqueing this packet + //force enqueuing this packet enqueue = GF_TRUE; st->split_end = (u32) ( (ctx->cur_end.num * st->timescale) / ctx->cur_end.den - ts); st->range_end_reached_ts += st->split_end; diff --git a/src/jsmods/scene_js.c b/src/jsmods/scene_js.c index 5de6184d8b..378e0b460c 100644 --- a/src/jsmods/scene_js.c +++ b/src/jsmods/scene_js.c @@ -1579,7 +1579,7 @@ static Bool gjs_event_filter(void *udta, GF_Event *evt, Bool consumed_by_composi evt_clone = gf_malloc(sizeof(GF_Event)); memcpy(evt_clone, evt, sizeof(GF_Event)); gf_list_add(sjs->event_queue, evt_clone); - GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[SCENEJS] Couldn't lock % mutex, queing event\n", (lock_fail==2) ? "JavaScript" : "Compositor")); + GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[SCENEJS] Couldn't lock % mutex, queuing event\n", (lock_fail==2) ? "JavaScript" : "Compositor")); gf_mx_v(sjs->event_mx); if (lock_fail==2){ diff --git a/src/media_tools/dash_client.c b/src/media_tools/dash_client.c index f7141c352e..e328fbd74e 100644 --- a/src/media_tools/dash_client.c +++ b/src/media_tools/dash_client.c @@ -7275,11 +7275,11 @@ static DownloadGroupStatus dash_download_group_download(GF_DashClient *dash, GF_ #ifndef GPAC_DISABLE_LOG if (gf_log_tool_level_on(GF_LOG_DASH, GF_LOG_INFO)) { if (llhls_live_edge_type==2) { - GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Queing next segment: %s (live edge merged range: "LLU" -> END)\n", gf_file_basename(new_base_seg_url), start_range)); + GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Queuing next segment: %s (live edge merged range: "LLU" -> END)\n", gf_file_basename(new_base_seg_url), start_range)); } else if (use_byterange) { - GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Queing next %s: %s (range: "LLU" -> "LLU")\n", (llhls_live_edge_type==1) ? "LL-HLS part" : "segment", gf_file_basename(new_base_seg_url), start_range, end_range)); + GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Queuing next %s: %s (range: "LLU" -> "LLU")\n", (llhls_live_edge_type==1) ? "LL-HLS part" : "segment", gf_file_basename(new_base_seg_url), start_range, end_range)); } else { - GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Queing next %s: %s\n", (llhls_live_edge_type==1) ? "LL-HLS part" : "segment", gf_file_basename(new_base_seg_url))); + GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Queuing next %s: %s\n", (llhls_live_edge_type==1) ? "LL-HLS part" : "segment", gf_file_basename(new_base_seg_url))); } } #endif diff --git a/src/utils/os_net.c b/src/utils/os_net.c index 53ec07878e..d8f1938fb4 100644 --- a/src/utils/os_net.c +++ b/src/utils/os_net.c @@ -1516,7 +1516,7 @@ static Bool netcap_filter_pck(GF_Socket *sock, u32 pck_len, Bool for_send) } if ((r->patch_offset==-1) && !(sock->flags & GF_SOCK_IS_TCP)) { - GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[NetCap] Droping packet %d\n", cur_pck)); + GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[NetCap] Dropping packet %d\n", cur_pck)); return GF_TRUE; } u32 bo = (r->patch_offset>=0) ? r->patch_offset : gf_rand();