Skip to content

upipe_ts_demux: fix EMM support #1162

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

Merged
cmassiot merged 3 commits into from
Apr 23, 2026
Merged

upipe_ts_demux: fix EMM support #1162

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c7687a
upipe_ts_demux: fix error code for EMM controls
quarium Apr 22, 2026
d8d68c0
upipe_ts_demux: fix compilation without EMM support
quarium Apr 22, 2026
0572920
upipe_ts_demux: fix EMM subpipe release on error
quarium Apr 22, 2026
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
10 changes: 7 additions & 3 deletions lib/upipe-ts/upipe_ts_demux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3330,7 +3330,8 @@ static void upipe_ts_demux_emm_no_input(struct upipe *upipe)

struct upipe_ts_demux_psi_pid *psi_pid = upipe_ts_demux_emm->psi_pid_emm;
upipe_ts_demux_emm->psi_pid_emm = NULL;
upipe_ts_demux_psi_pid_release(psi_pid);
if (psi_pid)
upipe_ts_demux_psi_pid_release(psi_pid);

upipe_ts_demux_emm_clean_emmd(upipe);
upipe_ts_demux_emm_clean_psi_split_output_emm(upipe);
Expand Down Expand Up @@ -3368,15 +3369,18 @@ static void upipe_ts_demux_emm_free(struct upipe *upipe)
static int upipe_ts_demux_emm_control(struct upipe *upipe, int command,
va_list args)
{
struct upipe_ts_demux_emm *emm = upipe_ts_demux_emm_from_upipe(upipe);
UBASE_HANDLED_RETURN(
upipe_ts_demux_emm_control_super(upipe, command, args));

#ifdef HAVE_TS_CRYPT
struct upipe_ts_demux_emm *emm = upipe_ts_demux_emm_from_upipe(upipe);

switch (command) {
case UPIPE_TS_EMM_SET_PRIVATE_KEY:
return upipe_control_va(emm->emmd, command, args);
}
return UBASE_ERR_NONE;
#endif
return UBASE_ERR_UNHANDLED;
}


Expand Down
Loading