luajit: add support for flow_format helper

Author: nto

include/upipe/upipe_helper_flow_format.h

@@ -77,8 +77,8 @@ typedef int (*upipe_helper_flow_format_register)(struct upipe *,
  * Internal function called when the request is answered.
  *
  * @item @code
- *  int upipe_foo_require_flow_format(struct upipe *upipe,
- *                                    struct uref *flow_format)
+ *  void upipe_foo_require_flow_format(struct upipe *upipe,
+ *                                     struct uref *flow_format)
  * @end code
  * Initializes and registers the request to get a flow format. The base flow
  * format belongs to the callee and will be eventually freed.

luajit/upipe-helper.c

@@ -13,6 +13,7 @@
 #include "upipe/upipe_helper_sync.h"
 #include "upipe/upipe_helper_uref_stream.h"
 #include "upipe/upipe_helper_flow_def.h"
+#include "upipe/upipe_helper_flow_format.h"
 #include "upipe/upipe_helper_upump.h"
 
 struct upipe_helper_mgr {
@@ -24,10 +25,13 @@ struct upipe_helper_mgr {
     upipe_helper_uclock_check uclock_check;
 
     // uref_mgr
-    upipe_helper_uref_mgr_check uref_check;
+    upipe_helper_uref_mgr_check uref_mgr_check;
 
     // ubuf_mgr
-    upipe_helper_ubuf_mgr_check ubuf_check;
+    upipe_helper_ubuf_mgr_check ubuf_mgr_check;
+
+    // flow_format
+    upipe_helper_flow_format_check flow_format_check;
 
     // input
     bool (*output)(struct upipe *, struct uref *, struct upump **);
@@ -95,6 +99,9 @@ struct upipe_helper {
     struct uref *flow_def_input;
     struct uref *flow_def_attr;
 
+    // flow_format
+    struct urequest flow_format_request;
+
     // upump
     struct upump *upump;
 };
@@ -135,28 +142,39 @@ static int check_uclock(struct upipe *upipe, struct uref *uref)
     return UBASE_ERR_NONE;
 }
 
-static int check_uref(struct upipe *upipe, struct uref *uref)
+static int check_uref_mgr(struct upipe *upipe, struct uref *uref)
 {
     struct upipe_helper_mgr *mgr = upipe_helper_mgr(upipe);
 
-    if (mgr->uref_check != NULL)
-        return mgr->uref_check(upipe, uref);
+    if (mgr->uref_mgr_check != NULL)
+        return mgr->uref_mgr_check(upipe, uref);
 
     uref_free(uref);
     return UBASE_ERR_NONE;
 }
 
-static int check_ubuf(struct upipe *upipe, struct uref *uref)
+static int check_ubuf_mgr(struct upipe *upipe, struct uref *uref)
 {
     struct upipe_helper_mgr *mgr = upipe_helper_mgr(upipe);
 
-    if (mgr->ubuf_check != NULL)
-        return mgr->ubuf_check(upipe, uref);
+    if (mgr->ubuf_mgr_check != NULL)
+        return mgr->ubuf_mgr_check(upipe, uref);
 
     uref_free(uref);
     return UBASE_ERR_NONE;
 }
 
+static int check_flow_format(struct upipe *upipe, struct uref *flow_format)
+{
+    struct upipe_helper_mgr *mgr = upipe_helper_mgr(upipe);
+
+    if (mgr->flow_format_check != NULL)
+        return mgr->flow_format_check(upipe, flow_format);
+
+    uref_free(flow_format);
+    return UBASE_ERR_NONE;
+}
+
 static void append_cb(struct upipe *upipe)
 {
     struct upipe_helper_mgr *mgr = upipe_helper_mgr(upipe);
@@ -179,11 +197,11 @@ UPIPE_HELPER_UCLOCK(upipe_helper, uclock, uclock_request,
                     upipe_helper_unregister_output_request);
 UPIPE_HELPER_UPUMP_MGR(upipe_helper, upump_mgr);
 UPIPE_HELPER_UREF_MGR(upipe_helper, uref_mgr, uref_mgr_request,
-                      check_uref,
+                      check_uref_mgr,
                       upipe_helper_register_output_request,
                       upipe_helper_unregister_output_request);
 UPIPE_HELPER_UBUF_MGR(upipe_helper, ubuf_mgr, flow_format, ubuf_mgr_request,
-                      check_ubuf,
+                      check_ubuf_mgr,
                       upipe_helper_register_output_request,
                       upipe_helper_unregister_output_request);
 UPIPE_HELPER_INNER(upipe_helper, first_inner);
@@ -194,4 +212,8 @@ UPIPE_HELPER_SYNC(upipe_helper, acquired);
 UPIPE_HELPER_UREF_STREAM(upipe_helper, next_uref, next_uref_size, stream_urefs,
                          append_cb);
 UPIPE_HELPER_FLOW_DEF(upipe_helper, flow_def_input, flow_def_attr);
+UPIPE_HELPER_FLOW_FORMAT(upipe_helper, flow_format_request,
+                         check_flow_format,
+                         upipe_helper_register_output_request,
+                         upipe_helper_unregister_output_request);
 UPIPE_HELPER_UPUMP(upipe_helper, upump, upump_mgr);

luajit/upipe.lua

@@ -603,10 +603,24 @@ local function control_args(cmd, args)
     return va_args(args, unpack(ctrl_args[cmd]))
 end
 
+local function wrap_check(f)
+    if not f then return end
+    return wrap_traceback(function (...)
+        return ubase_err(f(...))
+    end)
+end
+
 local function upipe_helper_alloc(cb)
     local ct = ffi.typeof("struct upipe_helper_mgr")
     local h_mgr = ffi.cast(ffi.typeof("$ *", ct), C.calloc(1, ffi.sizeof(ct)))
 
+    if cb.check then
+        h_mgr.uclock_check = wrap_check(cb.check.uclock)
+        h_mgr.uref_mgr_check = wrap_check(cb.check.uref_mgr)
+        h_mgr.ubuf_mgr_check = wrap_check(cb.check.ubuf_mgr)
+        h_mgr.flow_format_check = wrap_check(cb.check.flow_format)
+    end
+
     if cb.input_output then
         h_mgr.output = cb.input_output
     end
@@ -634,6 +648,7 @@ local function upipe_helper_alloc(cb)
             pipe:helper_init_sync()
             pipe:helper_init_uref_stream()
             pipe:helper_init_flow_def()
+            pipe:helper_init_flow_format()
             pipe:helper_init_upump()
             props_init(pipe)
             pipe.props.helper = h_pipe
@@ -783,6 +798,7 @@ local function upipe_helper_alloc(cb)
         pipe:throw_dead()
         props[k] = nil
         pipe:helper_clean_upump()
+        pipe:helper_clean_flow_format()
         pipe:helper_clean_flow_def()
         pipe:helper_clean_uref_stream()
         pipe:helper_clean_sync()
@@ -807,9 +823,11 @@ local function upipe_helper_alloc(cb)
         props_destroy(mgr)
         mgr.upipe_alloc:free()
         mgr.upipe_control:free()
-        if mgr.upipe_input ~= nil then
-            mgr.upipe_input:free()
-        end
+        if mgr.upipe_input ~= nil then mgr.upipe_input:free() end
+        if h_mgr.uclock_check ~= nil then h_mgr.uclock_check:free() end
+        if h_mgr.uref_mgr_check ~= nil then h_mgr.uref_mgr_check:free() end
+        if h_mgr.ubuf_mgr_check ~= nil then h_mgr.ubuf_mgr_check:free() end
+        if h_mgr.flow_format_check ~= nil then h_mgr.flow_format_check:free() end
         h_mgr.refcount_cb:free()
         refcount_cb:free()
         C.free(ffi.cast("void *", h_mgr))