dvb: add support for DVB-T2

Probably does much more:

+ add support DVB-T2
* DVB params set to AUTO by default
* MAX_CARDS: 4 -> 16
* DMX_SET_BUFFER_SIZE: 64kb -> 256kb
+ add DTV_CLEAR call before tune
+ add logic from https://github.com/olifre/mpv/commits/dvb-mixed-api-scan
* rename type to delsys
* single playlist per adapter
* card -> adapter
* fix channels order in playlist
* update internal api
* auto fallback to old DVB API on tune
* fix DELSYS_SUPP_MASK value
* remove tone - unused
* add channel mem zeroize in config parser
+ add code from libdvbv5 for detect delivery systems
* SYS_DVBC_ANNEX_AC replaced to SYS_DVBC_ANNEX_A + SYS_DVBC_ANNEX_C

Signed-off-by: wm4 <wm4@nowhere>

1 files changed, 392 insertions, 344 deletions

diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c
index 01ec6c2e77..efa13d54ad 100644
--- a/stream/stream_dvb.c
+++ b/stream/stream_dvb.c
@@ -2,6 +2,7 @@
 
    dvbstream
    (C) Dave Chapman <dave@dchapman.com> 2001, 2002.
+   (C) Rozhuk Ivan <rozhuk.im@gmail.com> 2016
 
    Original authors: Nico, probably Arpi
 
@@ -57,32 +58,35 @@
 #include "dvbin.h"
 #include "dvb_tune.h"
 
-#define MAX_CHANNELS 8
+#define MAX_ADAPTERS 16
 #define CHANNEL_LINE_LEN 256
 #define min(a, b) ((a) <= (b) ? (a) : (b))
 
-#define OPT_BASE_STRUCT struct dvb_params
+#define OPT_BASE_STRUCT dvb_priv_t
 
-static dvb_state_t* global_dvb_state = NULL;
+static dvb_state_t *global_dvb_state = NULL;
 static pthread_mutex_t global_dvb_state_lock = PTHREAD_MUTEX_INITIALIZER;
 
 const struct m_sub_options stream_dvb_conf = {
     .opts = (const m_option_t[]) {
         OPT_STRING("prog", cfg_prog, 0),
-        OPT_INTRANGE("card", cfg_card, 0, 1, 4),
+        OPT_INTRANGE("card", cfg_devno, 0, 1, 4),
         OPT_INTRANGE("timeout", cfg_timeout, 0, 1, 30),
         OPT_STRING("file", cfg_file, M_OPT_FILE),
         OPT_FLAG("full-transponder", cfg_full_transponder, 0),
         {0}
     },
-    .size = sizeof(struct dvb_params),
-    .defaults = &(const struct dvb_params){
-        .cfg_prog = "",
-        .cfg_card = 1,
+    .size = sizeof(dvb_priv_t),
+    .defaults = &(const dvb_priv_t){
+        .cfg_prog = NULL,
+        .cfg_devno = 0,
         .cfg_timeout = 30,
     },
 };
 
+void dvbin_close(stream_t *stream);
+
+
 static void parse_vdr_par_string(const char *vdr_par_str, dvb_channel_t *ptr)
 {
     //FIXME: There is more information in this parameter string, especially related
@@ -102,9 +106,9 @@ static void parse_vdr_par_string(const char *vdr_par_str, dvb_channel_t *ptr)
             case 'S':
                 vdr_par++;
                 if (*vdr_par == '1') {
-                    ptr->is_dvb_s2 = true;
+                    ptr->is_dvb_x2 = true;
                 } else {
-                    ptr->is_dvb_s2 = false;
+                    ptr->is_dvb_x2 = false;
                 }
                 vdr_par++;
                 break;
@@ -193,12 +197,13 @@ static bool parse_pid_string(struct mp_log *log, char *pid_string,
     return false;
 }
 
-static dvb_channels_list *dvb_get_channels(struct mp_log *log,
+static dvb_channels_list_t *dvb_get_channels(struct mp_log *log,
+                                           dvb_channels_list_t *list_add,
                                            int cfg_full_transponder,
                                            char *filename,
-                                           int type)
+                                           int delsys, unsigned int delsys_mask)
 {
-    dvb_channels_list *list;
+    dvb_channels_list_t *list = list_add;
     FILE *f;
     char line[CHANNEL_LINE_LEN], *colon;
 
@@ -221,22 +226,24 @@ static dvb_channels_list *dvb_get_channels(struct mp_log *log,
     const char *vdr_conf =
         "%d:%255[^:]:%255[^:]:%d:%255[^:]:%255[^:]:%255[^:]:%*255[^:]:%d:%*d:%*d:%*d\n%n";
 
-    mp_verbose(log, "CONFIG_READ FILE: %s, type: %d\n", filename, type);
+    mp_verbose(log, "CONFIG_READ FILE: %s, type: %s\n",
+               filename, get_dvb_delsys(delsys));
     if ((f = fopen(filename, "r")) == NULL) {
         mp_fatal(log, "CAN'T READ CONFIG FILE %s\n", filename);
         return NULL;
     }
 
-    list = malloc(sizeof(dvb_channels_list));
     if (list == NULL) {
-        fclose(f);
-        mp_verbose(log, "DVB_GET_CHANNELS: couldn't malloc enough memory\n");
-        return NULL;
+        list = malloc(sizeof(dvb_channels_list_t));
+        if (list == NULL) {
+            fclose(f);
+            mp_verbose(log, "DVB_GET_CHANNELS: couldn't malloc enough memory\n");
+            return NULL;
+        }
+        memset(list, 0, sizeof(dvb_channels_list_t));
     }
 
     ptr = &chn;
-    list->NUM_CHANNELS = 0;
-    list->channels = NULL;
     while (!feof(f)) {
         if (fgets(line, CHANNEL_LINE_LEN, f) == NULL)
             continue;
@@ -244,6 +251,10 @@ static dvb_channels_list *dvb_get_channels(struct mp_log *log,
         if ((line[0] == '#') || (strlen(line) == 0))
             continue;
 
+        memset(ptr, 0, sizeof(dvb_channel_t));
+        vpid_str[0] = apid_str[0] = tpid_str[0] = 0;
+        vdr_loc_str[0] = vdr_par_str[0] = 0;
+
         colon = strchr(line, ':');
         if (colon) {
             k = colon - line;
@@ -254,23 +265,30 @@ static dvb_channels_list *dvb_get_channels(struct mp_log *log,
             char *bouquet_sep = strchr(line, ';');
             int channel_name_length = k;
             if (bouquet_sep && bouquet_sep < colon)
-                channel_name_length = bouquet_sep - line;
-            ptr->name = malloc(channel_name_length + 1);
+                channel_name_length = (bouquet_sep - line);
+            ptr->name = malloc((channel_name_length + 1));
             if (!ptr->name)
                 continue;
-            av_strlcpy(ptr->name, line, channel_name_length + 1);
+            av_strlcpy(ptr->name, line, (channel_name_length + 1));
         } else {
             continue;
         }
         k++;
-        vpid_str[0] = apid_str[0] = tpid_str[0] = 0;
-        vdr_loc_str[0] = vdr_par_str[0] = 0;
         ptr->pids_cnt = 0;
         ptr->freq = 0;
-        ptr->is_dvb_s2 = false;
         ptr->service_id = -1;
+        ptr->is_dvb_x2 = false;
+        ptr->delsys = delsys;
+        ptr->diseqc = 0;
         ptr->stream_id = NO_STREAM_ID_FILTER;
         ptr->inv = INVERSION_AUTO;
+        ptr->bw = BANDWIDTH_AUTO;
+        ptr->cr = FEC_AUTO;
+        ptr->cr_lp = FEC_AUTO;
+        ptr->mod = QAM_AUTO;
+        ptr->hier = HIERARCHY_AUTO;
+        ptr->gi = GUARD_INTERVAL_AUTO;
+        ptr->trans = TRANSMISSION_MODE_AUTO;
 
         // Check if VDR-type channels.conf-line - then full line is consumed by the scan.
         int num_chars = 0;
@@ -283,12 +301,40 @@ static dvb_channels_list *dvb_get_channels(struct mp_log *log,
             // It's a VDR-style config line.
             parse_vdr_par_string(vdr_par_str, ptr);
             // We still need the special SAT-handling here.
-            if (type != TUNER_TER && type != TUNER_CBL && type != TUNER_ATSC) {
+            switch (delsys) {
+            case SYS_DVBT:
+            case SYS_DVBT2:
+                /* Fix delsys value. */
+                if (ptr->is_dvb_x2) {
+                    ptr->delsys = delsys = SYS_DVBT2;
+                } else {
+                    ptr->delsys = delsys = SYS_DVBT;
+                }
+                if (!DELSYS_IS_SET(delsys_mask, delsys))
+                    continue; /* Skip channel. */
+               /* PASSTROUTH */
+            case SYS_DVBC_ANNEX_A:
+            case SYS_DVBC_ANNEX_C:
+            case SYS_ATSC:
+                mp_verbose(log, "VDR, %s, NUM: %d, NUM_FIELDS: %d, NAME: %s, "
+                           "FREQ: %d, SRATE: %d",
+                           get_dvb_delsys(delsys),
+                           list->NUM_CHANNELS, fields,
+                           ptr->name, ptr->freq, ptr->srate);
+                break;
+            case SYS_DVBS:
+            case SYS_DVBS2:
+                /* Fix delsys value. */
+                if (ptr->is_dvb_x2) {
+                    ptr->delsys = delsys = SYS_DVBS2;
+                } else {
+                    ptr->delsys = delsys = SYS_DVBS;
+                }
+                if (!DELSYS_IS_SET(delsys_mask, delsys))
+                    continue; /* Skip channel. */
+
                 ptr->freq *=  1000UL;
                 ptr->srate *=  1000UL;
-                ptr->tone = -1;
-                ptr->inv = INVERSION_AUTO;
-                ptr->cr = FEC_AUTO;
 
                 if (vdr_loc_str[0]) {
                     // In older vdr config format, this field contained the DISEQc information.
@@ -308,58 +354,71 @@ static dvb_channels_list *dvb_get_channels(struct mp_log *log,
                     }
                 }
 
-                mp_verbose(log, "SAT, NUM: %d, NUM_FIELDS: %d, NAME: %s, "
+                mp_verbose(log, "%s NUM: %d, NUM_FIELDS: %d, NAME: %s, "
                            "FREQ: %d, SRATE: %d, POL: %c, DISEQC: %d, S2: %s, "
-                           "StreamID: %d, SID: %d", list->NUM_CHANNELS,
+                           "StreamID: %d, SID: %d",
+                           get_dvb_delsys(delsys),
+                           list->NUM_CHANNELS,
                            fields, ptr->name, ptr->freq, ptr->srate, ptr->pol,
-                           ptr->diseqc, ptr->is_dvb_s2 ? "yes" : "no",
+                           ptr->diseqc, (delsys == SYS_DVBS2) ? "yes" : "no",
                            ptr->stream_id, ptr->service_id);
-            } else {
-                mp_verbose(log, "VDR, NUM: %d, NUM_FIELDS: %d, NAME: %s, "
-                           "FREQ: %d, SRATE: %d", list->NUM_CHANNELS, fields,
-                           ptr->name, ptr->freq, ptr->srate);
+                break;
+            default:
+                break;
             }
-        } else if (type == TUNER_TER) {
-            fields = sscanf(&line[k], ter_conf,
-                            &ptr->freq, inv, bw, cr, tmp_lcr, mod,
-                            transm, gi, tmp_hier, vpid_str, apid_str);
-            mp_verbose(log, "TER, NUM: %d, NUM_FIELDS: %d, NAME: %s, FREQ: %d",
-                       list->NUM_CHANNELS, fields, ptr->name, ptr->freq);
-        } else if (type == TUNER_CBL) {
-            fields = sscanf(&line[k], cbl_conf,
-                            &ptr->freq, inv, &ptr->srate,
-                            cr, mod, vpid_str, apid_str);
-            mp_verbose(log, "CBL, NUM: %d, NUM_FIELDS: %d, NAME: %s, FREQ: %d, "
-                       "SRATE: %d", list->NUM_CHANNELS, fields, ptr->name,
-                       ptr->freq, ptr->srate);
-        }
+        } else {
+            switch (delsys) {
+            case SYS_DVBT:
+            case SYS_DVBT2:
+                fields = sscanf(&line[k], ter_conf,
+                                &ptr->freq, inv, bw, cr, tmp_lcr, mod,
+                                transm, gi, tmp_hier, vpid_str, apid_str);
+                mp_verbose(log, "%s, NUM: %d, NUM_FIELDS: %d, NAME: %s, FREQ: %d",
+                           get_dvb_delsys(delsys), list->NUM_CHANNELS,
+                           fields, ptr->name, ptr->freq);
+                break;
+            case SYS_DVBC_ANNEX_A:
+            case SYS_DVBC_ANNEX_C:
+                fields = sscanf(&line[k], cbl_conf,
+                                &ptr->freq, inv, &ptr->srate,
+                                cr, mod, vpid_str, apid_str);
+                mp_verbose(log, "%s, NUM: %d, NUM_FIELDS: %d, NAME: %s, FREQ: %d, "
+                           "SRATE: %d",
+                           get_dvb_delsys(delsys),
+                           list->NUM_CHANNELS, fields, ptr->name,
+                           ptr->freq, ptr->srate);
+                break;
 #ifdef DVB_ATSC
-        else if (type == TUNER_ATSC) {
-            fields = sscanf(&line[k], atsc_conf,
-                            &ptr->freq, mod, vpid_str, apid_str);
-            mp_verbose(log, "ATSC, NUM: %d, NUM_FIELDS: %d, NAME: %s, FREQ: %d\n",
-                       list->NUM_CHANNELS, fields, ptr->name, ptr->freq);
-        }
+            case SYS_ATSC:
+                fields = sscanf(&line[k], atsc_conf,
+                                &ptr->freq, mod, vpid_str, apid_str);
+                mp_verbose(log, "%s, NUM: %d, NUM_FIELDS: %d, NAME: %s, FREQ: %d\n",
+                           get_dvb_delsys(delsys), list->NUM_CHANNELS,
+                           fields, ptr->name, ptr->freq);
+                break;
 #endif
-        else {       //SATELLITE
-            fields = sscanf(&line[k], sat_conf,
-                            &ptr->freq, &ptr->pol, &ptr->diseqc, &ptr->srate,
-                            vpid_str,
-                            apid_str);
-            ptr->pol = mp_toupper(ptr->pol);
-            ptr->freq *=  1000UL;
-            ptr->srate *=  1000UL;
-            ptr->tone = -1;
-            ptr->inv = INVERSION_AUTO;
-            ptr->cr = FEC_AUTO;
-            if ((ptr->diseqc > 4) || (ptr->diseqc < 0))
-                continue;
-            if (ptr->diseqc > 0)
-                ptr->diseqc--;
-            mp_verbose(log, "SAT, NUM: %d, NUM_FIELDS: %d, NAME: %s, FREQ: %d, "
-                       "SRATE: %d, POL: %c, DISEQC: %d",
-                       list->NUM_CHANNELS, fields, ptr->name, ptr->freq,
-                       ptr->srate, ptr->pol, ptr->diseqc);
+            case SYS_DVBS:
+            case SYS_DVBS2:
+                fields = sscanf(&line[k], sat_conf,
+                                &ptr->freq, &ptr->pol, &ptr->diseqc, &ptr->srate,
+                                vpid_str,
+                                apid_str);
+                ptr->pol = mp_toupper(ptr->pol);
+                ptr->freq *=  1000UL;
+                ptr->srate *=  1000UL;
+                if ((ptr->diseqc > 4) || (ptr->diseqc < 0))
+                    continue;
+                if (ptr->diseqc > 0)
+                    ptr->diseqc--;
+                mp_verbose(log, "%s, NUM: %d, NUM_FIELDS: %d, NAME: %s, FREQ: %d, "
+                           "SRATE: %d, POL: %c, DISEQC: %d",
+                           get_dvb_delsys(delsys),
+                           list->NUM_CHANNELS, fields, ptr->name, ptr->freq,
+                           ptr->srate, ptr->pol, ptr->diseqc);
+                break;
+            default:
+                break;
+            }
         }
 
         if (parse_pid_string(log, vpid_str, ptr))
@@ -425,13 +484,15 @@ static dvb_channels_list *dvb_get_channels(struct mp_log *log,
             mp_verbose(log, " %d ", ptr->pids[cnt]);
         mp_verbose(log, "\n");
 
-        if ((type == TUNER_TER) || (type == TUNER_CBL)) {
+        switch (delsys) {
+        case SYS_DVBT:
+        case SYS_DVBT2:
+        case SYS_DVBC_ANNEX_A:
+        case SYS_DVBC_ANNEX_C:
             if (!strcmp(inv, "INVERSION_ON")) {
                 ptr->inv = INVERSION_ON;
             } else if (!strcmp(inv, "INVERSION_OFF")) {
                 ptr->inv = INVERSION_OFF;
-            } else {
-                ptr->inv = INVERSION_AUTO;
             }
 
 
@@ -453,13 +514,15 @@ static dvb_channels_list *dvb_get_channels(struct mp_log *log,
                 ptr->cr = FEC_7_8;
             } else if (!strcmp(cr, "FEC_NONE")) {
                 ptr->cr = FEC_NONE;
-            } else {
-                ptr->cr = FEC_AUTO;
             }
         }
 
-
-        if (type == TUNER_TER || type == TUNER_CBL || type == TUNER_ATSC) {
+        switch (delsys) {
+        case SYS_DVBT:
+        case SYS_DVBT2:
+        case SYS_DVBC_ANNEX_A:
+        case SYS_DVBC_ANNEX_C:
+        case SYS_ATSC:
             if (!strcmp(mod, "QAM_128")) {
                 ptr->mod = QAM_128;
             } else if (!strcmp(mod, "QAM_256")) {
@@ -475,20 +538,23 @@ static dvb_channels_list *dvb_get_channels(struct mp_log *log,
                 ptr->mod = VSB_8;
             } else if (!strcmp(mod, "VSB_16") || !strcmp(mod, "16VSB")) {
                 ptr->mod = VSB_16;
-            } else if (!strcmp(mod, "QAM_AUTO")) {
-                ptr->mod = QAM_AUTO;
             }
-
 #endif
         }
 
-        if (type == TUNER_TER) {
-            if (!strcmp(bw, "BANDWIDTH_6_MHZ")) {
+        switch (delsys) {
+        case SYS_DVBT:
+        case SYS_DVBT2:
+            if (!strcmp(bw, "BANDWIDTH_5_MHZ")) {
+                ptr->bw = BANDWIDTH_5_MHZ;
+            } else if (!strcmp(bw, "BANDWIDTH_6_MHZ")) {
                 ptr->bw = BANDWIDTH_6_MHZ;
             } else if (!strcmp(bw, "BANDWIDTH_7_MHZ")) {
                 ptr->bw = BANDWIDTH_7_MHZ;
             } else if (!strcmp(bw, "BANDWIDTH_8_MHZ")) {
                 ptr->bw = BANDWIDTH_8_MHZ;
+            } else if (!strcmp(bw, "BANDWIDTH_10_MHZ")) {
+                ptr->bw = BANDWIDTH_10_MHZ;
             }
 
 
@@ -508,8 +574,6 @@ static dvb_channels_list *dvb_get_channels(struct mp_log *log,
                 ptr->gi = GUARD_INTERVAL_1_8;
             } else if (!strcmp(gi, "GUARD_INTERVAL_1_4")) {
                 ptr->gi = GUARD_INTERVAL_1_4;
-            } else {
-                ptr->gi = GUARD_INTERVAL_AUTO;
             }
 
             if (!strcmp(tmp_lcr, "FEC_1_2")) {
@@ -530,8 +594,6 @@ static dvb_channels_list *dvb_get_channels(struct mp_log *log,
                 ptr->cr_lp = FEC_7_8;
             } else if (!strcmp(tmp_lcr, "FEC_NONE")) {
                 ptr->cr_lp = FEC_NONE;
-            } else {
-                ptr->cr_lp = FEC_AUTO;
             }
 
 
@@ -541,9 +603,7 @@ static dvb_channels_list *dvb_get_channels(struct mp_log *log,
                 ptr->hier = HIERARCHY_2;
             } else if (!strcmp(tmp_hier, "HIERARCHY_4")) {
                 ptr->hier = HIERARCHY_4;
-            } else if (!strcmp(tmp_hier, "HIERARCHY_AUTO")) {
-                ptr->hier = HIERARCHY_AUTO;
-            } else {
+            } else if (!strcmp(tmp_hier, "HIERARCHY_NONE")) {
                 ptr->hier = HIERARCHY_NONE;
             }
         }
@@ -570,7 +630,6 @@ static dvb_channels_list *dvb_get_channels(struct mp_log *log,
         return NULL;
     }
 
-    list->current = 0;
     return list;
 }
 
@@ -578,16 +637,15 @@ void dvb_free_state(dvb_state_t *state)
 {
     int i, j;
 
-    for (i = 0; i < state->count; i++) {
-        free(state->cards[i].name);
-        if (!state->cards[i].list)
+    for (i = 0; i < state->adapters_count; i++) {
+        if (!state->adapters[i].list)
             continue;
-        if (state->cards[i].list->channels) {
-            for (j = 0; j < state->cards[i].list->NUM_CHANNELS; j++)
-                free(state->cards[i].list->channels[j].name);
-            free(state->cards[i].list->channels);
+        if (state->adapters[i].list->channels) {
+            for (j = 0; j < state->adapters[i].list->NUM_CHANNELS; j++)
+                free(state->adapters[i].list->channels[j].name);
+            free(state->adapters[i].list->channels);
         }
-        free(state->cards[i].list);
+        free(state->adapters[i].list);
     }
     free(state);
 }
@@ -597,47 +655,41 @@ static int dvb_streaming_read(stream_t *stream, char *buffer, int size)
     struct pollfd pfds[1];
     int pos = 0, tries, rk, fd;
     dvb_priv_t *priv  = (dvb_priv_t *) stream->priv;
-    dvb_state_t* state = priv->state;
+    dvb_state_t *state = priv->state;
 
     MP_TRACE(stream, "dvb_streaming_read(%d)\n", size);
 
-    tries = state->retry + 1;
-
+    tries = state->retry;
     fd = state->dvr_fd;
     while (pos < size) {
-        pfds[0].fd = fd;
-        pfds[0].events = POLLIN | POLLPRI;
-
-        rk = size - pos;
-        if (poll(pfds, 1, 500) <= 0) {
-            MP_ERR(stream, "dvb_streaming_read, attempt N. %d failed with "
-                   "errno %d when reading %d bytes\n", tries, errno, size - pos);
-            errno = 0;
-            if (--tries > 0)
-                continue;
-            break;
-        }
-        if ((rk = read(fd, &buffer[pos], rk)) > 0) {
-            pos += rk;
-            MP_TRACE(stream, "ret (%d) bytes\n", pos);
-        } else {
-          MP_ERR(stream, "dvb_streaming_read, poll ok but read failed with "
-                 "errno %d when reading %d bytes, size: %d, pos: %d\n",
-                 errno, size - pos, size, pos);
+        rk = read(fd, &buffer[pos], (size - pos));
+        if (rk <= 0) {
+            if (pos || tries == 0)
+                break;
+            tries --;
+            pfds[0].fd = fd;
+            pfds[0].events = POLLIN | POLLPRI;
+            if (poll(pfds, 1, 500) <= 0) {
+                MP_ERR(stream, "dvb_streaming_read, failed with "
+                        "errno %d when reading %d bytes\n", errno, size - pos);
+                errno = 0;
+                break;
+            }
+            continue;
         }
+        pos += rk;
+        MP_TRACE(stream, "ret (%d) bytes\n", pos);
     }
 
     if (!pos)
-        MP_ERR(stream, "dvb_streaming_read, return %d bytes\n", pos);
+        MP_ERR(stream, "dvb_streaming_read, return 0 bytes\n");
 
     return pos;
 }
 
-static void dvbin_close(stream_t *stream);
-
-int dvb_set_channel(stream_t *stream, int card, int n)
+int dvb_set_channel(stream_t *stream, unsigned int adapter, unsigned int n)
 {
-    dvb_channels_list *new_list;
+    dvb_channels_list_t *new_list;
     dvb_channel_t *channel;
     dvb_priv_t *priv = stream->priv;
     char buf[4096];
@@ -645,33 +697,33 @@ int dvb_set_channel(stream_t *stream, int card, int n)
     int devno;
     int i;
 
-    if ((card < 0) || (card > state->count)) {
-        MP_ERR(stream, "dvb_set_channel: INVALID CARD NUMBER: %d vs %d, abort\n",
-               card, state->count);
+    if (adapter >= state->adapters_count) {
+        MP_ERR(stream, "dvb_set_channel: INVALID internal ADAPTER NUMBER: %d vs %d, abort\n",
+               adapter, state->adapters_count);
         return 0;
     }
 
-    devno = state->cards[card].devno;
-    new_list = state->cards[card].list;
-    if ((n > new_list->NUM_CHANNELS) || (n < 0)) {
+    devno = state->adapters[adapter].devno;
+    new_list = state->adapters[adapter].list;
+    if (n > new_list->NUM_CHANNELS) {
         MP_ERR(stream, "dvb_set_channel: INVALID CHANNEL NUMBER: %d, for "
-               "card %d, abort\n", n, card);
+               "adapter %d, abort\n", n, devno);
         return 0;
     }
     channel = &(new_list->channels[n]);
 
     if (state->is_on) {  //the fds are already open and we have to stop the demuxers
-        for (i = 0; i < state->demux_fds_cnt; i++)
-            dvb_demux_stop(state->demux_fds[i]);
+        /* Remove all demuxes. */
+        dvb_fix_demuxes(priv, 0);
 
         state->retry = 0;
         //empty both the stream's and driver's buffer
-        while (dvb_streaming_read(stream, buf, 4096) > 0) {}
-        if (state->card != card) {
+        while (dvb_streaming_read(stream, buf, sizeof(buf)) > 0) {}
+        if (state->cur_adapter != adapter) {
             dvbin_close(stream);
             if (!dvb_open_devices(priv, devno, channel->pids_cnt)) {
                 MP_ERR(stream, "DVB_SET_CHANNEL, COULDN'T OPEN DEVICES OF "
-                       "CARD: %d, EXIT\n", card);
+                       "ADAPTER: %d, EXIT\n", devno);
                 return 0;
             }
         } else {
@@ -683,24 +735,23 @@ int dvb_set_channel(stream_t *stream, int card, int n)
     } else {
         if (!dvb_open_devices(priv, devno, channel->pids_cnt)) {
             MP_ERR(stream, "DVB_SET_CHANNEL2, COULDN'T OPEN DEVICES OF "
-                   "CARD: %d, EXIT\n", card);
+                   "ADAPTER: %d, EXIT\n", devno);
             return 0;
         }
     }
 
-    state->card = card;
-    state->list = new_list;
+    state->cur_adapter = adapter;
     state->retry = 5;
     new_list->current = n;
-    MP_VERBOSE(stream, "DVB_SET_CHANNEL: new channel name=%s, card: %d, "
-               "channel %d\n", channel->name, card, n);
+    MP_VERBOSE(stream, "DVB_SET_CHANNEL: new channel name=%s, adapter: %d, "
+               "channel %d\n", channel->name, devno, n);
 
     stream_drop_buffers(stream);
 
     if (channel->freq != state->last_freq) {
-        if (!dvb_tune(priv, channel->freq, channel->pol, channel->srate,
-                      channel->diseqc, channel->tone,
-                      channel->is_dvb_s2, channel->stream_id, channel->inv,
+        if (!dvb_tune(priv, channel->delsys, channel->freq,
+                      channel->pol, channel->srate, channel->diseqc,
+                      channel->stream_id, channel->inv,
                       channel->mod, channel->gi,
                       channel->trans, channel->bw, channel->cr, channel->cr_lp,
                       channel->hier, priv->cfg_timeout))
@@ -718,7 +769,7 @@ int dvb_set_channel(stream_t *stream, int card, int n)
                 MP_VERBOSE(stream, "DVB_SET_CHANNEL: PMT-PID for service %d "
                            "not resolved yet, parsing PAT...\n",
                            channel->service_id);
-                int pmt_pid = dvb_get_pmt_pid(priv, card, channel->service_id);
+                int pmt_pid = dvb_get_pmt_pid(priv, adapter, channel->service_id);
                 MP_VERBOSE(stream, "DVB_SET_CHANNEL: Found PMT-PID: %d\n",
                            pmt_pid);
                 channel->pids[i] = pmt_pid;
@@ -744,14 +795,13 @@ int dvb_set_channel(stream_t *stream, int card, int n)
 
 int dvb_step_channel(stream_t *stream, int dir)
 {
-    int new_current;
-    dvb_channels_list *list;
+    unsigned int new_current;
     dvb_priv_t *priv = stream->priv;
-    dvb_state_t* state = priv->state;
+    dvb_state_t *state = priv->state;
+    dvb_channels_list_t *list = state->adapters[state->cur_adapter].list;
 
     MP_VERBOSE(stream, "DVB_STEP_CHANNEL dir %d\n", dir);
 
-    list = state->list;
     if (list == NULL) {
         MP_ERR(stream, "dvb_step_channel: NULL list_ptr, quit\n");
         return 0;
@@ -760,43 +810,33 @@ int dvb_step_channel(stream_t *stream, int dir)
     new_current = (list->NUM_CHANNELS + list->current +
                   (dir >= 0 ? 1 : -1)) % list->NUM_CHANNELS;
 
-    return dvb_set_channel(stream, state->card, new_current);
+    return dvb_set_channel(stream, state->cur_adapter, new_current);
 }
 
 static int dvbin_stream_control(struct stream *s, int cmd, void *arg)
 {
     int r;
+    dvb_priv_t *priv  = (dvb_priv_t *) s->priv;
+    dvb_state_t *state = priv->state;
+    dvb_channels_list_t *list = NULL;
+
+
     switch (cmd) {
     case STREAM_CTRL_DVB_SET_CHANNEL: {
-        int *iarg = arg;
+        unsigned int *iarg = arg;
+        MP_VERBOSE(s, "dvbin_stream_control: cmd STREAM_CTRL_DVB_SET_CHANNEL: %i, %i\n", iarg[1], iarg[0]);
         r = dvb_set_channel(s, iarg[1], iarg[0]);
         if (r) {
           // Stream will be pulled down after channel switch,
           // persist state.
-          dvb_priv_t *priv  = (dvb_priv_t *) s->priv;
-          dvb_state_t* state = priv->state;
           state->switching_channel = true;
           return STREAM_OK;
         }
         return STREAM_ERROR;
     }
-    case STREAM_CTRL_DVB_SET_CHANNEL_NAME: {
-        char *progname = *((char**)arg);
-        dvb_priv_t *priv  = (dvb_priv_t *) s->priv;
-        dvb_state_t* state = priv->state;
-        int new_channel = -1;
-        for (int i=0; i < state->list->NUM_CHANNELS; ++i) {
-          if (!strcmp(state->list->channels[i].name, progname)) {
-            new_channel = i;
-            break;
-          }
-        }
-        if (new_channel == -1) {
-          MP_ERR(s, "Program '%s' not found for card %d!\n",
-                 progname, state->card);
-          return STREAM_ERROR;
-        }
-        r = dvb_set_channel(s, state->card, new_channel);
+    case STREAM_CTRL_DVB_STEP_CHANNEL: {
+        MP_VERBOSE(s, "dvbin_stream_control: cmd STREAM_CTRL_DVB_STEP_CHANNEL: %i\n", (*(int *)arg));
+        r = dvb_step_channel(s, (*(int *)arg));
         if (r) {
           // Stream will be pulled down after channel switch,
           // persist state.
@@ -805,44 +845,62 @@ static int dvbin_stream_control(struct stream *s, int cmd, void *arg)
         }
         return STREAM_ERROR;
     }
-    case STREAM_CTRL_DVB_STEP_CHANNEL: {
-        r = dvb_step_channel(s, *(int *)arg);
+    }
+
+
+    if (state->cur_adapter >= state->adapters_count)
+        return STREAM_ERROR;
+    list = state->adapters[state->cur_adapter].list;
+
+    switch (cmd) {
+    case STREAM_CTRL_GET_TV_FREQ:
+        (*(unsigned int*)arg) = list->channels[list->current].freq;
+        return STREAM_ERROR;
+    case STREAM_CTRL_DVB_SET_CHANNEL_NAME: {
+        char *progname = *((char**)arg);
+        unsigned int new_channel = (~(unsigned int)0);
+        MP_VERBOSE(s, "dvbin_stream_control: cmd STREAM_CTRL_DVB_SET_CHANNEL_NAME: %s\n", progname);
+        for (unsigned int i=0; i < list->NUM_CHANNELS; ++i) {
+           if (!strcmp(list->channels[i].name, progname)) {
+               new_channel = i;
+               break;
+            }
+        }
+        if (new_channel == -1) {
+              MP_ERR(s, "Program '%s' not found for adapter %d!\n",
+                     progname, state->adapters[state->cur_adapter].devno);
+              return STREAM_ERROR;
+        }
+        r = dvb_set_channel(s, state->cur_adapter, new_channel);
         if (r) {
           // Stream will be pulled down after channel switch,
           // persist state.
-          dvb_priv_t *priv  = (dvb_priv_t *) s->priv;
-          dvb_state_t* state = priv->state;
           state->switching_channel = true;
           return STREAM_OK;
         }
         return STREAM_ERROR;
     }
     case STREAM_CTRL_DVB_GET_CHANNEL_NAME: {
-      dvb_priv_t *priv  = (dvb_priv_t *) s->priv;
-      dvb_state_t* state = priv->state;
-      int current_channel = state->list->current;
-      char* progname = state->list->channels[current_channel].name;
-      *(char **)arg = talloc_strdup(NULL, progname);
-      return STREAM_OK;
+        MP_VERBOSE(s, "dvbin_stream_control: cmd STREAM_CTRL_DVB_GET_CHANNEL_NAME\n");
+        char *progname = list->channels[list->current].name;
+        *(char **)arg = talloc_strdup(NULL, progname);
+        return STREAM_OK;
     }
     case STREAM_CTRL_GET_METADATA: {
-      struct mp_tags* metadata = talloc_zero(NULL, struct mp_tags);
-      dvb_priv_t *priv  = (dvb_priv_t *) s->priv;
-      dvb_state_t* state = priv->state;
-      int current_channel = state->list->current;
-      char* progname = state->list->channels[current_channel].name;
-      mp_tags_set_str(metadata, "title", progname);
-      *(struct mp_tags **)arg = metadata;
-      return STREAM_OK;
+        struct mp_tags *metadata = talloc_zero(NULL, struct mp_tags);
+        char *progname = list->channels[list->current].name;
+        mp_tags_set_str(metadata, "title", progname);
+        *(struct mp_tags **)arg = metadata;
+        return STREAM_OK;
     }
     }
     return STREAM_UNSUPPORTED;
 }
 
-static void dvbin_close(stream_t *stream)
+void dvbin_close(stream_t *stream)
 {
     dvb_priv_t *priv  = (dvb_priv_t *) stream->priv;
-    dvb_state_t* state = priv->state;
+    dvb_state_t *state = priv->state;
 
     if (state->switching_channel && state->is_on) {
       // Prevent state destruction, reset channel-switch.
@@ -860,7 +918,6 @@ static void dvbin_close(stream_t *stream)
         close(state->demux_fds[i]);
     }
     close(state->dvr_fd);
-
     close(state->fe_fd);
     state->fe_fd = state->dvr_fd = -1;
 
@@ -872,39 +929,39 @@ static void dvbin_close(stream_t *stream)
     pthread_mutex_unlock(&global_dvb_state_lock);
 }
 
-static int dvb_streaming_start(stream_t *stream, int tuner_type, char *progname)
+static int dvb_streaming_start(stream_t *stream, char *progname)
 {
     int i;
     dvb_channel_t *channel = NULL;
     dvb_priv_t *priv = stream->priv;
-    dvb_state_t* state = priv->state;
-    dvb_priv_t *opts = priv;
+    dvb_state_t *state = priv->state;
+    dvb_channels_list_t *list;
 
-    MP_VERBOSE(stream, "\r\ndvb_streaming_start(PROG: %s, CARD: %d)\n",
-               opts->cfg_prog, opts->cfg_card);
+    if (progname == NULL)
+        return 0;
+    MP_VERBOSE(stream, "\r\ndvb_streaming_start(PROG: %s, ADAPTER: %d)\n",
+               progname, priv->cfg_devno);
 
     state->is_on = 0;
-
-    i = 0;
-    while ((channel == NULL) && i < state->list->NUM_CHANNELS) {
-        if (!strcmp(state->list->channels[i].name, progname))
-            channel = &(state->list->channels[i]);
-
-        i++;
+    list = state->adapters[state->cur_adapter].list;
+    for (i = 0; i < list->NUM_CHANNELS; i ++) {
+        if (!strcmp(list->channels[i].name, progname)) {
+            channel = &(list->channels[i]);
+            break;
+        }
     }
 
-    if (channel != NULL) {
-        state->list->current = i - 1;
-        MP_VERBOSE(stream, "PROGRAM NUMBER %d: name=%s, freq=%u\n", i - 1,
-                   channel->name, channel->freq);
-    } else {
+    if (channel == NULL) {
         MP_ERR(stream, "\n\nDVBIN: no such channel \"%s\"\n\n", progname);
         return 0;
     }
 
+    list->current = i;
+    MP_VERBOSE(stream, "PROGRAM NUMBER %d: name=%s, freq=%u\n", i,
+               channel->name, channel->freq);
 
-    if (!dvb_set_channel(stream, state->card, state->list->current)) {
-        MP_ERR(stream, "ERROR, COULDN'T SET CHANNEL  %i: ", state->list->current);
+    if (!dvb_set_channel(stream, state->cur_adapter, list->current)) {
+        MP_ERR(stream, "ERROR, COULDN'T SET CHANNEL  %i: \"%s\"\n", list->current, progname);
         dvbin_close(stream);
         return 0;
     }
@@ -921,27 +978,27 @@ static int dvb_open(stream_t *stream)
 {
     // I don't force  the file format because, although it's almost always TS,
     // there are some providers that stream an IP multicast with M$ Mpeg4 inside
+    dvb_priv_t *priv = NULL;
     char *progname;
-    int tuner_type = 0, i;
+    int i;
 
     pthread_mutex_lock(&global_dvb_state_lock);
     if (global_dvb_state && global_dvb_state->stream_used) {
-      MP_ERR(stream, "DVB stream already in use, only one DVB stream can exist at a time!");
+      MP_ERR(stream, "DVB stream already in use, only one DVB stream can exist at a time!\n");
       pthread_mutex_unlock(&global_dvb_state_lock);
-      return STREAM_ERROR;
+      goto err_out;
     }
 
     stream->priv = mp_get_config_group(stream, stream->global, &stream_dvb_conf);
-    dvb_state_t* state = dvb_get_state(stream);
-
-    dvb_priv_t *p = stream->priv;
-    p->log = stream->log;
+    dvb_state_t *state = dvb_get_state(stream);
 
-    p->state = state;
+    priv = stream->priv;
+    priv->state = state;
+    priv->log = stream->log;
     if (state == NULL) {
         MP_ERR(stream, "DVB CONFIGURATION IS EMPTY, exit\n");
         pthread_mutex_unlock(&global_dvb_state_lock);
-        return STREAM_ERROR;
+        goto err_out;
     }
     state->stream_used = true;
     pthread_mutex_unlock(&global_dvb_state_lock);
@@ -950,101 +1007,97 @@ static int dvb_open(stream_t *stream)
       // State could be already initialized, for example, we just did a channel switch.
       // The following setup only has to be done once.
 
-      state->card = -1;
-      for (i = 0; i < state->count; i++) {
-          if (state->cards[i].devno + 1 == p->cfg_card) {
-              state->card = i;
+      state->cur_adapter = -1;
+      for (i = 0; i < state->adapters_count; i++) {
+          if (state->adapters[i].devno == priv->cfg_devno) {
+              state->cur_adapter = i;
               break;
           }
       }
 
-      if (state->card == -1) {
-          MP_ERR(stream, "NO CONFIGURATION FOUND FOR CARD N. %d, exit\n",
-                 p->cfg_card);
-          return STREAM_ERROR;
-      }
-      state->timeout = p->cfg_timeout;
-
-      tuner_type = state->cards[state->