Changeset 5d8058951fb5a4848d7638701a6a073865437556

Timestamp:

17/05/07 00:00:59 (2 years ago)

Author:

Ken Self <kenself@videolan.org>

git-committer:

Ken Self <kenself@videolan.org> 1179352859 +0000

git-parent:

[9b071a166b6aae1968976fc54855af6e31a389d9]

git-author:

Ken Self <kenself@videolan.org> 1179352859 +0000

Message:

BDA - additional DVB-S parameters added

Files:

• modules/access/bda/bda.c (modified) (4 diffs)
• modules/access/bda/bdadefs.h (modified) (5 diffs)
• modules/access/bda/bdagraph.cpp (modified) (6 diffs)

modules/access/bda/bda.c

@@ -89 +89 @@
-
-#define LNB_LOF1_TEXT N_("Antenna lnb_lof1 (kHz)")
-""
+N_("Low Band Local Osc Freq in kHz usually 9.75GHz")
-
-#define LNB_LOF2_TEXT N_("Antenna lnb_lof2 (kHz)")
-""
+N_("High Band Local Osc Freq in kHz usually 10.6GHz")
-
-#define LNB_SLOF_TEXT N_("Antenna lnb_slof (kHz)")
-
+
+
-
-/* Cable */
@@ -167 +168 @@
-#   if defined(WIN32) || defined(WINCE)
-        add_integer( "dvb-azimuth", 0, NULL, AZIMUTH_TEXT, AZIMUTH_LONGTEXT,
-FALS
+TRU
-        add_integer( "dvb-elevation", 0, NULL, ELEVATION_TEXT,
-FALS
+TRU
-        add_integer( "dvb-longitude", 0, NULL, LONGITUDE_TEXT,
-FALS
+TRU
-        add_string( "dvb-polarisation", NULL, NULL, POLARISATION_TEXT,
-FALS
+TRU
-            change_string_list( ppsz_polar_list, ppsz_polar_text, 0 );
-            /* Note: Polaristion H = voltage 18; V = voltage 13; */
@@ -185 +186 @@
-        add_integer( "dvb-tone", -1, NULL, TONE_TEXT, TONE_LONGTEXT,
-            VLC_TRUE );
-        add_integer( "dvb-lnb-lof1", 0, NULL, LNB_LOF1_TEXT,
-            LNB_LOF1_LONGTEXT, VLC_TRUE );
-        add_integer( "dvb-lnb-lof2", 0, NULL, LNB_LOF2_TEXT,
-            LNB_LOF2_LONGTEXT, VLC_TRUE );
-        add_integer( "dvb-lnb-slof", 0, NULL, LNB_SLOF_TEXT,
-            LNB_SLOF_LONGTEXT, VLC_TRUE );
-#   endif
+    add_integer( "dvb-lnb-lof1", 0, NULL, LNB_LOF1_TEXT,
+        LNB_LOF1_LONGTEXT, VLC_TRUE );
+    add_integer( "dvb-lnb-lof2", 0, NULL, LNB_LOF2_TEXT,
+        LNB_LOF2_LONGTEXT, VLC_TRUE );
+    add_integer( "dvb-lnb-slof", 0, NULL, LNB_SLOF_TEXT,
+        LNB_SLOF_LONGTEXT, VLC_TRUE );
+
-    add_integer( "dvb-fec", 9, NULL, FEC_TEXT, FEC_LONGTEXT, VLC_TRUE );
-    add_integer( "dvb-srate", 27500000, NULL, SRATE_TEXT, SRATE_LONGTEXT,
@@ -243 +245 @@
-    access_sys_t *p_sys;
-    const char* psz_module  = "dvb";
-9
+12
-    const char* psz_param[] = { "frequency", "bandwidth",
-        "srate", "azimuth", "elevation", "longitude", "polarisation",
-
+, "lnb-lof1", "lnb-lof2", "lnb-slof"
-
-    const int   i_type[] = { VLC_VAR_INTEGER, VLC_VAR_INTEGER,
-        VLC_VAR_INTEGER, VLC_VAR_INTEGER, VLC_VAR_INTEGER, VLC_VAR_INTEGER,
-
+
+
-
-    char  psz_full_name[128];

modules/access/bda/bdadefs.h

@@ -30 +30 @@
-class IDVBCLocator;
-class IDVBSLocator;
+class IDVBSTuningSpace;
-class IDVBTLocator;
-class IDVBTuneRequest;
+class IDVBTuningSpace;
+class IDVBTuningSpace2;
-class IEnumComponents;
-class IEnumComponentTypes;
@@ -76 +79 @@
-    StatusUnavailable,
-} ComponentStatus;
+
+typedef enum DVBSystemType
+{
+    DVB_Cable,
+    DVB_Terrestrial,
+    DVB_Satellite,
+} DVBSystemType;
-
-typedef enum FECMethod
@@ -151 +161 @@
-} Polarisation;
-
+typedef enum SpectralInversion
+{
+    BDA_SPECTRAL_INVERSION_NOT_SET = -1,
+    BDA_SPECTRAL_INVERSION_NOT_DEFINED = 0,
+    BDA_SPECTRAL_INVERSION_AUTOMATIC = 1,
+    BDA_SPECTRAL_INVERSION_NORMAL,
+    BDA_SPECTRAL_INVERSION_INVERTED,
+    BDA_SPECTRAL_INVERSION_MAX
+} SpectralInversion;
+
-typedef enum TransmissionMode
-{
@@ -454 +474 @@
-};
-
+class IDVBTuningSpace : public ITuningSpace
+{
+public:
+    virtual HRESULT __stdcall get_SystemType( DVBSystemType* p_sys_type )=0;
+    virtual HRESULT __stdcall put_SystemType( DVBSystemType sys_type )=0;
+};
+
+class IDVBTuningSpace2 : public IDVBTuningSpace
+{
+public:
+    virtual HRESULT __stdcall get_NetworkID( long* p_l_network_id )=0;
+    virtual HRESULT __stdcall put_NetworkID( long l_network_id )=0;
+};
+
+class IDVBSTuningSpace : public IDVBTuningSpace2
+{
+public:
+    virtual HRESULT __stdcall get_LowOscillator( long* p_l_low_osc )=0;
+    virtual HRESULT __stdcall put_LowOscillator( long l_low_osc )=0;
+    virtual HRESULT __stdcall get_HighOscillator( long* p_l_high_osc )=0;
+    virtual HRESULT __stdcall put_HighOscillator( long l_high_osc )=0;
+    virtual HRESULT __stdcall get_LNBSwitch( long* p_l_lnb_switch )=0;
+    virtual HRESULT __stdcall put_LNBSwitch( long l_lnb_switch )=0;
+    virtual HRESULT __stdcall get_InputRange( BSTR* p_bstr_input_range )=0;
+    virtual HRESULT __stdcall put_InputRange( BSTR bstr_input_range )=0;
+    virtual HRESULT __stdcall get_SpectralInversion(
+        SpectralInversion* p_spectral_inv )=0;
+    virtual HRESULT __stdcall put_SpectralInversion(
+        SpectralInversion spectral_inv )=0;
+};
+
-class ITuningSpaceContainer : public IDispatch
-{
@@ -518 +569 @@
-extern const GUID IID_IDVBSTuningSpace;
-extern const GUID IID_IDVBTuneRequest;
+extern const GUID IID_IDVBTuningSpace;
+extern const GUID IID_IDVBTuningSpace2;
-extern const GUID IID_IGraphBuilder;
-extern const GUID IID_IMediaControl;

modules/access/bda/bdagraph.cpp

@@ -436 +436 @@
-        IDVBTuneRequest* p_dvbs_tune_request;
-        IDVBSLocator* p_dvbs_locator;
-
+
+
+
-        ~localComPtr()
-        {
+            if( p_dvbs_tuning_space )
+                p_dvbs_tuning_space->Release();
-            if( p_dvbs_tune_request )
-                p_dvbs_tune_request->Release();
@@ -446 +450 @@
-    } l;
-    long l_frequency, l_symbolrate, l_azimuth, l_elevation, l_longitude;
+    long l_lnb_lof1, l_lnb_lof2, l_lnb_slof;
-    char* psz_polarisation;
-    Polarisation i_polar;
@@ -451 +456 @@
-
-    l_frequency = l_symbolrate = l_azimuth = l_elevation = l_longitude = -1;
+    l_lnb_lof1 = l_lnb_lof2 = l_lnb_slof = -1;
-    l_frequency = var_GetInteger( p_access, "dvb-frequency" );
-    l_symbolrate = var_GetInteger( p_access, "dvb-srate" );
@@ -456 +462 @@
-    l_elevation = var_GetInteger( p_access, "dvb-elevation" );
-    l_longitude = var_GetInteger( p_access, "dvb-longitude" );
+    l_lnb_lof1 = var_GetInteger( p_access, "dvb-lnb-lof1" );
+    l_lnb_lof2 = var_GetInteger( p_access, "dvb-lnb-lof2" ); 
+    l_lnb_slof = var_GetInteger( p_access, "dvb-lnb-slof" );
-    psz_polarisation = var_GetString( p_access, "dvb-polarisation" );
-
@@ -497 +506 @@
-        msg_Warn( p_access, "SubmitDVBSTuneRequest: "\
-            "Cannot create the DVBS Locator: hr=0x%8lx", hr );
+        return VLC_EGENERIC;
+    }
+
+    hr = p_tuning_space->QueryInterface( IID_IDVBSTuningSpace,
+        (void**)&l.p_dvbs_tuning_space );
+    if( FAILED( hr ) )
+    {
+        msg_Warn( p_access, "SubmitDVBSTuneRequest: "\
+            "Cannot QI for IDVBSTuningSpace: hr=0x%8lx", hr );
-        return VLC_EGENERIC;
-    }
@@ -515 +533 @@
-    if( SUCCEEDED( hr ) && i_polar != BDA_POLARISATION_NOT_SET )
-        hr = l.p_dvbs_locator->put_SignalPolarisation( i_polar );
+    if( SUCCEEDED( hr ) && l_lnb_lof1 > 0 )
+        hr = l.p_dvbs_tuning_space->put_LowOscillator( l_lnb_lof1 );
+    if( SUCCEEDED( hr ) && l_lnb_lof2 > 0 )
+        hr = l.p_dvbs_tuning_space->put_HighOscillator( l_lnb_lof2 );
+    if( SUCCEEDED( hr ) && l_lnb_slof > 0 )
+        hr = l.p_dvbs_tuning_space->put_HighOscillator( l_lnb_slof );
-    if( FAILED( hr ) )
-    {