From 399bb3bf2202bce1ea4ae7cbb44ca223f4edbff4 Mon Sep 17 00:00:00 2001 From: Arnaud de Turckheim Date: Fri, 25 Sep 2026 11:32:40 +0200 Subject: [PATCH 1/4] frame: handle SIGINT/SIGTERM for clean exit --- examples/frame.c | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/examples/frame.c b/examples/frame.c index 0c7b89f44..82a7e4405 100644 --- a/examples/frame.c +++ b/examples/frame.c @@ -71,6 +71,7 @@ static enum uprobe_log_level uprobe_log_level = UPROBE_LOG_DEBUG; static struct uref_mgr *uref_mgr = NULL; static struct uclock *uclock = NULL; static struct uprobe *main_probe = NULL; +static struct upipe *upipe_src = NULL; static unsigned additional_framer = 0; static bool decode = false; static bool dump_date = false; @@ -508,6 +509,13 @@ static struct upipe *upipe_source_alloc(const char *uri, struct uprobe *uprobe) return upipe_src; } +static void stop(void) +{ + struct upipe *src = upipe_src; + upipe_src = NULL; + upipe_release(src); +} + static void usage(const char *name) { fprintf(stderr, "usage: %s [options] \n", name); @@ -522,6 +530,20 @@ static void usage(const char *name) } } +static void sighandler(struct upump *upump) +{ + static bool forced = false; + + if (forced) + exit(-1); + forced = true; + + int signal = (int)upump_get_opaque(upump, ptrdiff_t); + uprobe_err_va(main_probe, NULL, "signal %s received, exiting", + strsignal(signal)); + stop(); +} + int main(int argc, char *argv[]) { struct uchain *uchain, *uchain_tmp; @@ -632,7 +654,7 @@ int main(int argc, char *argv[]) } /* create source */ - struct upipe *upipe_src = upipe_source_alloc(source, uprobe); + upipe_src = upipe_source_alloc(source, uprobe); if (ts) { struct upipe_mgr *upipe_ts_demux_mgr = upipe_ts_demux_mgr_alloc(); @@ -700,9 +722,21 @@ int main(int argc, char *argv[]) upipe_release(upipe_null); } + struct upump *sigint_pump = upump_alloc_signal(upump_mgr, sighandler, + (void *)SIGINT, NULL, SIGINT); + upump_set_status(sigint_pump, false); + upump_start(sigint_pump); + struct upump *sigterm_pump = upump_alloc_signal(upump_mgr, sighandler, + (void *)SIGTERM, NULL, SIGTERM); + upump_set_status(sigterm_pump, false); + upump_start(sigterm_pump); + /* main loop */ upump_mgr_run(upump_mgr, NULL); + upump_free(sigterm_pump); + upump_free(sigint_pump); + ulist_delete_foreach(&es_list, uchain, uchain_tmp) { struct es *es = es_from_uchain(uchain); es_del(es); From d0e22c54bf4685f125f872d52e90c302b0d89440 Mon Sep 17 00:00:00 2001 From: Arnaud de Turckheim Date: Fri, 25 Sep 2026 11:33:14 +0200 Subject: [PATCH 2/4] frame: support HW decode --- examples/frame.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/examples/frame.c b/examples/frame.c index 82a7e4405..9aa6ab0ff 100644 --- a/examples/frame.c +++ b/examples/frame.c @@ -67,6 +67,8 @@ static const char *source = NULL; static const char *framer = "(none)"; +static const char *decode_hw_type = NULL; +static const char *decode_hw_device = NULL; static enum uprobe_log_level uprobe_log_level = UPROBE_LOG_DEBUG; static struct uref_mgr *uref_mgr = NULL; static struct uclock *uclock = NULL; @@ -95,6 +97,8 @@ enum { OPT_RANDOM, OPT_HEX, OPT_HEX_SIZE, + OPT_DECODE_HW_TYPE, + OPT_DECODE_HW_DEVICE, }; static struct option options[] = { @@ -112,6 +116,8 @@ static struct option options[] = { { "random", no_argument, NULL, OPT_RANDOM }, { "hex", no_argument, NULL, OPT_HEX}, { "hex-size", required_argument, NULL, OPT_HEX_SIZE }, + { "decode-hw-type", required_argument, NULL, OPT_DECODE_HW_TYPE }, + { "decode-hw-device", required_argument, NULL, OPT_DECODE_HW_DEVICE }, { NULL, 0, NULL, 0 }, }; @@ -301,6 +307,10 @@ static int catch_es(struct uprobe *uprobe, struct upipe *upipe, if (!strcmp(framer, "video")) { upipe_set_option(upipe, "threads", "auto"); upipe_set_option(upipe, "ec", "1"); + if (decode_hw_type) { + ubase_assert(upipe_avcdec_set_hw_config( + upipe, decode_hw_type, decode_hw_device)); + } } upipe = upipe_void_chain_output( @@ -614,6 +624,14 @@ int main(int argc, char *argv[]) dump_hex_size = atoi(optarg); break; + case OPT_DECODE_HW_TYPE: + decode_hw_type = optarg; + break; + + case OPT_DECODE_HW_DEVICE: + decode_hw_device = optarg; + break; + default: fprintf(stderr, "unknown option -%c\n", opt); break; From 93dbc7586c8f25320b4ce4831798f2e85b0603d2 Mon Sep 17 00:00:00 2001 From: Arnaud de Turckheim Date: Fri, 25 Sep 2026 15:37:38 +0200 Subject: [PATCH 3/4] frame: support decode for ES --- examples/frame.c | 42 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/examples/frame.c b/examples/frame.c index 9aa6ab0ff..837a67ea6 100644 --- a/examples/frame.c +++ b/examples/frame.c @@ -304,7 +304,8 @@ static int catch_es(struct uprobe *uprobe, struct upipe *upipe, assert(upipe); upipe_mgr_release(upipe_fdec_mgr); - if (!strcmp(framer, "video")) { + if (!strcmp(framer, "video") || !strcmp(framer, "h264") || + !strcmp(framer, "h265")) { upipe_set_option(upipe, "threads", "auto"); upipe_set_option(upipe, "ec", "1"); if (decode_hw_type) { @@ -727,6 +728,41 @@ int main(int argc, char *argv[]) upipe_mgr_release(upipe_framer_mgr); upipe_set_output(upipe_src, upipe_framer); + struct upipe *upipe = upipe_framer; + + if (decode) { + struct upipe_mgr *upipe_fdec_mgr = upipe_fdec_mgr_alloc(); + struct upipe_mgr *upipe_avcdec_mgr = upipe_avcdec_mgr_alloc(); + upipe_fdec_mgr_set_avcdec_mgr(upipe_fdec_mgr, upipe_avcdec_mgr); + upipe_mgr_release(upipe_avcdec_mgr); + + upipe = upipe_void_chain_output(upipe, upipe_fdec_mgr, + uprobe_pfx_alloc(uprobe_use(uprobe), + UPROBE_LOG_VERBOSE, + "fdec")); + assert(upipe); + upipe_mgr_release(upipe_fdec_mgr); + + if (!strcmp(framer, "video") || !strcmp(framer, "h264") || + !strcmp(framer, "h265")) { + upipe_set_option(upipe, "threads", "auto"); + upipe_set_option(upipe, "ec", "1"); + if (decode_hw_type && decode_hw_device) { + ubase_assert(upipe_avcdec_set_hw_config( + upipe, decode_hw_type, decode_hw_device)); + } + } + + struct upipe_mgr *upipe_probe_uref_mgr = + upipe_probe_uref_mgr_alloc(); + upipe = upipe_void_chain_output( + upipe, upipe_probe_uref_mgr, + uprobe_pfx_alloc(uprobe_alloc(catch_uref, uprobe_use(uprobe)), + UPROBE_LOG_VERBOSE, "probe dec")); + assert(upipe); + upipe_mgr_release(upipe_probe_uref_mgr); + } + struct upipe_mgr *upipe_null_mgr = upipe_null_mgr_alloc(); assert(upipe_null_mgr); struct upipe *upipe_null = upipe_void_alloc( @@ -735,8 +771,8 @@ int main(int argc, char *argv[]) uprobe_use(uprobe), UPROBE_LOG_VERBOSE, "null")); upipe_mgr_release(upipe_null_mgr); - upipe_set_output(upipe_framer, upipe_null); - upipe_release(upipe_framer); + upipe_set_output(upipe, upipe_null); + upipe_release(upipe); upipe_release(upipe_null); } From 8d54277294e362bb131a5cf4dcddd2842c5973c8 Mon Sep 17 00:00:00 2001 From: Arnaud de Turckheim Date: Mon, 28 Sep 2026 10:34:54 +0200 Subject: [PATCH 4/4] frame: improve --- examples/frame.c | 275 ++++++++++++++++++++--------------------------- 1 file changed, 118 insertions(+), 157 deletions(-) diff --git a/examples/frame.c b/examples/frame.c index 837a67ea6..2768d204a 100644 --- a/examples/frame.c +++ b/examples/frame.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -66,7 +67,7 @@ } while (0) static const char *source = NULL; -static const char *framer = "(none)"; +static const char *framer = NULL; static const char *decode_hw_type = NULL; static const char *decode_hw_device = NULL; static enum uprobe_log_level uprobe_log_level = UPROBE_LOG_DEBUG; @@ -200,12 +201,13 @@ static int catch_uref(struct uprobe *uprobe, struct upipe *upipe, size_t size = 0, vsize = 0; uint8_t sample_size = 0; if (ubase_check(uref_block_size(uref, &size))) - upipe_dbg_va(upipe, "block size %zu", size); + upipe_info_va(upipe, "block size %zu", size); else if (ubase_check(uref_sound_size(uref, &size, &sample_size))) - upipe_dbg_va(upipe, "sound size %zu (sample %u)", size, sample_size); + upipe_info_va(upipe, "sound size %zu (sample %u)", size, + sample_size); else if (ubase_check(uref_pic_size(uref, &size, &vsize, &sample_size))) - upipe_dbg_va(upipe, "pic size %zux%zu (sample %u)", - size, vsize, sample_size); + upipe_info_va(upipe, "pic size %zux%zu (sample %u)", size, vsize, + sample_size); } if (dump_hex) { @@ -250,6 +252,102 @@ static int catch_uref(struct uprobe *uprobe, struct upipe *upipe, return UBASE_ERR_NONE; } +static void build_sink(struct upipe *upipe, struct uprobe *uprobe, + struct uref *flow_def) +{ + + struct upipe_mgr *upipe_probe_uref_mgr = upipe_probe_uref_mgr_alloc(); + struct upipe_mgr *upipe_null_mgr = upipe_null_mgr_alloc(); + + const char *def = NULL; + ubase_assert(uref_flow_get_def(flow_def, &def)); + + upipe = upipe_void_alloc_output( + upipe, upipe_probe_uref_mgr, + uprobe_pfx_alloc(uprobe_alloc(catch_uref, uprobe_use(uprobe)), + UPROBE_LOG_VERBOSE, "probe in")); + assert(upipe); + + struct upipe_mgr *upipe_framer_mgr = NULL; + if (!framer) { + upipe_framer_mgr = upipe_autof_mgr_alloc(); + } else if (!strcmp(framer, "mpga")) { + upipe_framer_mgr = upipe_mpgaf_mgr_alloc(); + } else if (!strcmp(framer, "h264")) { + upipe_framer_mgr = upipe_h264f_mgr_alloc(); + } else if (!strcmp(framer, "h265")) { + upipe_framer_mgr = upipe_h265f_mgr_alloc(); + } else if (!strcmp(framer, "dvbsub")) { + upipe_framer_mgr = upipe_dvbsubf_mgr_alloc(); + } else { + uprobe_err_va(main_probe, NULL, "unsupported framer %s", framer); + exit(-1); + } + + upipe = upipe_void_chain_output( + upipe, upipe_framer_mgr, + uprobe_pfx_alloc_va(uprobe_use(uprobe), UPROBE_LOG_VERBOSE, "framer")); + assert(upipe); + + upipe = upipe_void_chain_output( + upipe, upipe_probe_uref_mgr, + uprobe_pfx_alloc_va(uprobe_alloc(catch_uref, uprobe_use(uprobe)), + UPROBE_LOG_VERBOSE, "probe frame")); + assert(upipe); + + for (unsigned i = 0; i < additional_framer; i++) { + upipe = upipe_void_chain_output(upipe, upipe_framer_mgr, + uprobe_pfx_alloc_va(uprobe_use(uprobe), + UPROBE_LOG_VERBOSE, + "framer %u", i)); + assert(upipe); + + upipe = upipe_void_chain_output( + upipe, upipe_probe_uref_mgr, + uprobe_pfx_alloc_va(uprobe_alloc(catch_uref, uprobe_use(uprobe)), + UPROBE_LOG_VERBOSE, "probe frame %u", i)); + assert(upipe); + } + upipe_mgr_release(upipe_framer_mgr); + + if (decode) { + struct upipe_mgr *upipe_fdec_mgr = upipe_fdec_mgr_alloc(); + struct upipe_mgr *upipe_avcdec_mgr = upipe_avcdec_mgr_alloc(); + upipe_fdec_mgr_set_avcdec_mgr(upipe_fdec_mgr, upipe_avcdec_mgr); + upipe_mgr_release(upipe_avcdec_mgr); + + upipe = upipe_void_chain_output( + upipe, upipe_fdec_mgr, + uprobe_pfx_alloc(uprobe_use(uprobe), UPROBE_LOG_VERBOSE, "fdec")); + assert(upipe); + upipe_mgr_release(upipe_fdec_mgr); + + if (!strcmp(def, "block.h264") || !strcmp(def, "block.hevc")) { + upipe_set_option(upipe, "threads", "auto"); + upipe_set_option(upipe, "ec", "1"); + if (decode_hw_type) { + ubase_assert(upipe_avcdec_set_hw_config(upipe, decode_hw_type, + decode_hw_device)); + } + } + + upipe = upipe_void_chain_output( + upipe, upipe_probe_uref_mgr, + uprobe_pfx_alloc(uprobe_alloc(catch_uref, uprobe_use(uprobe)), + UPROBE_LOG_VERBOSE, "probe dec")); + assert(upipe); + } + + assert(upipe_null_mgr); + upipe = upipe_void_chain_output( + upipe, upipe_null_mgr, + uprobe_pfx_alloc(uprobe_use(uprobe), UPROBE_LOG_VERBOSE, "null")); + upipe_release(upipe); + + upipe_mgr_release(upipe_null_mgr); + upipe_mgr_release(upipe_probe_uref_mgr); +} + static int catch_es(struct uprobe *uprobe, struct upipe *upipe, int event, va_list args) { @@ -259,80 +357,10 @@ static int catch_es(struct uprobe *uprobe, struct upipe *upipe, case UPROBE_NEED_OUTPUT: { struct uref *flow_def = va_arg(args, struct uref *); + uint64_t id = 0; + uref_flow_get_id(flow_def, &id); uref_dump_notice(flow_def, uprobe); - - upipe_use(upipe); - - struct upipe_mgr *upipe_probe_uref_mgr = - upipe_probe_uref_mgr_alloc(); - upipe = upipe_void_chain_output( - upipe, upipe_probe_uref_mgr, - uprobe_pfx_alloc( - uprobe_alloc(catch_uref, uprobe_use(uprobe)), - UPROBE_LOG_VERBOSE, "probe")); - assert(upipe); - - struct upipe_mgr *upipe_autof_mgr = upipe_autof_mgr_alloc(); - for (unsigned i = 0; i < additional_framer; i++) { - upipe = upipe_void_chain_output( - upipe, upipe_autof_mgr, - uprobe_pfx_alloc_va( - uprobe_use(uprobe), - UPROBE_LOG_VERBOSE, "framer %u", i)); - assert(upipe); - - upipe = upipe_void_chain_output( - upipe, upipe_probe_uref_mgr, - uprobe_pfx_alloc_va( - uprobe_alloc(catch_uref, uprobe_use(uprobe)), - UPROBE_LOG_VERBOSE, "probe %u", i)); - assert(upipe); - } - upipe_mgr_release(upipe_autof_mgr); - - if (decode) { - struct upipe_mgr *upipe_fdec_mgr = upipe_fdec_mgr_alloc(); - struct upipe_mgr *upipe_avcdec_mgr = upipe_avcdec_mgr_alloc(); - upipe_fdec_mgr_set_avcdec_mgr(upipe_fdec_mgr, upipe_avcdec_mgr); - upipe_mgr_release(upipe_avcdec_mgr); - - upipe = upipe_void_chain_output( - upipe, upipe_fdec_mgr, - uprobe_pfx_alloc( - uprobe_use(uprobe), - UPROBE_LOG_VERBOSE, "fdec")); - assert(upipe); - upipe_mgr_release(upipe_fdec_mgr); - - if (!strcmp(framer, "video") || !strcmp(framer, "h264") || - !strcmp(framer, "h265")) { - upipe_set_option(upipe, "threads", "auto"); - upipe_set_option(upipe, "ec", "1"); - if (decode_hw_type) { - ubase_assert(upipe_avcdec_set_hw_config( - upipe, decode_hw_type, decode_hw_device)); - } - } - - upipe = upipe_void_chain_output( - upipe, upipe_probe_uref_mgr, - uprobe_pfx_alloc( - uprobe_alloc(catch_uref, uprobe_use(uprobe)), - UPROBE_LOG_VERBOSE, "probe dec")); - assert(upipe); - } - - struct upipe_mgr *upipe_null_mgr = upipe_null_mgr_alloc(); - assert(upipe_null_mgr); - upipe = upipe_void_chain_output( - upipe, upipe_null_mgr, - uprobe_pfx_alloc( - uprobe_use(uprobe), - UPROBE_LOG_VERBOSE, "null")); - upipe_mgr_release(upipe_null_mgr); - - upipe_mgr_release(upipe_probe_uref_mgr); - upipe_release(upipe); + build_sink(upipe, uprobe, flow_def); return UBASE_ERR_NONE; } default: @@ -699,81 +727,14 @@ int main(int argc, char *argv[]) upipe_release(demux); } else { - struct upipe_mgr *upipe_framer_mgr = NULL; - if (!strcmp(framer, "mpga")) { - upipe_framer_mgr = upipe_mpgaf_mgr_alloc(); - } - else if (!strcmp(framer, "h264")) { - upipe_framer_mgr = upipe_h264f_mgr_alloc(); - } - else if (!strcmp(framer, "h265")) { - upipe_framer_mgr = upipe_h265f_mgr_alloc(); - } - else if (!strcmp(framer, "dvbsub")) { - upipe_framer_mgr = upipe_dvbsubf_mgr_alloc(); - } - else { - uprobe_err_va(main_probe, NULL, "unsupported framer %s", framer); - exit(-1); - } - - assert(upipe_framer_mgr); - - struct upipe *upipe_framer = upipe_void_alloc( - upipe_framer_mgr, - uprobe_pfx_alloc( - uprobe_use(uprobe), - UPROBE_LOG_VERBOSE, framer)); - assert(upipe_framer); - upipe_mgr_release(upipe_framer_mgr); - upipe_set_output(upipe_src, upipe_framer); - - struct upipe *upipe = upipe_framer; - - if (decode) { - struct upipe_mgr *upipe_fdec_mgr = upipe_fdec_mgr_alloc(); - struct upipe_mgr *upipe_avcdec_mgr = upipe_avcdec_mgr_alloc(); - upipe_fdec_mgr_set_avcdec_mgr(upipe_fdec_mgr, upipe_avcdec_mgr); - upipe_mgr_release(upipe_avcdec_mgr); - - upipe = upipe_void_chain_output(upipe, upipe_fdec_mgr, - uprobe_pfx_alloc(uprobe_use(uprobe), - UPROBE_LOG_VERBOSE, - "fdec")); - assert(upipe); - upipe_mgr_release(upipe_fdec_mgr); - - if (!strcmp(framer, "video") || !strcmp(framer, "h264") || - !strcmp(framer, "h265")) { - upipe_set_option(upipe, "threads", "auto"); - upipe_set_option(upipe, "ec", "1"); - if (decode_hw_type && decode_hw_device) { - ubase_assert(upipe_avcdec_set_hw_config( - upipe, decode_hw_type, decode_hw_device)); - } - } - - struct upipe_mgr *upipe_probe_uref_mgr = - upipe_probe_uref_mgr_alloc(); - upipe = upipe_void_chain_output( - upipe, upipe_probe_uref_mgr, - uprobe_pfx_alloc(uprobe_alloc(catch_uref, uprobe_use(uprobe)), - UPROBE_LOG_VERBOSE, "probe dec")); - assert(upipe); - upipe_mgr_release(upipe_probe_uref_mgr); - } - - struct upipe_mgr *upipe_null_mgr = upipe_null_mgr_alloc(); - assert(upipe_null_mgr); - struct upipe *upipe_null = upipe_void_alloc( - upipe_null_mgr, - uprobe_pfx_alloc( - uprobe_use(uprobe), - UPROBE_LOG_VERBOSE, "null")); - upipe_mgr_release(upipe_null_mgr); - upipe_set_output(upipe, upipe_null); - upipe_release(upipe); - upipe_release(upipe_null); + struct upipe_mgr *upipe_idem_mgr = upipe_idem_mgr_alloc(); + assert(upipe_idem_mgr); + struct upipe *idem = upipe_void_alloc_output( + upipe_src, upipe_idem_mgr, + uprobe_pfx_alloc(uprobe_alloc(catch_es, uprobe_use(uprobe)), + UPROBE_LOG_VERBOSE, "idem")); + upipe_mgr_release(upipe_idem_mgr); + upipe_release(idem); } struct upump *sigint_pump = upump_alloc_signal(upump_mgr, sighandler, @@ -796,10 +757,6 @@ int main(int argc, char *argv[]) es_del(es); } - if (decode) { - upipe_av_clean(); - } - /* release probes, pipes and managers */ uprobe_release(uprobe); upipe_release(upipe_src); @@ -813,5 +770,9 @@ int main(int argc, char *argv[]) pid_del(pid); } + if (decode) { + upipe_av_clean(); + } + return 0; }