BDA: support for DVB-T2

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

modules/access/dtv/bdadefs.h

@@ -37,6 +37,7 @@ class IDVBCLocator;
 class IDVBSLocator;
 class IDVBSTuningSpace;
 class IDVBTLocator;
+class IDVBTLocator2;
 class IDVBTuneRequest;
 class IDVBTuningSpace;
 class IDVBTuningSpace2;
@@ -517,6 +518,13 @@ public:
         VARIANT_BOOL OtherFrequencyInUseVal )=0;
 };
 
+class IDVBTLocator2 : public IDVBTLocator
+{
+public:
+    virtual HRESULT __stdcall get_PhysicalLayerPipeId( long* pl_plp )=0;
+    virtual HRESULT __stdcall put_PhysicalLayerPipeId( long l_plp )=0;
+};
+
 class ITuningSpace : public IDispatch
 {
 public:
@@ -990,6 +998,10 @@ extern const CLSID CLSID_DVBSNetworkProvider;
 extern const CLSID CLSID_DVBSTuningSpace;
 extern const CLSID CLSID_DVBTuningSpace;
 extern const CLSID CLSID_DVBTLocator;
+/* Following symbol does not exist in library
+extern const CLSID CLSID_DVBTLocator2; */
+const CLSID CLSID_DVBTLocator2 =
+    {0xEFE3FA02,0x45D7,0x4920,{0xBE,0x96,0x53,0xFA,0x7F,0x35,0xB0,0xE6}};
 extern const CLSID CLSID_DVBTNetworkProvider;
 extern const CLSID CLSID_FilterGraph;
 extern const CLSID CLSID_InfTee;
@@ -1011,6 +1023,10 @@ const IID IID_IBDA_Topology =
     {0x79B56888,0x7FEA,0x4690,{0xB4,0x5D,0x38,0xFD,0x3C,0x78,0x49,0xBE}};
 extern const IID IID_ICreateDevEnum;
 extern const IID IID_IDVBTLocator;
+/* Following symbol does not exist in library
+extern const IID IID_IDVBTLocator2; */
+const IID IID_IDVBTLocator2 =
+    {0x448A2EDF,0xAE95,0x4b43,{0xA3,0xCC,0x74,0x78,0x43,0xC4,0x53,0xD4}};
 extern const IID IID_IDVBCLocator;
 extern const IID IID_IDVBSLocator;
 extern const IID IID_IDVBSTuningSpace;

modules/access/dtv/bdagraph.hpp

@@ -39,6 +39,32 @@ using namespace std;
 #include <comcat.h>
 #include "dtv/bdadefs.h"
 
+
+// TBS tuner extension headers
+
+typedef struct _tbs_plp_info // PLP info for TBS tuners struct
+{
+
+    unsigned char plpId; //The Rel PLPID need to set
+
+    unsigned char plpCount; //PLP count number
+
+    unsigned char plpResered1;//
+
+    unsigned char plpResered2;//  memory size set to 4
+
+    unsigned char plpIdList[256];//store the Rel PLPID
+
+} TBS_PLP_INFO,*p_TBS_PLP_INFO;
+
+const GUID KSPROPSETID_BdaTunerExtensionProperties = {0xfaa8f3e5, 0x31d4, 0x4e41, {0x88, 0xef, 0xd9, 0xeb, 0x71, 0x6f, 0x6e, 0xc9}};
+
+DWORD KSPROPERTY_BDA_PLPINFO = 22;
+
+// End of TBS tuner extension headers
+
+
+
 class BDAOutput
 {
 public:
@@ -74,6 +100,7 @@ public:
     int SetCQAM(long);
     int SetATSC(long);
     int SetDVBT(long, uint32_t, uint32_t, long, int, uint32_t, int);
+    int SetDVBT2(long, uint32_t, long, int, uint32_t, int);
     int SetDVBC(long, const char *, long);
     int SetDVBS(long, long, uint32_t, int, char, long, long, long);
 
@@ -129,6 +156,7 @@ private:
     HRESULT Check( REFCLSID guid_this_network_type );
     HRESULT GetFilterName( IBaseFilter* p_filter, char** psz_bstr_name );
     HRESULT GetPinName( IPin* p_pin, char** psz_bstr_name );
+    IPin* FindPinOnFilter( IBaseFilter* pBaseFilter, const char* pPinName);
     unsigned GetSystem( REFCLSID clsid );
     HRESULT ListFilters( REFCLSID this_clsid );
     HRESULT FindFilter( REFCLSID clsid, long* i_moniker_used,