From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Mon, 17 Nov 2008 15:26:58 +0000 (+0100)
Subject: Support for QAM modulation on ATSC
X-Git-Tag: 1.0.0-pre1~2148
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=5c96f1ca97f41550e06088e008459e525f67f724;p=vlc

Support for QAM modulation on ATSC

Default is not QAM_AUTO because ATSC is mainly using VSB_8 for non-cable operations.
Patch by Charles Hordis
---

diff --git a/THANKS b/THANKS
index 5ef38143eb..f6f50c60eb 100644
--- a/THANKS
+++ b/THANKS
@@ -54,6 +54,7 @@ Carlo Calabrò <murray at via.ecp.fr> - Italian localization
 Carsten Gottbehüt <gottbehuet at active-elements dot de> - v4l hotplug fix
 Carsten Haitzler <raster __at__ rasterman dot com> - x11 fullscreen fix
 Cédric Cocquebert - Misc opengl effects for the OpenGL Video Output. "Panoramix" video filter for image walls with automatic attenuation. Fix on sharpen filter.
+Charles Hordis - QAM modulation on ATSC
 Chris Clepper - OpenGL fix
 Christian Henz - libupnp service discovery plugin, CyberLink UPnP fixes
 Cristian Secară <cristi at secarica dot ro> - Romanian l10n
diff --git a/modules/access/dvb/linux_dvb.c b/modules/access/dvb/linux_dvb.c
index f6ed3afe8a..365dc73ba0 100644
--- a/modules/access/dvb/linux_dvb.c
+++ b/modules/access/dvb/linux_dvb.c
@@ -794,8 +794,13 @@ static fe_modulation_t DecodeModulationATSC( access_t *p_access )
 {
     switch( var_GetInteger( p_access, "dvb-modulation" ) )
     {
+        case 0:     return QAM_AUTO;
         case 8:     return VSB_8;
         case 16:    return VSB_16;
+        case 32:    return QAM_32;
+        case 64:    return QAM_64;
+        case 128:   return QAM_128;
+        case 256:   return QAM_256;
         default:
             msg_Dbg( p_access, "ATSC modulation not set, using VSB 8");
             return VSB_8;