[dvblast-devel] [Git][videolan/dvblast][master] 2 commits: Add apsk_16 and apsk_32 modulation in documentation

[Christophe Massiot]

Christophe Massiot pushed to branch master at VideoLAN / dvblast


Commits:
7d8a128f by Georgi Chorbadzhiyski at 2018-03-21T17:28:12+01:00
Add apsk_16 and apsk_32 modulation in documentation

- - - - -
51d8a388 by Georgi Chorbadzhiyski at 2018-03-21T17:28:12+01:00
Show TURBO_FEC flag if it's supported by the frontend

- - - - -


5 changed files:

- README
- dvb.c
- dvblast.1
- dvblast.c
- dvblastctl.c


Changes:

=====================================
README
=====================================
--- a/README
+++ b/README
@@ -40,9 +40,11 @@ for instance for DVB-S :
 
 dvblast -f 11570000 -s 27500000 -v 18
 
-This tunes to frequency 11570 MHz, symbol rate 27500, horizontal (-v 18). For
-DVB-S2, you must indicate a modulation with -m qpsk or -m psk_8. For DVB-T,
-a bandwidth (usually -b 8 for 8 MHz multiplexes).
+This tunes to frequency 11570 MHz, symbol rate 27500, horizontal (-v 18).
+
+For DVB-S2 you must indicate a modulation with -m qpsk|psk_8|apsk_16|apsk_32.
+
+For DVB-T you must indicate a bandwidth, usually -b 8 for 8 MHz multiplexes.
 
 Please note that frequencies are in kHz for DVB-S/S2/C, but Hz for DVB-T.
 Symbol rates are in symbols/s, and bandwidths in MHz. If you have several


=====================================
dvb.c
=====================================
--- a/dvb.c
+++ b/dvb.c
@@ -52,6 +52,7 @@
 #if DVBAPI_VERSION < 508
   #define DTV_STREAM_ID        42
   #define FE_CAN_MULTISTREAM   0x4000000
+  #define FE_CAN_TURBO_FEC     0x8000000
 #endif
 
 #define MAX_DELIVERY_SYSTEMS 20
@@ -809,6 +810,7 @@ static void FrontendInfo( struct dvb_frontend_info *info, uint32_t version,
     FRONTEND_INFO( info->caps, FE_CAN_2G_MODULATION, "2G_MODULATION" )
 #endif
     FRONTEND_INFO( info->caps, FE_CAN_MULTISTREAM, "MULTISTREAM" )
+    FRONTEND_INFO( info->caps, FE_CAN_TURBO_FEC, "TURBO_FEC" )
     FRONTEND_INFO( info->caps, FE_NEEDS_BENDING, "NEEDS_BENDING" )
     FRONTEND_INFO( info->caps, FE_CAN_RECOVER, "FE_CAN_RECOVER" )
     FRONTEND_INFO( info->caps, FE_CAN_MUTE_TS, "FE_CAN_MUTE_TS" )


=====================================
dvblast.1
=====================================
--- a/dvblast.1
+++ b/dvblast.1
@@ -129,7 +129,7 @@ DVB-C  qpsk|qam_16|qam_32|qam_64|qam_128|qam_256 (default qam_auto)
 .br
 DVB-T  qam_16|qam_32|qam_64|qam_128|qam_256 (default qam_auto)
 .br
-DVB-S2 qpsk|psk_8 (default legacy DVB-S)
+DVB-S2 qpsk|psk_8|apsk_16|apsk_32 (default legacy DVB-S)
 .TP
 \fB\-M\fR, \fB\-\-network-name\fR <name>
 DVB network name to declare in the NIT


=====================================
dvblast.c
=====================================
--- a/dvblast.c
+++ b/dvblast.c
@@ -651,7 +651,7 @@ void usage()
     msg_Raw( NULL, "  -m --modulation       Modulation type" );
     msg_Raw( NULL, "    DVB-C  qpsk|qam_16|qam_32|qam_64|qam_128|qam_256 (default qam_auto)" );
     msg_Raw( NULL, "    DVB-T  qam_16|qam_32|qam_64|qam_128|qam_256 (default qam_auto)" );
-    msg_Raw( NULL, "    DVB-S2 qpsk|psk_8 (default legacy DVB-S)" );
+    msg_Raw( NULL, "    DVB-S2 qpsk|psk_8|apsk_16|apsk_32 (default legacy DVB-S)" );
     msg_Raw( NULL, "  -n --frontend-number <frontend number>" );
     msg_Raw( NULL, "  -p --force-pulse      force 22kHz pulses for high-band selection (DVB-S)" );
     msg_Raw( NULL, "  -P --pilot            DVB-S2 Pilot (-1 auto, 0 off, 1 on)" );


=====================================
dvblastctl.c
=====================================
--- a/dvblastctl.c
+++ b/dvblastctl.c
@@ -689,6 +689,7 @@ int main( int i_argc, char **ppsz_argv )
         PRINT_CAPS( CAN_2G_MODULATION );
 #endif
 #if DVBAPI_VERSION >= 508
+        PRINT_CAPS( CAN_TURBO_FEC );
         PRINT_CAPS( CAN_MULTISTREAM );
 #endif
 #undef PRINT_CAPS



View it on GitLab: https://code.videolan.org/videolan/dvblast/compare/77cfaa8434cb3f0a9abd5df2bd763efd7cb35f85...51d8a388564fb01368e5d383a6e2c4383d243022

---
View it on GitLab: https://code.videolan.org/videolan/dvblast/compare/77cfaa8434cb3f0a9abd5df2bd763efd7cb35f85...51d8a388564fb01368e5d383a6e2c4383d243022
You're receiving this email because of your account on code.videolan.org.