Skip to content

upipe_s302_framer: add low latency output #745

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
JDarnley wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

upipe_s302_framer: add low latency output #745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3160815
upipe_s302_framer: add low latency output
JDarnley Aug 31, 2020
ccde69b
upipe_auto_framer: add set option command
JDarnley Sep 8, 2020
7ad87a7
upipe_auto_framer: add lowlatency option to be passed to inner pipe
JDarnley Sep 8, 2020
b6f1ea9
upipe_s302_framer: add lowlatency option
JDarnley Sep 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions include/upipe-framers/upipe_auto_framer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,12 @@ enum upipe_autof_mgr_command {
UPIPE_AUTOF_MGR_GET_SET_MGR(opusf, OPUSF)
UPIPE_AUTOF_MGR_GET_SET_MGR(s302f, S302F)
#undef UPIPE_AUTOF_MGR_GET_SET_MGR

/** gets a string option (const char *, const char **) */
//UPIPE_AUTOF_MGR_GET_OPTION,
/** sets a string option (const char *, const char *) */
UPIPE_AUTOF_MGR_SET_OPTION,

};

/** @hidden */
Expand Down Expand Up @@ -106,6 +112,13 @@ UPIPE_AUTOF_MGR_GET_SET_MGR2(opusf, OPUSF)
UPIPE_AUTOF_MGR_GET_SET_MGR2(s302f, S302F)
#undef UPIPE_AUTOF_MGR_GET_SET_MGR2

static inline int upipe_autof_mgr_set_option(struct upipe_mgr *mgr,
const char *option, const char *value)
{
return upipe_mgr_control(mgr, UPIPE_AUTOF_MGR_SET_OPTION,
UPIPE_AUTOF_SIGNATURE, option, value);
}

#ifdef __cplusplus
}
#endif
Expand Down
31 changes: 31 additions & 0 deletions lib/upipe-framers/upipe_auto_framer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ struct upipe_autof_mgr {

/** public upipe_mgr structure */
struct upipe_mgr mgr;

bool lowlatency;
};

UBASE_FROM_TO(upipe_autof_mgr, upipe_mgr, upipe_mgr, mgr)
Expand Down Expand Up @@ -287,6 +289,12 @@ static int upipe_autof_set_flow_def(struct upipe *upipe, struct uref *flow_def)
return UBASE_ERR_UNHANDLED;
}

struct upipe_autof_mgr *autof_mgr = upipe_autof_mgr_from_upipe_mgr(upipe->mgr);

if (autof_mgr->lowlatency)
if (unlikely(!ubase_check(upipe_set_option(inner, "lowlatency", "1"))))
upipe_warn(upipe, "couldn't set lowlatency option on inner pipe");

upipe_autof_store_bin_input(upipe, upipe_use(inner));
upipe_autof_store_bin_output(upipe, inner);
return UBASE_ERR_NONE;
Expand Down Expand Up @@ -369,6 +377,21 @@ static void upipe_autof_mgr_free(struct urefcount *urefcount)
free(autof_mgr);
}

static int set_option(struct upipe_autof_mgr *autof_mgr,
const char *option, const char *value)
{
if (!option || !value)
return UBASE_ERR_INVALID;

if (!strcmp(option, "lowlatency")) {
autof_mgr->lowlatency = !!atoi(value);
return UBASE_ERR_NONE;
}

/* TODO: print error somehow. */
return UBASE_ERR_INVALID;
}

/** @This processes control commands on an autof manager.
*
* @param mgr pointer to manager
Expand Down Expand Up @@ -411,6 +434,13 @@ static int upipe_autof_mgr_control(struct upipe_mgr *mgr,
GET_SET_MGR(s302f, S302F)
#undef GET_SET_MGR

case UPIPE_AUTOF_MGR_SET_OPTION: {
UBASE_SIGNATURE_CHECK(args, UPIPE_AUTOF_SIGNATURE);
const char *option = va_arg(args, const char *);
const char *value = va_arg(args, const char *);
return set_option(autof_mgr, option, value);
}

default:
return UBASE_ERR_UNHANDLED;
}
Expand Down Expand Up @@ -446,5 +476,6 @@ struct upipe_mgr *upipe_autof_mgr_alloc(void)
autof_mgr->mgr.upipe_input = upipe_autof_bin_input;
autof_mgr->mgr.upipe_control = upipe_autof_control;
autof_mgr->mgr.upipe_mgr_control = upipe_autof_mgr_control;
autof_mgr->lowlatency = false;
return upipe_autof_mgr_to_upipe_mgr(autof_mgr);
}
Loading