From 30ef929ac81dc4b10b0975545576544859fa5dab Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 5 Mar 2018 00:24:39 +0100 Subject: [PATCH] mpegts input: remove unused weight argument from mpegts_input_close_pid() --- src/descrambler/dvbcam.c | 5 ++--- src/input/mpegts.h | 3 +-- src/input/mpegts/mpegts_input.c | 18 +++++++++--------- src/input/mpegts/mpegts_mux.c | 2 +- src/input/mpegts/mpegts_service.c | 4 ++-- 5 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/descrambler/dvbcam.c b/src/descrambler/dvbcam.c index c79089713..18a5c90ae 100644 --- a/src/descrambler/dvbcam.c +++ b/src/descrambler/dvbcam.c @@ -632,8 +632,7 @@ update_pid: mpegts_input_open_pid(mi, mm, ecm_to_open.pids[i].pid, MPS_SERVICE, MPS_WEIGHT_CA, t, 0); for (i = 0; i < ecm_to_close.count; i++) - mpegts_input_close_pid(mi, mm, ecm_to_close.pids[i].pid, MPS_SERVICE, - MPS_WEIGHT_CA, t); + mpegts_input_close_pid(mi, mm, ecm_to_close.pids[i].pid, MPS_SERVICE, t); pthread_mutex_unlock(&t->s_stream_mutex); pthread_mutex_unlock(&mi->mi_output_lock); mpegts_mux_update_pids(mm); @@ -747,7 +746,7 @@ dvbcam_cat_update(caclient_t *cac, mpegts_mux_t *mux, const uint8_t *data, int l MPS_WEIGHT_CAT, sp->service, 0); for (i = 0; i < sp->to_close.count; i++) mpegts_input_close_pid(mi, mux, sp->to_close.pids[i].pid, MPS_SERVICE, - MPS_WEIGHT_CAT, sp->service); + sp->service); pthread_mutex_unlock(&sp->service->s_stream_mutex); mpegts_pid_done(&sp->to_open); mpegts_pid_done(&sp->to_close); diff --git a/src/input/mpegts.h b/src/input/mpegts.h index d607fbde1..9855d85eb 100644 --- a/src/input/mpegts.h +++ b/src/input/mpegts.h @@ -1015,8 +1015,7 @@ mpegts_pid_t * mpegts_input_open_pid void *owner, int reopen ); int mpegts_input_close_pid - ( mpegts_input_t *mi, mpegts_mux_t *mm, int pid, int type, int weight, - void *owner ); + ( mpegts_input_t *mi, mpegts_mux_t *mm, int pid, int type, void *owner ); void mpegts_input_close_pids ( mpegts_input_t *mi, mpegts_mux_t *mm, void *owner, int all ); diff --git a/src/input/mpegts/mpegts_input.c b/src/input/mpegts/mpegts_input.c index c133b0e98..24b0c8a93 100644 --- a/src/input/mpegts/mpegts_input.c +++ b/src/input/mpegts/mpegts_input.c @@ -489,14 +489,14 @@ mpegts_input_close_pids if (mps->mps_owner != owner) continue; pid = MPEGTS_FULLMUX_PID; if (mps->mps_type & MPS_TABLES) pid = MPEGTS_TABLES_PID; - mpegts_input_close_pid(mi, mm, pid, mps->mps_type, mps->mps_weight, mps->mps_owner); + mpegts_input_close_pid(mi, mm, pid, mps->mps_type, mps->mps_owner); } for (mp = RB_FIRST(&mm->mm_pids); mp; mp = mp_next) { mp_next = RB_NEXT(mp, mp_link); for (mps = RB_FIRST(&mp->mp_subs); mps; mps = mps_next) { mps_next = RB_NEXT(mps, mps_link); if (mps->mps_owner != owner) continue; - mpegts_input_close_pid(mi, mm, mp->mp_pid, mps->mps_type, mps->mps_weight, mps->mps_owner); + mpegts_input_close_pid(mi, mm, mp->mp_pid, mps->mps_type, mps->mps_owner); } } } @@ -565,7 +565,7 @@ mpegts_input_open_pid int mpegts_input_close_pid - ( mpegts_input_t *mi, mpegts_mux_t *mm, int pid, int type, int weight, void *owner ) + ( mpegts_input_t *mi, mpegts_mux_t *mm, int pid, int type, void *owner ) { mpegts_pid_sub_t *mps, skel; mpegts_pid_t *mp; @@ -592,7 +592,7 @@ mpegts_input_close_pid if (mps) return 0; } else { skel.mps_type = type; - skel.mps_weight = weight; + skel.mps_weight = -1; skel.mps_owner = owner; mps = RB_FIND(&mp->mp_subs, &skel, mps_link, mpegts_mps_cmp); if (pid == mm->mm_last_pid) { @@ -885,17 +885,17 @@ mpegts_input_close_service ( mpegts_input_t *mi, mpegts_service_t *s ) if (s->s_pmt_pid == SERVICE_PMT_AUTO) goto no_pids; - mpegts_input_close_pid(mi, mm, s->s_pmt_pid, MPS_SERVICE, MPS_WEIGHT_PMT, s); - mpegts_input_close_pid(mi, mm, s->s_pcr_pid, MPS_SERVICE, MPS_WEIGHT_PCR, s); + mpegts_input_close_pid(mi, mm, s->s_pmt_pid, MPS_SERVICE, s); + mpegts_input_close_pid(mi, mm, s->s_pcr_pid, MPS_SERVICE, s); if (s->s_cat_opened) { - mpegts_input_close_pid(mi, mm, DVB_CAT_PID, MPS_SERVICE, MPS_WEIGHT_CAT, s); + mpegts_input_close_pid(mi, mm, DVB_CAT_PID, MPS_SERVICE, s); s->s_cat_opened = 0; } /* Close all opened PIDs (the component filter may be changed at runtime) */ TAILQ_FOREACH(st, &s->s_components, es_link) { if (st->es_pid_opened) { st->es_pid_opened = 0; - mpegts_input_close_pid(mi, mm, st->es_pid, MPS_SERVICE, mpegts_mps_weight(st), s); + mpegts_input_close_pid(mi, mm, st->es_pid, MPS_SERVICE, s); } } @@ -1305,7 +1305,7 @@ mpegts_input_table_waiting ( mpegts_input_t *mi, mpegts_mux_t *mm ) if (mt->mt_subscribed) { mt->mt_subscribed = 0; pthread_mutex_unlock(&mm->mm_tables_lock); - mpegts_input_close_pid(mi, mm, mt->mt_pid, mpegts_table_type(mt), mt->mt_weight, mt); + mpegts_input_close_pid(mi, mm, mt->mt_pid, mpegts_table_type(mt), mt); } else { pthread_mutex_unlock(&mm->mm_tables_lock); } diff --git a/src/input/mpegts/mpegts_mux.c b/src/input/mpegts/mpegts_mux.c index b9b497115..0171b8d65 100644 --- a/src/input/mpegts/mpegts_mux.c +++ b/src/input/mpegts/mpegts_mux.c @@ -1001,7 +1001,7 @@ mpegts_mux_unsubscribe_table ( mpegts_mux_t *mm, mpegts_table_t *mt ) mt->mt_subscribed = 0; pthread_mutex_unlock(&mm->mm_tables_lock); pthread_mutex_lock(&mi->mi_output_lock); - mpegts_input_close_pid(mi, mm, mt->mt_pid, mpegts_table_type(mt), mt->mt_weight, mt); + mpegts_input_close_pid(mi, mm, mt->mt_pid, mpegts_table_type(mt), mt); pthread_mutex_unlock(&mi->mi_output_lock); pthread_mutex_lock(&mm->mm_tables_lock); mpegts_table_release(mt); diff --git a/src/input/mpegts/mpegts_service.c b/src/input/mpegts/mpegts_service.c index b43f9fb91..37dfc4fea 100644 --- a/src/input/mpegts/mpegts_service.c +++ b/src/input/mpegts/mpegts_service.c @@ -973,7 +973,7 @@ mpegts_service_raw_update_pids(mpegts_service_t *t, mpegts_apids_t *pids) x = t->s_pids; t->s_pids = p; if (pids && !pids->all && x && x->all) { - mpegts_input_close_pid(mi, mm, MPEGTS_FULLMUX_PID, MPS_RAW, MPS_WEIGHT_RAW, t); + mpegts_input_close_pid(mi, mm, MPEGTS_FULLMUX_PID, MPS_RAW, t); mpegts_input_close_pids(mi, mm, t, 1); for (i = 0; i < x->count; i++) { pi = &x->pids[i]; @@ -987,7 +987,7 @@ mpegts_service_raw_update_pids(mpegts_service_t *t, mpegts_apids_t *pids) mpegts_pid_compare(p, x, &add, &del); for (i = 0; i < del.count; i++) { pi = &del.pids[i]; - mpegts_input_close_pid(mi, mm, pi->pid, MPS_RAW, pi->weight, t); + mpegts_input_close_pid(mi, mm, pi->pid, MPS_RAW, t); } for (i = 0; i < add.count; i++) { pi = &add.pids[i]; -- 2.47.3