frodovdr
/
octonet
mirror of https://github.com/DigitalDevices/octonet.git
1
0
Fork 0
Code Issues Releases Wiki Activity

calculate table lengths 

add supprt for isi parameter
This commit is contained in:
Ralph Metzler 2015-11-05 19:03:54 +01:00
parent d82256b893
commit 6fef2a2ce8
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dddvb

@ -1 +1 @@
Subproject commit 18481e2ea6f62ff06c359aa4dc6debe2e5b53561
Subproject commit e83dedf6b41d6cfb9315d714e5982d10ff8aab6c

12
octoserve/dvb.c
View File

@ -26,6 +26,7 @@ extern uint32_t debug;
#define MMI_STATE_ENQ 2
#define MMI_STATE_MENU 3
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
static int set_fmode(uint32_t fmode)
{
@ -148,6 +149,7 @@ static int set_fe(int fd, uint32_t fr, uint32_t sr, fe_delivery_system_t ds)
{ .cmd = DTV_INVERSION, .u.data = INVERSION_AUTO },
{ .cmd = DTV_SYMBOL_RATE, .u.data = sr },
{ .cmd = DTV_INNER_FEC, .u.data = FEC_AUTO },
// { .cmd = DTV_STREAM_ID, .u.data = fe->param[PARAM_ISI] },
{ .cmd = DTV_TUNE },
};
struct dtv_properties c;
@ -155,7 +157,7 @@ static int set_fe(int fd, uint32_t fr, uint32_t sr, fe_delivery_system_t ds)
dbgprintf(DEBUG_DVB, "ds = %u\n", ds);
c.num = 7;
c.num = ARRAY_SIZE(p);
c.props = p;
ret = ioctl(fd, FE_SET_PROPERTY, &c);
if (ret < 0) {
@ -366,7 +368,7 @@ static int tune_c(struct dvbfe *fe)
set_property(fe->fd, DTV_DELIVERY_SYSTEM, SYS_DVBC_ANNEX_A);
c.num = 7;
c.num = ARRAY_SIZE(p);
c.props = p;
ret = ioctl(fe->fd, FE_SET_PROPERTY, &c);
if (ret < 0) {
@ -406,7 +408,7 @@ static int tune_terr(struct dvbfe *fe)
set_property(fe->fd, DTV_DELIVERY_SYSTEM, SYS_DVBT);
c.num = 4;
c.num = ARRAY_SIZE(p);
c.props = p;
ret = ioctl(fe->fd, FE_SET_PROPERTY, &c);
if (ret < 0) {
@ -455,7 +457,7 @@ static int tune_c2(struct dvbfe *fe)
set_property(fe->fd, DTV_DELIVERY_SYSTEM, SYS_DVBC2);
c.num = 5;
c.num = ARRAY_SIZE(p);
c.props = p;
ret = ioctl(fe->fd, FE_SET_PROPERTY, &c);
if (ret < 0) {
@ -479,7 +481,7 @@ static int tune_terr2(struct dvbfe *fe)
set_property(fe->fd, DTV_DELIVERY_SYSTEM, SYS_DVBT2);
c.num = 5;
c.num = ARRAY_SIZE(p);
c.props = p;
ret = ioctl(fe->fd, FE_SET_PROPERTY, &c);
if (ret < 0) {

9
octoserve/octoserve.c
View File

@ -1043,6 +1043,13 @@ static int parse_url(struct oscon *con, int streamonly)
break;
p->set |= (1UL << PARAM_T2ID);
dbgprintf(DEBUG_SYS, "t2id=%d, ", p->param[PARAM_T2ID]);
} else if (!strncasecmp(url, "isi=", 4)) {
url += 4;
p->param[PARAM_ISI] = strtoul(url, &end, 10);
if (end == url)
break;
p->set |= (1UL << PARAM_ISI);
dbgprintf(DEBUG_SYS, "isi=%d, ", p->param[PARAM_ISI]);
} else if (!strncasecmp(url, "freq=", 5)) {
float f;
@ -2580,7 +2587,7 @@ static struct octoserve *os_init(char *ifname, int nossdp, int nodms, int nodvbt
return NULL;
}
#if 0
if (init_http(os, debug) < 0) {
if (init_httpos, debug) < 0) {
release_dvb(os);
free(os);
return NULL;

1
octoserve/octoserve.h
View File

@ -145,6 +145,7 @@ struct rtsp_error {
#define PARAM_TMODE 14
#define PARAM_GI 15
#define PARAM_PLP 16
#define PARAM_ISI 16
#define PARAM_T2ID 17
#define PARAM_SM 18
#define PARAM_C2TFT 19