search

stefantalpalaru / w_scan2

w_scan fork (channel scan tool which generates ATSC, DVB-C, DVB-S/S2 and DVB-T/T2 channels.conf files)
GNU General Public License v2.0
80 stars 22 forks source link

dvbv5-scan fails while parsing DVBV5 channel config file #34

Closed optimosfet closed 3 years ago

optimosfet commented 3 years ago

Hi,

dvbv5-scan (>= v1.20.0) fails while parsing channel config files (dvbv5 format), created by w_scan2 (>= v1.0.11).

w_scan2 dumps the value for the modulation parameter differently than expected by dvbv5-scan utility: https://github.com/stefantalpalaru/w_scan2/blob/0e035c68d1a832e597f9678bb05b7398cdc79703/src/dvbscan.c#L245-L255

https://git.linuxtv.org/v4l-utils.git/tree/lib/libdvbv5/dvb-v5.c?h=stable-1.20#n70

const char *fe_modulation_name[15] = {
    [APSK_16] =  "APSK/16",
    [APSK_32] =  "APSK/32",
    [DQPSK] =    "DQPSK",
    [PSK_8] =    "PSK/8",
    [QAM_4_NR] = "QAM/4_NR",
    [QAM_16] =   "QAM/16",
    [QAM_32] =   "QAM/32",
    [QAM_64] =   "QAM/64",
    [QAM_128] =  "QAM/128",
    [QAM_256] =  "QAM/256",
    [QAM_AUTO] = "QAM/AUTO",
    [QPSK] =     "QPSK",
    [VSB_8] =    "VSB/8",
    [VSB_16] =   "VSB/16",
    [14] = NULL,
};
stefantalpalaru commented 3 years ago

Should be fixed by https://github.com/stefantalpalaru/w_scan2/commit/22102969082ad0533facbb3d96f47972104793af

Please test it.

optimosfet commented 3 years ago

@stefantalpalaru I can confirm this, at least this also applies to my test environment.

Thx for your prompt fix.