Skip to contentSkip to conversation

v4l-utils: fix DVB-S scan

PATCH In review Stefan Seyfried 2 participants 2 messages Feb 10, 2021 – Dec 14, 2021 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 v4l-utils: fix DVB-S scan

Hi all,

dvbv5-scan did report all channels as DVB-S2, due to broken logic.
Debug output showed "modulation_system DVB-S" correctly, but the code that stores the delivery system for output used a different (IMO invalid) logic.
This in turn made drivers that actually care for the delivery system (e.g. b2c2-flexcop-pci / cx24120) unhappy, resulting in incomplete scan results. For drivers that just don't care (e.g. dvb-usb-technisat-usb2 / stv6110x) it "just" resulted in wrong "DELIVERY_SYSTEM = DVBS2" for all channels in scan output.

The patch is attached, because I'm pretty sure that Thunderbird would mess it up. You can also fetch it from

https://github.com/seife/v4l-utils.git fix-dvbs-scan

Best regards,

Stefan

lib/libdvbv5/dvb-scan.c +4 -1
@@ -1118,9 +1118,12 @@ static void add_update_nit_dvbs
                             dvbs_dvbc_dvbs_freq_inner[d->fec]);
        dvb_store_entry_prop(new, DTV_ROLLOFF,
                             dvbs_rolloff[d->roll_off]);
-       if (d->roll_off != 0)
+       if (d->modulation_system != 0)
                dvb_store_entry_prop(new, DTV_DELIVERY_SYSTEM,
                                     SYS_DVBS2);
+       else
+               dvb_store_entry_prop(new, DTV_DELIVERY_SYSTEM,
+                                    SYS_DVBS);
 }
 
 static void add_update_nit_isdbs(struct dvb_table_nit *nit,
Signature · 4 lines
Stefan Seyfried

"For a successful technology, reality must take precedence over
 public relations, for nature cannot be fooled." -- Richard Feynman

From 40fff15906b59457adb5d7a1a3ededf6c51af6af Mon Sep 17 00:00:00 2001
From: Stefan Seyfried <[email protected]>
Date: Wed, 10 Feb 2021 15:13:38 +0100
Subject: [PATCH] dvb-scan: fix DVB-S/S2 type reporting

All transponders were reported as DVB-S2, and later tuning with the resulting channels file failed with drivers that use the delsys field. (Apparently most modern drivers do not really care, probably this is the reason this could go unnoticed).

---
 lib/libdvbv5/dvb-scan.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
lib/libdvbv5/dvb-scan.c +4 -1
index 5c8aca96..0749d262 100644
@@ -1118,9 +1118,12 @@ static void add_update_nit_dvbs(struct dvb_table_nit *nit,
 			     dvbs_dvbc_dvbs_freq_inner[d->fec]);
 	dvb_store_entry_prop(new, DTV_ROLLOFF,
 			     dvbs_rolloff[d->roll_off]);
-	if (d->roll_off != 0)
+	if (d->modulation_system != 0)
 		dvb_store_entry_prop(new, DTV_DELIVERY_SYSTEM,
 				     SYS_DVBS2);
+	else
+		dvb_store_entry_prop(new, DTV_DELIVERY_SYSTEM,
+				     SYS_DVBS);
 }
 
 static void add_update_nit_isdbs(struct dvb_table_nit *nit,
Signature · 1 line
2.26.2
#1 lore raw

Em Wed, 10 Feb 2021 16:13:56 +0100
Stefan Seyfried <[email protected]> escreveu:

Quoted 24 lines

Hi all,

dvbv5-scan did report all channels as DVB-S2, due to broken logic. Debug output showed "modulation_system DVB-S" correctly, but the code that stores the delivery system for output used a different (IMO invalid) logic.
This in turn made drivers that actually care for the delivery system (e.g. b2c2-flexcop-pci / cx24120) unhappy, resulting in incomplete scan results. For drivers that just don't care (e.g. dvb-usb-technisat-usb2 / stv6110x) it "just" resulted in wrong "DELIVERY_SYSTEM = DVBS2" for all channels in scan output.

The patch is attached, because I'm pretty sure that Thunderbird would mess it up. You can also fetch it from

https://github.com/seife/v4l-utils.git fix-dvbs-scan

Best regards,

Stefan

lib/libdvbv5/dvb-scan.c static void add_update_nit_dvbs · line 1126

Quoted 10 lines
lib/libdvbv5/dvb-scan.c +4 -1
@@ -1118,9 +1118,12 @@ static void add_update_nit_dvbs
                              dvbs_dvbc_dvbs_freq_inner[d->fec]);
         dvb_store_entry_prop(new, DTV_ROLLOFF,
                              dvbs_rolloff[d->roll_off]);
-       if (d->roll_off != 0)
+       if (d->modulation_system != 0)
                 dvb_store_entry_prop(new, DTV_DELIVERY_SYSTEM,
                                      SYS_DVBS2);
+       else
+               dvb_store_entry_prop(new, DTV_DELIVERY_SYSTEM,
+                                    SYS_DVBS);

This will likely break for DVBS2. What should be done here would be to check if the returned parameters fit on DVB-S or DVB-S2.

So, it should be like:

	if (d->modulation_system != QPSK || (d->roll_off && d->roll_off != ROLLOFF_35)
                  dvb_store_entry_prop(new, DTV_DELIVERY_SYSTEM,
                                       SYS_DVBS2);
       else
                  dvb_store_entry_prop(new, DTV_DELIVERY_SYSTEM,
                                       SYS_DVBS);

Perhaps it should also test FEC as well, as some are only available on DVB-S2.

Regards,
Mauro

Thanks,
Mauro