Feature #4505 » SAT-IP-configurable-RTP-AVP-TCP-support.diff
| src/input/mpegts/satip/satip_frontend.c | ||
|---|---|---|
| 165 | 165 |
.opts = PO_ADVANCED, |
| 166 | 166 |
}, |
| 167 | 167 |
{
|
| 168 |
.type = PT_BOOL, |
|
| 169 |
.id = "no_tcp_mode", |
|
| 170 |
.name = N_("Not use RTP/AVP/TCP"),
|
|
| 171 |
.desc = N_("Not use the RTP/AVP/TCP transfer mode "
|
|
| 172 |
"for this tuner even if the server supports it " |
|
| 173 |
"and the client is configured to do so."), |
|
| 174 |
.off = offsetof(satip_frontend_t, sf_no_tcp_mode), |
|
| 175 |
.opts = PO_ADVANCED, |
|
| 176 |
}, |
|
| 177 |
{
|
|
| 168 | 178 |
.type = PT_INT, |
| 169 | 179 |
.id = "tdelay", |
| 170 | 180 |
.name = N_("Next tune delay in ms (0-2000)"),
|
| ... | ... | |
| 1569 | 1579 |
seq = -1; |
| 1570 | 1580 |
lfe->sf_seq = -1; |
| 1571 | 1581 |
play2 = 1; |
| 1572 |
rtsp_flags = lfe->sf_device->sd_tcp_mode ? SATIP_SETUP_TCP : 0; |
|
| 1582 |
rtsp_flags = lfe->sf_device->sd_tcp_mode ? lfe->sf_no_tcp_mode ? 0 : SATIP_SETUP_TCP : 0;
|
|
| 1573 | 1583 | |
| 1574 | 1584 |
if ((rtsp_flags & SATIP_SETUP_TCP) == 0) {
|
| 1575 | 1585 |
if (udp_bind_double(&rtp, &rtcp, |
| src/input/mpegts/satip/satip_private.h | ||
|---|---|---|
| 134 | 134 |
char *sf_type_override; |
| 135 | 135 |
int sf_master; |
| 136 | 136 |
int sf_udp_rtp_port; |
| 137 |
int sf_no_tcp_mode; |
|
| 137 | 138 |
int sf_play2; |
| 138 | 139 |
int sf_tdelay; |
| 139 | 140 |
int sf_grace_period; |
| src/satip/rtsp.c | ||
|---|---|---|
| 861 | 861 |
if (a + 1 != b) |
| 862 | 862 |
return -1; |
| 863 | 863 |
return a; |
| 864 |
} else if (strncmp(s, "RTP/AVP/TCP;interleaved=0-1", 27) == 0) {
|
|
| 864 |
} else if ((strncmp(s, "RTP/AVP/TCP;interleaved=0-1", 27) == 0) && !satip_server_conf.satip_notcp_mode) {
|
|
| 865 | 865 |
return RTSP_TCP_DATA; |
| 866 | 866 |
} |
| 867 | 867 |
return -1; |
| src/satip/server.c | ||
|---|---|---|
| 717 | 717 |
.group = 1, |
| 718 | 718 |
}, |
| 719 | 719 |
{
|
| 720 |
.type = PT_BOOL, |
|
| 721 |
.id = "satip_notcp_mode", |
|
| 722 |
.name = N_("Disable RTP/AVP/TCP support"),
|
|
| 723 |
.desc = N_("Remove server support for RTP/AVP/TCP transfer mode "
|
|
| 724 |
"(embedded data in the RTSP session)."), |
|
| 725 |
.off = offsetof(struct satip_server_conf, satip_notcp_mode), |
|
| 726 |
.opts = PO_EXPERT, |
|
| 727 |
.group = 1, |
|
| 728 |
}, |
|
| 729 |
{
|
|
| 720 | 730 |
.type = PT_U32, |
| 721 | 731 |
.id = "satip_iptv_sig_level", |
| 722 | 732 |
.name = N_("IPTV signal level"),
|
| src/satip/server.h | ||
|---|---|---|
| 47 | 47 |
int satip_rewrite_pmt; |
| 48 | 48 |
int satip_muxcnf; |
| 49 | 49 |
int satip_nom3u; |
| 50 |
int satip_notcp_mode; |
|
| 50 | 51 |
int satip_anonymize; |
| 51 | 52 |
int satip_iptv_sig_level; |
| 52 | 53 |
int satip_force_sig_level; |