Skip to content

upipe-ts: use descl_each_desc macro #1114

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
merged 1 commit into from
Dec 3, 2025
Merged

upipe-ts: use descl_each_desc macro #1114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 4 additions & 10 deletions lib/upipe-ts/upipe_ts_cat_decoder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2018 Open Broadcast Systems Ltd
* Copyright (C) 2025 EasyTools
*
* Authors: Rafaël Carré
*
Expand Down Expand Up @@ -156,12 +157,9 @@ static void upipe_ts_catd_parse_bissca_descs(struct upipe *upipe,
struct uref *flow_def,
const uint8_t *descl, uint16_t desclength)
{
const uint8_t *desc;
int j = 0;
uint8_t esid_n = 0;
/* cast needed because biTStream expects an uint8_t * (but doesn't write
* to it */
while ((desc = descl_get_desc((uint8_t *)descl, desclength, j++)) != NULL) {

descl_each_desc(descl, desclength, desc) {
bool valid = true;
uint16_t length;
switch (desc_get_tag(desc)) {
Expand Down Expand Up @@ -202,11 +200,7 @@ static void upipe_ts_catd_parse_descs(struct upipe *upipe,
struct uref *flow_def,
const uint8_t *descl, uint16_t desclength)
{
const uint8_t *desc;
int j = 0;
/* cast needed because biTStream expects an uint8_t * (but doesn't write
* to it */
while ((desc = descl_get_desc((uint8_t *)descl, desclength, j++)) != NULL) {
descl_each_desc(descl, desclength, desc) {
bool valid = true;
bool copy = false;
switch (desc_get_tag(desc)) {
Expand Down
7 changes: 2 additions & 5 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 @@ -1632,12 +1632,9 @@ static void upipe_ts_catd_parse_bissca_descs(struct upipe *upipe,
struct uref *flow_def,
const uint8_t *descl, uint16_t desclength)
{
const uint8_t *desc;
int j = 0;
uint8_t esid_n = 0;
/* cast needed because biTStream expects an uint8_t * (but doesn't write
* to it */
while ((desc = descl_get_desc((uint8_t *)descl, desclength, j++)) != NULL) {

descl_each_desc(descl, desclength, desc) {
bool valid = true;
uint16_t length;
switch (desc_get_tag(desc)) {
Expand Down
8 changes: 2 additions & 6 deletions lib/upipe-ts/upipe_ts_eit_decoder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2015 OpenHeadend S.A.R.L.
* Copyright (C) 2025 EasyTools
*
* Authors: Christophe Massiot
*
Expand Down Expand Up @@ -262,12 +263,7 @@ static void upipe_ts_eitd_parse_descs(struct upipe *upipe,
struct uref *flow_def, uint64_t event,
const uint8_t *descl, uint16_t desclength)
{
const uint8_t *desc;
int j = 0;

/* cast needed because biTStream expects an uint8_t * (but doesn't write
* to it */
while ((desc = descl_get_desc((uint8_t *)descl, desclength, j++)) != NULL) {
descl_each_desc(descl, desclength, desc) {
bool valid = true;
bool copy = false;
switch (desc_get_tag(desc)) {
Expand Down
19 changes: 4 additions & 15 deletions lib/upipe-ts/upipe_ts_emm_decoder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2018 Open Broadcast Systems Ltd
* Copyright (C) 2025 EasyTools
*
* Authors: Rafaël Carré
*
Expand Down Expand Up @@ -263,11 +264,7 @@ static void upipe_ts_emmd_parse_descs(struct upipe *upipe,
struct uref *flow_def,
const uint8_t *descl, uint16_t desclength)
{
const uint8_t *desc;
int j = 0;
/* cast needed because biTStream expects an uint8_t * (but doesn't write
* to it */
while ((desc = descl_get_desc((uint8_t *)descl, desclength, j++)) != NULL) {
descl_each_desc(descl, desclength, desc) {
bool copy = false;
switch (desc_get_tag(desc)) {
default:
Expand Down Expand Up @@ -296,16 +293,12 @@ static void upipe_ts_emmd_parse_sd_descs(struct upipe *upipe,
const uint8_t *descl, uint16_t desclength)
{
struct upipe_ts_emmd *upipe_ts_emmd = upipe_ts_emmd_from_upipe(upipe);
const uint8_t *desc;
int j = 0;

bool prevent_descrambled_forward = false;
bool prevent_decoded_forward = false;
bool insert_watermark = false;

/* cast needed because biTStream expects an uint8_t * (but doesn't write
* to it */
while ((desc = descl_get_desc((uint8_t *)descl, desclength, j++)) != NULL) {
descl_each_desc(descl, desclength, desc) {
bool copy = false;
bool valid = true;
uint16_t length = desc_get_length(desc);
Expand Down Expand Up @@ -1078,11 +1071,7 @@ static void upipe_ts_emmd_ecm_parse_descs(struct upipe *upipe,
struct uref *flow_def,
const uint8_t *descl, uint16_t desclength)
{
const uint8_t *desc;
int j = 0;
/* cast needed because biTStream expects an uint8_t * (but doesn't write
* to it */
while ((desc = descl_get_desc((uint8_t *)descl, desclength, j++)) != NULL) {
descl_each_desc(descl, desclength, desc) {
bool copy = false;
switch (desc_get_tag(desc)) {
default:
Expand Down
15 changes: 3 additions & 12 deletions lib/upipe-ts/upipe_ts_nit_decoder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2015 OpenHeadend S.A.R.L.
* Copyright (C) 2025 EasyTools
*
* Authors: Christophe Massiot
*
Expand Down Expand Up @@ -224,12 +225,7 @@ static void upipe_ts_nitd_parse_descs(struct upipe *upipe,
struct uref *flow_def,
const uint8_t *descl, uint16_t desclength)
{
const uint8_t *desc;
int j = 0;

/* cast needed because biTStream expects an uint8_t * (but doesn't write
* to it */
while ((desc = descl_get_desc((uint8_t *)descl, desclength, j++)) != NULL) {
descl_each_desc(descl, desclength, desc) {
bool valid = true;
bool copy = false;
switch (desc_get_tag(desc)) {
Expand Down Expand Up @@ -276,12 +272,7 @@ static void upipe_ts_nitd_parse_ts_descs(struct upipe *upipe,
struct uref *flow_def, uint64_t ts_number,
const uint8_t *descl, uint16_t desclength)
{
const uint8_t *desc;
int j = 0;

/* cast needed because biTStream expects an uint8_t * (but doesn't write
* to it */
while ((desc = descl_get_desc((uint8_t *)descl, desclength, j++)) != NULL) {
descl_each_desc(descl, desclength, desc) {
bool copy = false;
switch (desc_get_tag(desc)) {
default:
Expand Down
15 changes: 3 additions & 12 deletions lib/upipe-ts/upipe_ts_pmt_decoder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2012-2017 OpenHeadend S.A.R.L.
* Copyright (C) 2025 EasyTools
*
* Authors: Christophe Massiot
*
Expand Down Expand Up @@ -284,12 +285,7 @@ static void upipe_ts_pmtd_parse_es_descs(struct upipe *upipe,
const uint8_t *descl,
uint16_t desclength)
{
const uint8_t *desc;
int j = 0;

/* cast needed because biTStream expects an uint8_t * (but doesn't write
* to it */
while ((desc = descl_get_desc((uint8_t *)descl, desclength, j++)) != NULL) {
descl_each_desc(descl, desclength, desc) {
bool valid = true;
bool copy = false;
switch (desc_get_tag(desc)) {
Expand Down Expand Up @@ -632,16 +628,11 @@ static int upipe_ts_pmtd_parse_descs(struct upipe *upipe,
const uint8_t *descl,
uint16_t desclength)
{
const uint8_t *desc;
int j = 0;

/* desclength can be zero and VLA must be greater than zero */
uint8_t descl_copy[desclength + 1];
uint16_t copy_len = 0;

/* cast needed because biTStream expects an uint8_t * (but doesn't write
* to it */
while ((desc = descl_get_desc((uint8_t *)descl, desclength, j++)) != NULL) {
descl_each_desc(descl, desclength, desc) {
bool valid = true;
bool copy = true;
uint8_t desc_len = desc_get_length(desc);
Expand Down
9 changes: 2 additions & 7 deletions lib/upipe-ts/upipe_ts_scte35_decoder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2015 OpenHeadend S.A.R.L.
* Copyright (C) 2020 EasyTools
* Copyright (C) 2020-2025 EasyTools
*
* Authors: Christophe Massiot
*
Expand Down Expand Up @@ -130,12 +130,7 @@ static void upipe_ts_scte35d_parse_descs(struct upipe *upipe, struct uref *uref,
const uint8_t *descl,
uint16_t desclength)
{
const uint8_t *desc;
unsigned j = 0;

/* cast needed because biTStream expects an uint8_t * (but doesn't write
* to it */
while ((desc = descl_get_desc((uint8_t *)descl, desclength, j++)) != NULL) {
descl_each_desc(descl, desclength, desc) {
UBASE_FATAL(upipe, uref_ts_flow_add_descriptor(uref,
desc, desc_get_length(desc) + DESC_HEADER_SIZE));
}
Expand Down
8 changes: 2 additions & 6 deletions lib/upipe-ts/upipe_ts_sdt_decoder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2015 OpenHeadend S.A.R.L.
* Copyright (C) 2025 EasyTools
*
* Authors: Christophe Massiot
*
Expand Down Expand Up @@ -258,12 +259,7 @@ static void upipe_ts_sdtd_parse_descs(struct upipe *upipe,
struct uref *flow_def,
const uint8_t *descl, uint16_t desclength)
{
const uint8_t *desc;
int j = 0;

/* cast needed because biTStream expects an uint8_t * (but doesn't write
* to it */
while ((desc = descl_get_desc((uint8_t *)descl, desclength, j++)) != NULL) {
descl_each_desc(descl, desclength, desc) {
bool valid = true;
bool copy = false;
switch (desc_get_tag(desc)) {
Expand Down
Loading