From b63e5a8bbee6291efc24c21c204816b833b045fc Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 23 Jun 2014 14:22:13 +0200 Subject: [PATCH] mpegts_input_recv_packets() - remove unused off(set) parameter --- src/input/mpegts.h | 2 +- src/input/mpegts/iptv/iptv.c | 10 ++++------ src/input/mpegts/iptv/iptv_http.c | 2 +- src/input/mpegts/iptv/iptv_private.h | 4 ++-- src/input/mpegts/iptv/iptv_udp.c | 4 ++-- src/input/mpegts/mpegts_input.c | 8 ++++---- src/input/mpegts/satip/satip_frontend.c | 2 +- src/input/mpegts/tsfile/tsfile_input.c | 2 +- 8 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/input/mpegts.h b/src/input/mpegts.h index 7a4a7c38..e6542fa1 100644 --- a/src/input/mpegts.h +++ b/src/input/mpegts.h @@ -709,7 +709,7 @@ mpegts_mux_find_pid(mpegts_mux_t *mm, int pid, int create) } void mpegts_input_recv_packets - (mpegts_input_t *mi, mpegts_mux_instance_t *mmi, sbuf_t *sb, size_t off, + (mpegts_input_t *mi, mpegts_mux_instance_t *mmi, sbuf_t *sb, int64_t *pcr, uint16_t *pcr_pid); int mpegts_input_is_free ( mpegts_input_t *mi ); diff --git a/src/input/mpegts/iptv/iptv.c b/src/input/mpegts/iptv/iptv.c index 14656e70..9515670b 100644 --- a/src/input/mpegts/iptv/iptv.c +++ b/src/input/mpegts/iptv/iptv.c @@ -273,7 +273,6 @@ iptv_input_thread ( void *aux ) { int nfds; ssize_t n; - size_t off; iptv_mux_t *im; tvhpoll_event_t ev; @@ -298,13 +297,12 @@ iptv_input_thread ( void *aux ) goto done; /* Get data */ - off = 0; - if ((n = im->im_handler->read(im, &off)) < 0) { + if ((n = im->im_handler->read(im)) < 0) { tvhlog(LOG_ERR, "iptv", "read() error %s", strerror(errno)); im->im_handler->stop(im); goto done; } - iptv_input_recv_packets(im, n, off); + iptv_input_recv_packets(im, n); done: pthread_mutex_unlock(&iptv_lock); @@ -313,7 +311,7 @@ done: } void -iptv_input_recv_packets ( iptv_mux_t *im, ssize_t len, size_t off ) +iptv_input_recv_packets ( iptv_mux_t *im, ssize_t len ) { static time_t t1 = 0, t2; iptv_network_t *in = (iptv_network_t*)im->mm_network; @@ -338,7 +336,7 @@ iptv_input_recv_packets ( iptv_mux_t *im, ssize_t len, size_t off ) mmi = im->mm_active; if (mmi) mpegts_input_recv_packets((mpegts_input_t*)iptv_input, mmi, - &im->mm_iptv_buffer, off, NULL, NULL); + &im->mm_iptv_buffer, NULL, NULL); } void diff --git a/src/input/mpegts/iptv/iptv_http.c b/src/input/mpegts/iptv/iptv_http.c index e61b9ad5..8c43b418 100644 --- a/src/input/mpegts/iptv/iptv_http.c +++ b/src/input/mpegts/iptv/iptv_http.c @@ -50,7 +50,7 @@ iptv_http_data sbuf_append(&im->mm_iptv_buffer, buf, len); if (len > 0) - iptv_input_recv_packets(im, len, 0); + iptv_input_recv_packets(im, len); pthread_mutex_unlock(&iptv_lock); diff --git a/src/input/mpegts/iptv/iptv_private.h b/src/input/mpegts/iptv/iptv_private.h index d8135e4d..cc32319d 100644 --- a/src/input/mpegts/iptv/iptv_private.h +++ b/src/input/mpegts/iptv/iptv_private.h @@ -42,7 +42,7 @@ struct iptv_handler const char *scheme; int (*start) ( iptv_mux_t *im, const url_t *url ); void (*stop) ( iptv_mux_t *im ); - ssize_t (*read) ( iptv_mux_t *im, size_t *off ); + ssize_t (*read) ( iptv_mux_t *im ); RB_ENTRY(iptv_handler) link; }; @@ -55,7 +55,7 @@ struct iptv_input }; void iptv_input_mux_started ( iptv_mux_t *im ); -void iptv_input_recv_packets ( iptv_mux_t *im, ssize_t len, size_t off ); +void iptv_input_recv_packets ( iptv_mux_t *im, ssize_t len ); struct iptv_network { diff --git a/src/input/mpegts/iptv/iptv_udp.c b/src/input/mpegts/iptv/iptv_udp.c index 760bc265..89a62243 100644 --- a/src/input/mpegts/iptv/iptv_udp.c +++ b/src/input/mpegts/iptv/iptv_udp.c @@ -71,7 +71,7 @@ iptv_udp_stop } static ssize_t -iptv_udp_read ( iptv_mux_t *im, size_t *off ) +iptv_udp_read ( iptv_mux_t *im ) { int i, n; struct iovec *iovec; @@ -91,7 +91,7 @@ iptv_udp_read ( iptv_mux_t *im, size_t *off ) } static ssize_t -iptv_rtp_read ( iptv_mux_t *im, size_t *off ) +iptv_rtp_read ( iptv_mux_t *im ) { ssize_t len, hlen; uint8_t *rtp; diff --git a/src/input/mpegts/mpegts_input.c b/src/input/mpegts/mpegts_input.c index 6748a717..8d063e11 100644 --- a/src/input/mpegts/mpegts_input.c +++ b/src/input/mpegts/mpegts_input.c @@ -455,13 +455,13 @@ ts_sync_count ( const uint8_t *tsb, int len ) void mpegts_input_recv_packets - ( mpegts_input_t *mi, mpegts_mux_instance_t *mmi, sbuf_t *sb, size_t off, + ( mpegts_input_t *mi, mpegts_mux_instance_t *mmi, sbuf_t *sb, int64_t *pcr, uint16_t *pcr_pid ) { - int i, p = 0, len2; + int i, p = 0, len2, off = 0; mpegts_packet_t *mp; - uint8_t *tsb = sb->sb_data + off; - int len = sb->sb_ptr - off; + uint8_t *tsb = sb->sb_data; + int len = sb->sb_ptr; #define MIN_TS_PKT 100 #define MIN_TS_SYN 5 diff --git a/src/input/mpegts/satip/satip_frontend.c b/src/input/mpegts/satip/satip_frontend.c index 224b2341..353da6e2 100644 --- a/src/input/mpegts/satip/satip_frontend.c +++ b/src/input/mpegts/satip/satip_frontend.c @@ -1148,7 +1148,7 @@ satip_frontend_input_thread ( void *aux ) sbuf_append(&sb, p + pos, c - pos); } mpegts_input_recv_packets((mpegts_input_t*)lfe, mmi, - &sb, 0, NULL, NULL); + &sb, NULL, NULL); } /* Do not send the SMT_SIGNAL_STATUS packets - we are out of service */ diff --git a/src/input/mpegts/tsfile/tsfile_input.c b/src/input/mpegts/tsfile/tsfile_input.c index 32bdca5c..b20adbed 100644 --- a/src/input/mpegts/tsfile/tsfile_input.c +++ b/src/input/mpegts/tsfile/tsfile_input.c @@ -131,7 +131,7 @@ tsfile_input_thread ( void *aux ) /* Process */ if (c > 0) { pcr = PTS_UNSET; - mpegts_input_recv_packets((mpegts_input_t*)mi, mmi, &buf, 0, + mpegts_input_recv_packets((mpegts_input_t*)mi, mmi, &buf, &pcr, &tmi->mmi_tsfile_pcr_pid); /* Delay */