diff --git a/src/dvb/dvb_tables.c b/src/dvb/dvb_tables.c index a9ca19e6..738f1b4b 100644 --- a/src/dvb/dvb_tables.c +++ b/src/dvb/dvb_tables.c @@ -484,13 +484,7 @@ dvb_eit_callback(th_dvb_mux_instance_t *tdmi, uint8_t *ptr, int len, th_dvb_adapter_t *tda = tdmi->tdmi_adapter; uint16_t serviceid; - int version; - uint8_t section_number; - uint8_t last_section_number; uint16_t transport_stream_id; - uint16_t original_network_id; - uint8_t segment_last_section_number; - uint8_t last_table_id; uint16_t event_id; time_t start_time, stop_time; @@ -515,13 +509,13 @@ dvb_eit_callback(th_dvb_mux_instance_t *tdmi, uint8_t *ptr, int len, return -1; serviceid = ptr[0] << 8 | ptr[1]; - version = ptr[2] >> 1 & 0x1f; - section_number = ptr[3]; - last_section_number = ptr[4]; + // version = ptr[2] >> 1 & 0x1f; + // section_number = ptr[3]; + // last_section_number = ptr[4]; transport_stream_id = ptr[5] << 8 | ptr[6]; - original_network_id = ptr[7] << 8 | ptr[8]; - segment_last_section_number = ptr[9]; - last_table_id = ptr[10]; + // original_network_id = ptr[7] << 8 | ptr[8]; + // segment_last_section_number = ptr[9]; + // last_table_id = ptr[10]; if((ptr[2] & 1) == 0) { /* current_next_indicator == next, skip this */ @@ -644,15 +638,10 @@ dvb_sdt_callback(th_dvb_mux_instance_t *tdmi, uint8_t *ptr, int len, uint8_t tableid, void *opaque) { service_t *t; - int version; uint8_t section_number; - uint8_t last_section_number; uint16_t service_id; uint16_t transport_stream_id; - uint16_t original_network_id; - - int reserved; - int running_status, free_ca_mode; + int free_ca_mode; int dllen; uint8_t dtag, dlen; @@ -669,11 +658,11 @@ dvb_sdt_callback(th_dvb_mux_instance_t *tdmi, uint8_t *ptr, int len, if(tdmi->tdmi_transport_stream_id != transport_stream_id) return -1; - version = ptr[2] >> 1 & 0x1f; + // version = ptr[2] >> 1 & 0x1f; section_number = ptr[3]; - last_section_number = ptr[4]; - original_network_id = ptr[5] << 8 | ptr[6]; - reserved = ptr[7]; + // last_section_number = ptr[4]; + // original_network_id = ptr[5] << 8 | ptr[6]; + // reserved = ptr[7]; if((ptr[2] & 1) == 0) { /* current_next_indicator == next, skip this */ @@ -686,8 +675,8 @@ dvb_sdt_callback(th_dvb_mux_instance_t *tdmi, uint8_t *ptr, int len, while(len >= 5) { service_id = ptr[0] << 8 | ptr[1]; - reserved = ptr[2]; - running_status = (ptr[3] >> 5) & 0x7; + // reserved = ptr[2]; + // running_status = (ptr[3] >> 5) & 0x7; free_ca_mode = (ptr[3] >> 4) & 0x1; dllen = ((ptr[3] & 0x0f) << 8) | ptr[4]; @@ -841,7 +830,6 @@ dvb_cat_callback(th_dvb_mux_instance_t *tdmi, uint8_t *ptr, int len, uint8_t tableid, void *opaque) { int tag, tlen; - uint16_t caid; uint16_t pid; if((ptr[2] & 1) == 0) { @@ -858,7 +846,7 @@ dvb_cat_callback(th_dvb_mux_instance_t *tdmi, uint8_t *ptr, int len, len -= 2; switch(tag) { case DVB_DESC_CA: - caid = ( ptr[0] << 8) | ptr[1]; + // caid = ( ptr[0] << 8) | ptr[1]; pid = ((ptr[2] & 0x1f) << 8) | ptr[3]; if(pid == 0) @@ -960,7 +948,7 @@ dvb_table_sat_delivery(th_dvb_mux_instance_t *tdmi, uint8_t *ptr, int len, uint16_t tsid) { int freq, symrate; - uint16_t orbital_pos; + // uint16_t orbital_pos; struct dvb_mux_conf dmc; if(!tdmi->tdmi_adapter->tda_autodiscovery) @@ -980,7 +968,7 @@ dvb_table_sat_delivery(th_dvb_mux_instance_t *tdmi, uint8_t *ptr, int len, if(!freq) return -1; - orbital_pos = bcdtoint(ptr[4]) * 100 + bcdtoint(ptr[5]); + // orbital_pos = bcdtoint(ptr[4]) * 100 + bcdtoint(ptr[5]); symrate = bcdtoint(ptr[7]) * 100000 + bcdtoint(ptr[8]) * 1000 + diff --git a/src/parser_h264.c b/src/parser_h264.c index 0ab7e944..c77fc2d1 100644 --- a/src/parser_h264.c +++ b/src/parser_h264.c @@ -348,7 +348,7 @@ h264_decode_slice_header(elementary_stream_t *st, bitstream_t *bs, int *pkttype, int *duration, int *isfield) { h264_private_t *p; - int slice_type, pps_id, sps_id, fnum; + int slice_type, pps_id, sps_id; if((p = st->es_priv) == NULL) return -1; @@ -378,7 +378,7 @@ h264_decode_slice_header(elementary_stream_t *st, bitstream_t *bs, int *pkttype, if(p->sps[sps_id].max_frame_num_bits == 0) return -1; - fnum = read_bits(bs, p->sps[sps_id].max_frame_num_bits); + skip_bits(bs, p->sps[sps_id].max_frame_num_bits); int field = 0; int timebase = 180000; diff --git a/src/teletext.c b/src/teletext.c index 86057d76..ff7a72db 100644 --- a/src/teletext.c +++ b/src/teletext.c @@ -375,7 +375,7 @@ tt_subtitle_deliver(service_t *t, elementary_stream_t *parent, tt_mag_t *ttm) static void tt_decode_line(service_t *t, elementary_stream_t *st, uint8_t *buf) { - uint8_t mpag, line, s12, s34, c; + uint8_t mpag, line, s12, c; int page, magidx, i; tt_mag_t *ttm; tt_private_t *ttp; @@ -416,7 +416,6 @@ tt_decode_line(service_t *t, elementary_stream_t *st, uint8_t *buf) ttm->ttm_curpage = page; s12 = ham_decode(buf[4], buf[5]); - s34 = ham_decode(buf[6], buf[7]); c = ham_decode(buf[8], buf[9]); ttm->ttm_lang = c >> 5;