Skip to content

Commit 4bc0238

Browse files
quariumcmassiot
quarium
authored and
cmassiot
committed
upipe-ts: use descl_each_desc macro
1 parent 795c95c commit 4bc0238

File tree

8 files changed

+22
-73
lines changed

8 files changed

+22
-73
lines changed

‎lib/upipe-ts/upipe_ts_cat_decoder.c‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
22
* Copyright (C) 2018 Open Broadcast Systems Ltd
3+
* Copyright (C) 2025 EasyTools
34
*
45
* Authors: Rafaël Carré
56
*
@@ -156,12 +157,9 @@ static void upipe_ts_catd_parse_bissca_descs(struct upipe *upipe,
156157
struct uref *flow_def,
157158
const uint8_t *descl, uint16_t desclength)
158159
{
159-
const uint8_t *desc;
160-
int j = 0;
161160
uint8_t esid_n = 0;
162-
/* cast needed because biTStream expects an uint8_t * (but doesn't write
163-
* to it */
164-
while ((desc = descl_get_desc((uint8_t *)descl, desclength, j++)) != NULL) {
161+
162+
descl_each_desc(descl, desclength, desc) {
165163
bool valid = true;
166164
uint16_t length;
167165
switch (desc_get_tag(desc)) {
@@ -202,11 +200,7 @@ static void upipe_ts_catd_parse_descs(struct upipe *upipe,
202200
struct uref *flow_def,
203201
const uint8_t *descl, uint16_t desclength)
204202
{
205-
const uint8_t *desc;
206-
int j = 0;
207-
/* cast needed because biTStream expects an uint8_t * (but doesn't write
208-
* to it */
209-
while ((desc = descl_get_desc((uint8_t *)descl, desclength, j++)) != NULL) {
203+
descl_each_desc(descl, desclength, desc) {
210204
bool valid = true;
211205
bool copy = false;
212206
switch (desc_get_tag(desc)) {

‎lib/upipe-ts/upipe_ts_demux.c‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1632,12 +1632,9 @@ static void upipe_ts_catd_parse_bissca_descs(struct upipe *upipe,
16321632
struct uref *flow_def,
16331633
const uint8_t *descl, uint16_t desclength)
16341634
{
1635-
const uint8_t *desc;
1636-
int j = 0;
16371635
uint8_t esid_n = 0;
1638-
/* cast needed because biTStream expects an uint8_t * (but doesn't write
1639-
* to it */
1640-
while ((desc = descl_get_desc((uint8_t *)descl, desclength, j++)) != NULL) {
1636+
1637+
descl_each_desc(descl, desclength, desc) {
16411638
bool valid = true;
16421639
uint16_t length;
16431640
switch (desc_get_tag(desc)) {

‎lib/upipe-ts/upipe_ts_eit_decoder.c‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
22
* Copyright (C) 2015 OpenHeadend S.A.R.L.
3+
* Copyright (C) 2025 EasyTools
34
*
45
* Authors: Christophe Massiot
56
*
@@ -262,12 +263,7 @@ static void upipe_ts_eitd_parse_descs(struct upipe *upipe,
262263
struct uref *flow_def, uint64_t event,
263264
const uint8_t *descl, uint16_t desclength)
264265
{
265-
const uint8_t *desc;
266-
int j = 0;
267-
268-
/* cast needed because biTStream expects an uint8_t * (but doesn't write
269-
* to it */
270-
while ((desc = descl_get_desc((uint8_t *)descl, desclength, j++)) != NULL) {
266+
descl_each_desc(descl, desclength, desc) {
271267
bool valid = true;
272268
bool copy = false;
273269
switch (desc_get_tag(desc)) {

‎lib/upipe-ts/upipe_ts_emm_decoder.c‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
22
* Copyright (C) 2018 Open Broadcast Systems Ltd
3+
* Copyright (C) 2025 EasyTools
34
*
45
* Authors: Rafaël Carré
56
*
@@ -263,11 +264,7 @@ static void upipe_ts_emmd_parse_descs(struct upipe *upipe,
263264
struct uref *flow_def,
264265
const uint8_t *descl, uint16_t desclength)
265266
{
266-
const uint8_t *desc;
267-
int j = 0;
268-
/* cast needed because biTStream expects an uint8_t * (but doesn't write
269-
* to it */
270-
while ((desc = descl_get_desc((uint8_t *)descl, desclength, j++)) != NULL) {
267+
descl_each_desc(descl, desclength, desc) {
271268
bool copy = false;
272269
switch (desc_get_tag(desc)) {
273270
default:
@@ -296,16 +293,12 @@ static void upipe_ts_emmd_parse_sd_descs(struct upipe *upipe,
296293
const uint8_t *descl, uint16_t desclength)
297294
{
298295
struct upipe_ts_emmd *upipe_ts_emmd = upipe_ts_emmd_from_upipe(upipe);
299-
const uint8_t *desc;
300-
int j = 0;
301296

302297
bool prevent_descrambled_forward = false;
303298
bool prevent_decoded_forward = false;
304299
bool insert_watermark = false;
305300

306-
/* cast needed because biTStream expects an uint8_t * (but doesn't write
307-
* to it */
308-
while ((desc = descl_get_desc((uint8_t *)descl, desclength, j++)) != NULL) {
301+
descl_each_desc(descl, desclength, desc) {
309302
bool copy = false;
310303
bool valid = true;
311304
uint16_t length = desc_get_length(desc);
@@ -1078,11 +1071,7 @@ static void upipe_ts_emmd_ecm_parse_descs(struct upipe *upipe,
10781071
struct uref *flow_def,
10791072
const uint8_t *descl, uint16_t desclength)
10801073
{
1081-
const uint8_t *desc;
1082-
int j = 0;
1083-
/* cast needed because biTStream expects an uint8_t * (but doesn't write
1084-
* to it */
1085-
while ((desc = descl_get_desc((uint8_t *)descl, desclength, j++)) != NULL) {
1074+
descl_each_desc(descl, desclength, desc) {
10861075
bool copy = false;
10871076
switch (desc_get_tag(desc)) {
10881077
default:

‎lib/upipe-ts/upipe_ts_nit_decoder.c‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
22
* Copyright (C) 2015 OpenHeadend S.A.R.L.
3+
* Copyright (C) 2025 EasyTools
34
*
45
* Authors: Christophe Massiot
56
*
@@ -224,12 +225,7 @@ static void upipe_ts_nitd_parse_descs(struct upipe *upipe,
224225
struct uref *flow_def,
225226
const uint8_t *descl, uint16_t desclength)
226227
{
227-
const uint8_t *desc;
228-
int j = 0;
229-
230-
/* cast needed because biTStream expects an uint8_t * (but doesn't write
231-
* to it */
232-
while ((desc = descl_get_desc((uint8_t *)descl, desclength, j++)) != NULL) {
228+
descl_each_desc(descl, desclength, desc) {
233229
bool valid = true;
234230
bool copy = false;
235231
switch (desc_get_tag(desc)) {
@@ -276,12 +272,7 @@ static void upipe_ts_nitd_parse_ts_descs(struct upipe *upipe,
276272
struct uref *flow_def, uint64_t ts_number,
277273
const uint8_t *descl, uint16_t desclength)
278274
{
279-
const uint8_t *desc;
280-
int j = 0;
281-
282-
/* cast needed because biTStream expects an uint8_t * (but doesn't write
283-
* to it */
284-
while ((desc = descl_get_desc((uint8_t *)descl, desclength, j++)) != NULL) {
275+
descl_each_desc(descl, desclength, desc) {
285276
bool copy = false;
286277
switch (desc_get_tag(desc)) {
287278
default:

‎lib/upipe-ts/upipe_ts_pmt_decoder.c‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
22
* Copyright (C) 2012-2017 OpenHeadend S.A.R.L.
3+
* Copyright (C) 2025 EasyTools
34
*
45
* Authors: Christophe Massiot
56
*
@@ -284,12 +285,7 @@ static void upipe_ts_pmtd_parse_es_descs(struct upipe *upipe,
284285
const uint8_t *descl,
285286
uint16_t desclength)
286287
{
287-
const uint8_t *desc;
288-
int j = 0;
289-
290-
/* cast needed because biTStream expects an uint8_t * (but doesn't write
291-
* to it */
292-
while ((desc = descl_get_desc((uint8_t *)descl, desclength, j++)) != NULL) {
288+
descl_each_desc(descl, desclength, desc) {
293289
bool valid = true;
294290
bool copy = false;
295291
switch (desc_get_tag(desc)) {
@@ -632,16 +628,11 @@ static int upipe_ts_pmtd_parse_descs(struct upipe *upipe,
632628
const uint8_t *descl,
633629
uint16_t desclength)
634630
{
635-
const uint8_t *desc;
636-
int j = 0;
637-
638631
/* desclength can be zero and VLA must be greater than zero */
639632
uint8_t descl_copy[desclength + 1];
640633
uint16_t copy_len = 0;
641634

642-
/* cast needed because biTStream expects an uint8_t * (but doesn't write
643-
* to it */
644-
while ((desc = descl_get_desc((uint8_t *)descl, desclength, j++)) != NULL) {
635+
descl_each_desc(descl, desclength, desc) {
645636
bool valid = true;
646637
bool copy = true;
647638
uint8_t desc_len = desc_get_length(desc);

‎lib/upipe-ts/upipe_ts_scte35_decoder.c‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Copyright (C) 2015 OpenHeadend S.A.R.L.
3-
* Copyright (C) 2020 EasyTools
3+
* Copyright (C) 2020-2025 EasyTools
44
*
55
* Authors: Christophe Massiot
66
*
@@ -130,12 +130,7 @@ static void upipe_ts_scte35d_parse_descs(struct upipe *upipe, struct uref *uref,
130130
const uint8_t *descl,
131131
uint16_t desclength)
132132
{
133-
const uint8_t *desc;
134-
unsigned j = 0;
135-
136-
/* cast needed because biTStream expects an uint8_t * (but doesn't write
137-
* to it */
138-
while ((desc = descl_get_desc((uint8_t *)descl, desclength, j++)) != NULL) {
133+
descl_each_desc(descl, desclength, desc) {
139134
UBASE_FATAL(upipe, uref_ts_flow_add_descriptor(uref,
140135
desc, desc_get_length(desc) + DESC_HEADER_SIZE));
141136
}

‎lib/upipe-ts/upipe_ts_sdt_decoder.c‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
22
* Copyright (C) 2015 OpenHeadend S.A.R.L.
3+
* Copyright (C) 2025 EasyTools
34
*
45
* Authors: Christophe Massiot
56
*
@@ -258,12 +259,7 @@ static void upipe_ts_sdtd_parse_descs(struct upipe *upipe,
258259
struct uref *flow_def,
259260
const uint8_t *descl, uint16_t desclength)
260261
{
261-
const uint8_t *desc;
262-
int j = 0;
263-
264-
/* cast needed because biTStream expects an uint8_t * (but doesn't write
265-
* to it */
266-
while ((desc = descl_get_desc((uint8_t *)descl, desclength, j++)) != NULL) {
262+
descl_each_desc(descl, desclength, desc) {
267263
bool valid = true;
268264
bool copy = false;
269265
switch (desc_get_tag(desc)) {

0 commit comments

Comments
 (0)