Ticket #264: crc-bug-workaround.patch

libs/libmythtv/mpeg/mpegstreamdata.cpp

@@ -19 +19 @@
  *  \param cacheTables    If true PAT and PMT tables will be cached
  */
 MPEGStreamData::MPEGStreamData(int desiredProgram, bool cacheTables)
-    : QObject(NULL, "MPEGStreamData"),
+    : QObject(NULL, "MPEGStreamData"), _have_pmt_CRC_bug(false),
       _pat_version(-1), _cache_tables(cacheTables), _cache_lock(true),
       _cached_pat(NULL), _desired_program(desiredProgram),
       _pat_single_program(NULL), _pmt_single_program(NULL)
@@ -352 +352 @@
         return true;
 
     // Validate PSIP
-    if (!psip->IsGood())
+    bool validate = !_have_pmt_CRC_bug || (TableID::PMT != psip->TableID());
+    if (validate && !psip->IsGood())
     {
         VERBOSE(VB_RECORD, QString("PSIP packet failed CRC check. "
                                    "pid(0x%1) type(0x%2)")

libs/libmythtv/mpeg/mpegstreamdata.h

@@ -32 +32 @@
     virtual void Reset(int desiredProgram);
 
     // Table processing
+    void SetIgnoreCRCforPMT(bool pmtCRCbug) { _have_pmt_CRC_bug = pmtCRCbug; }
     virtual bool IsRedundant(const PSIPTable&) const;
     virtual bool HandleTables(uint pid, const PSIPTable &psip);
     virtual bool HandleTSTables(const TSPacket* tspacket);
@@ -132 +133 @@
     void CachePMT(uint pid, ProgramMapTable *pmt);
 
   protected:
+    bool                      _have_pmt_CRC_bug;
+
     // Listening
     QMap<uint, bool>          _pids_listening;
     QMap<uint, bool>          _pids_notlistening;

libs/libmythtv/videosource.h

@@ -68 +68 @@
     static DISEQC_TYPES GetDISEqCType(uint cardid);
 
     static CARD_TYPES   GetDVBType(uint device, QString &name, QString &card_type);
+    static bool         HasDVBCRCBug(uint device);
     static QString      GetDefaultInput(uint cardid);
 
     static bool         IgnoreEncrypted(uint cardid, const QString &inputname);

libs/libmythtv/videosource.cpp

@@ -110 +110 @@
     return nRet;
 }
 
+/** \fn CardUtil::HasDVBCRCBug(uint)
+ *  \brief Returns true iff the device munges PMT tables, so that they fail a CRC check.
+ *  \param [in]device video dev to be checked
+ *  \return true iff the device munges PMT tables, so that they fail a CRC check.
+ */
+bool CardUtil::HasDVBCRCBug(uint device)
+{
+    QString name(""), type("");
+    GetDVBType(device, name, type);
+    return (name == "VLSI VES1x93 DVB-S") || (name == "Philips TDA10046H DVB-T");
+}
+
 /** \fn CardUtil::GetCardType(uint, QString&, QString&)
  *  \brief Returns the card type from the video device
  *  \param [in]nVideoDev video dev to be checked

libs/libmythtv/tv_rec.cpp

@@ -1997 +1997 @@
 #endif //USING_V4L
     if (!sd)
         sd = new ATSCStreamData(-1, -1, true);
-        
+
+#ifdef USING_DVB    
+    DVBChannel *dvbc = dynamic_cast<DVBChannel*>(channel);
+    if (dvbc)
+        sd->SetIgnoreCRCforPMT(CardUtil::HasDVBCRCBug(dvbc->GetCardNum()));
+#endif //USING_DVB
+
     dtvSignalMonitor->SetStreamData(sd);
     sd->Reset(progNum);