. configure.in: fixed a typo

. dvbinput: multiple streams support courtesy of Andrew de Quincey
. dvbready: timeout workaround courtesy of Andrew de Quincey

ChangeLog

@@ -2,13 +2,17 @@
 # ChangeLog for vls #
 #===================#
 
-0.4.5
+0.5.0
+  * application.cpp: search for vls.cfg in current path
+  * dvbreader: timeout workaround
+  * dvbinput: multiple stream support 
   * Makefile configure configure.in: Fixed 'make dist'
   * ALL: Fixed compile issues on OpenBSD.
   * ALL: Added a command line launching solution for easy configuration
-  * application.cpp parsers.cpp: stream type audectection when using command line
-  * /cvs/videolan/vls/src/modules/dvbinput/: new dvbinput working with the new
-    linuxtv drivers and the libdvb (also prodvide by linuxtv.org)
+  * application.cpp parsers.cpp: stream type audectection when using command
+    line
+  * src/modules/dvbinput/: new dvbinput working with the new linuxtv drivers
+    and the libdvb (also prodvide by linuxtv.org)
   * src/extras/: added GNU getopt functions for command line compilation under
     Windows and MacOS X
   * /cvs/videolan/vls/doc/: Update of the VLS documentation

configure.in

@@ -369,7 +369,7 @@ then
       DVBINPUT_LCFLAGS="${DVBINPUT_LCFLAGS} -L${with_dvb}/libdvb"
       PLUGINS="${PLUGINS} dvbinput dvbreader"
     else
-      AC_MSG_ERROR([cannot find ${with_dvb}/libdvb/libdvb.a, make sure you compiled libdvbpsi in ${with_dvb}/libdvb])
+      AC_MSG_ERROR([cannot find ${with_dvb}/libdvb/libdvb.a, make sure you compiled libdvb in ${with_dvb}/libdvb])
     fi
 fi
 

src/modules/dvbinput/dvbinput.cpp

@@ -2,7 +2,7 @@
 * dvbinput.cpp: DVB streams
 *-------------------------------------------------------------------------------
 * (c)1999-2002 VideoLAN
-* $Id: dvbinput.cpp,v 1.21 2002/12/08 15:55:29 nitrox Exp $
+* $Id: dvbinput.cpp,v 1.22 2003/02/03 11:47:32 nitrox Exp $
 *
 * Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
 *          Damien Lucas <nitrox@videolan.org>
@@ -114,8 +114,9 @@ C_DvbInput::C_DvbInput(C_Module* pModule,
                                 m_cCurrentPat(0, 0, true)
 {
   dvb = new DVB;
-  m_iGotPat = 0;   // Did not get the first PAT yet
   m_iGotTpid = 0;            // Did not set the transponder yet
+  m_iDemuxUsageCount = 0;    // Nothing using the demux yet
+  m_bIgnoreTimeout = false;
   m_pConverter = NULL;
   for(int i =0; i < 512; i++)
     m_iDemuxes[i] = -1;
@@ -137,6 +138,7 @@ void C_DvbInput::OnInit()
 {
   int iNumber;
   C_String strType;
+  C_String dvbrc;
   char filen[FILELEN];
 
   // Retrieve config
@@ -144,7 +146,13 @@ void C_DvbInput::OnInit()
   ASSERT(pApp);
 
   iNumber = pApp->GetSetting(GetName() + ".DeviceNumber", "0").ToInt();
-
+  m_iSendMethod = pApp->GetSetting(GetName() + ".SendMethod", "0").ToInt();
+  m_bIgnoreTimeout = pApp->GetSetting(GetName()+".IgnoreTimeout", "0").ToInt();
+  dvbrc = pApp->GetSetting(GetName()+ ".Dvbrc", "");
+  if(dvbrc.Length() != 0)
+  {
+    strncpy(filen, dvbrc.GetString(), dvbrc.Length()+1);
+  }
   dvb->init("", "", iNumber);
   
   m_strDVR   = C_String(ADAPTER)+iNumber+"/dvr0";
@@ -199,6 +207,7 @@ void C_DvbInput::OnInit()
   ASSERT(pReaderModule);
 
   m_cInputBroadcast.SetOption("device", m_strDVR);
+  m_cInputBroadcast.SetOption("IgnoreTimeout", m_bIgnoreTimeout);
   m_pReader = pReaderModule->NewMpegReader(&m_cInputBroadcast);
   ASSERT(m_pReader);
 
@@ -219,10 +228,6 @@ void C_DvbInput::OnInit()
   cConfig.m_pEventHandler = this;
   m_pConverter = pConverterModule->NewMpegConverter(cConfig);
   ASSERT(m_pConverter);
-  
-  // Launch the demux
-  m_pConverter->Create();
-
 }
 
 
@@ -237,7 +242,9 @@ void C_DvbInput::OnDestroy()
 
   if(m_pConverter)
   {
-    // Stop the input stream
+    // Stop the input converter if necessary
+    if(m_pConverter->IsRunning())
+    {
       try
       {
         m_pConverter->Stop();
@@ -248,6 +255,7 @@ void C_DvbInput::OnDestroy()
         delete m_pConverter;
         throw e;
       }
+    }
 
     delete m_pConverter;
   }
@@ -455,7 +463,6 @@ void C_DvbInput::OnDvbPsiPatEvent(int iEvent)
 
     // Kludge: signal the first PAT arrival.
     m_cEndInit.Protect();
-    m_iGotPat = 1;
     m_cEndInit.Signal();
     m_cEndInit.Release();
   }
@@ -471,23 +478,22 @@ void C_DvbInput::OnStartStreaming(C_Broadcast* pBroadcast)
   int iIndex=m_vProgramNames.Find(pBroadcast->GetProgram()->GetName());
   LogDbg(m_hLog, "DVB Channel found: "+dvb->chans[iIndex].name);
 
-  // Check that if we have already got one broadcast going that this
-  // new one is on the same mux (transponder)
-  if(m_iGotPat && m_iGotTpid != dvb->chans[iIndex].tpid)
-  {
-    LogDbg(m_hLog, "Attempting to start reception from different transponder." \
-           "Existing transponder is " + m_iGotTpid + " asked transponder is " +
-            dvb->chans[iIndex].tpid);
-    return;
-  }
+  // Lock the demux usage
+  m_cDemuxUsageM.Lock();
 
-  if (!m_iGotPat)
+  //If we have not already started the demux, do so and wait for the first PAT
+  if (m_iDemuxUsageCount == 0)
   {
     // Set the frontend up
     dvb->SetTP(dvb->chans[iIndex].tpid, dvb->chans[iIndex].satid);
     dvb->set_front();
 
-    // Put a filter on PAT
+    sleep(3);
+
+    //Launch the demux
+    m_pConverter->Create();
+    
+    // Add a filter for PAT
     SelectPid(&m_cPatDecoder, 0x0000, TS_TYPE_NULL);
 
     // Wait for the first PAT
@@ -495,6 +501,23 @@ void C_DvbInput::OnStartStreaming(C_Broadcast* pBroadcast)
     m_cEndInit.Release();
     m_iGotTpid = dvb->chans[iIndex].tpid; // Remember the transponder
   }
+  else
+  {
+    //Check that if we have already got one broadcast going this
+    //new one is on the same mux (transponder)
+    if(m_iGotTpid != dvb->chans[iIndex].tpid)
+    {
+      Log(m_hLog, LOG_ERROR, C_String("Attempting to start reception from" \
+          " different transponder.Existing Transponder is") +m_iGotTpid +
+	    " New transponder is" + dvb->chans[iIndex].tpid);
+      m_cDemuxUsageM.UnLock();
+      return;
+    }
+  }
+
+  // Update Demux Counter and unlock
+  m_iDemuxUsageCount++;
+  m_cDemuxUsageM.UnLock();
   
   // Get the program
   dvbpsi_pat_program_t *pProgram =
@@ -520,15 +543,17 @@ void C_DvbInput::OnStartStreaming(C_Broadcast* pBroadcast)
 
     try
     {
+      u16 iNumber = pBroadcast->GetProgram()->GetName().ToInt();
+      
       pStreamer->Create();
 
       pMux->Attach();
 
       pMux->AttachProgram(pProgram->i_number, pProgram->i_pid);
 
-      m_cMuxes.Add(pProgram->i_number, pMux);
+      m_cMuxes.Add(iNumber, pMux);
 
-      m_cStreamers.Add(pProgram->i_number, pStreamer);
+      m_cStreamers.Add(iNumber, pStreamer);
 
     }
     catch(E_Exception e)
@@ -573,8 +598,20 @@ void C_DvbInput::OnStopStreaming(C_Broadcast* pBroadcast)
 {
   m_cLock.Lock();
 
+  //Lock demux counter and decrement usage counter
+  m_cDemuxUsageM.Lock();
+  m_iDemuxUsageCount--;
+
+  // If the usage counter is 0, we have to remove the PAT filter and suspend
+  // the demux
+  if(m_iDemuxUsageCount==0)
+  {
     //Unset the filter on PAT
     UnselectPid(&m_cPatDecoder, 0x0000);
+    m_pConverter->Stop();
+  }
+
+  m_cDemuxUsageM.UnLock();
 
   u16 iNumber = pBroadcast->GetProgram()->GetName().ToInt();
 

src/modules/dvbinput/dvbinput.h

@@ -2,7 +2,7 @@
 * dvbinput.h: DVB Input class definition
 *-------------------------------------------------------------------------------
 * (c)1999-2002 VideoLAN
-* $Id: dvbinput.h,v 1.12 2002/12/08 15:55:29 nitrox Exp $
+* $Id: dvbinput.h,v 1.13 2003/02/03 11:47:32 nitrox Exp $
 *
 * Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
 *
@@ -73,6 +73,7 @@ private:
   C_String m_strVIDEO;
 
   bool m_bHasDecoder;
+  bool m_bIgnoreTimeout;
 
   C_Vector<C_String>  m_vProgramNames;
   int m_iFrequency;
@@ -87,8 +88,9 @@ private:
   int m_iSendMethod;
   
   // Kludge: signal the first PAT arrival.
-  int m_iGotPat;
+  int m_iDemuxUsageCount;
   int m_iGotTpid;
+  C_Mutex m_cDemuxUsageM;
   C_Condition m_cEndInit;
 
   // Demuxes' file descriptors

src/modules/dvbreader/dvbreader.cpp

@@ -2,7 +2,7 @@
 * dvbreader.cpp: file reader
 *-------------------------------------------------------------------------------
 * (c)1999-2002 VideoLAN
-* $Id: dvbreader.cpp,v 1.2 2002/11/19 14:08:07 nitrox Exp $
+* $Id: dvbreader.cpp,v 1.3 2003/02/03 11:47:32 nitrox Exp $
 *
 * Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
 *          Tristan Leteurtre <tooney@videolan.org>
@@ -85,6 +85,7 @@ C_DvbMpegReader::C_DvbMpegReader(C_Module* pModule,
                         C_MpegReader(pModule, pBroadcast)
 {
   m_strDeviceName=pBroadcast->GetOption("device");
+  m_bIgnoreTimeout=pBroadcast->GetOption("IgnoreTimeout").ToInt();
 }
 
 
@@ -124,9 +125,9 @@ int C_DvbMpegReader::Read(byte* pBuff, int iSize)
     if(poll(pfd, 1, 10000))
     { 
       if(pfd[0].revents & POLLIN) { iRc=read(m_hFd, pBuff, 188);}
-      else return MPEG_STREAMERROR;
+      else if (!m_bIgnoreTimeout)return MPEG_STREAMERROR;
     }
-    else
+    else if (!m_bIgnoreTimeout)
     {
           printf("Time out !\n");
           return MPEG_STREAMERROR;

src/modules/dvbreader/dvbreader.h

@@ -2,7 +2,7 @@
 * dvbreader.h: file reader
 *-------------------------------------------------------------------------------
 * (c)1999-2002 VideoLAN
-* $Id: dvbreader.h,v 1.2 2002/12/27 00:18:14 tooney Exp $
+* $Id: dvbreader.h,v 1.3 2003/02/03 11:47:32 nitrox Exp $
 *
 * Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
 *          Tristan Leteutre <tooney@videolan.org>
@@ -54,6 +54,7 @@ protected:
   C_String m_strDeviceName;
   int m_hFd;
 
+  bool m_bIgnoreTimeout;
   bool m_bLoop;
   bool m_bEnd;
 };