Ticket #3031: 3031-dbg-7.patch
File 3031-dbg-7.patch, 19.1 KB (added by , 17 years ago) |
---|
-
libs/libmythtv/dvbrecorder.cpp
322 322 323 323 if (atsc && atsc->DesiredMinorChannel()) 324 324 atsc->SetDesiredChannel(atsc->DesiredMajorChannel(), 325 atsc->DesiredMinorChannel()); 325 atsc->DesiredMinorChannel(), 326 "dvbrecorder.cpp 326"); 326 327 else if (data->DesiredProgram() >= 0) 327 data->SetDesiredProgram(data->DesiredProgram()); 328 data->SetDesiredProgram(data->DesiredProgram(), 329 "dvbrecorder.cpp 329"); 328 330 } 329 331 } 330 332 -
libs/libmythtv/hdtvrecorder.cpp
769 769 .arg(vct->ProgramNumber(i))); 770 770 // Do a (partial?) reset here if old desired 771 771 // program is not 0? 772 GetATSCStreamData()->SetDesiredProgram(vct->ProgramNumber(i)); 772 GetATSCStreamData()->SetDesiredProgram( 773 vct->ProgramNumber(i), "hdtvrecorder.cpp 773"); 773 774 } 774 775 found = true; 775 776 } … … 784 785 .arg(vct->MajorChannel(0)) 785 786 .arg(vct->MinorChannel(0))); 786 787 VERBOSE(VB_IMPORTANT, vct->toString()); 787 GetATSCStreamData()->SetDesiredProgram(vct->ProgramNumber(0)); 788 GetATSCStreamData()->SetDesiredProgram( 789 vct->ProgramNumber(0), "hdtvrecorder.cpp 789"); 788 790 } 789 791 } 790 792 -
libs/libmythtv/hdhrrecorder.cpp
170 170 171 171 if (atsc && atsc->DesiredMinorChannel()) 172 172 atsc->SetDesiredChannel(atsc->DesiredMajorChannel(), 173 atsc->DesiredMinorChannel()); 173 atsc->DesiredMinorChannel(), 174 "hdhrrecorder.cpp 174"); 174 175 else if (data->DesiredProgram() >= 0) 175 data->SetDesiredProgram(data->DesiredProgram()); 176 data->SetDesiredProgram(data->DesiredProgram(), 177 "hdhrrecorder.cpp 177"); 176 178 } 177 179 } 178 180 -
libs/libmythtv/firewirerecorder.cpp
204 204 data->AddMPEGSPListener(this); 205 205 206 206 if (data->DesiredProgram() >= 0) 207 data->SetDesiredProgram(data->DesiredProgram()); 207 data->SetDesiredProgram( 208 data->DesiredProgram(), "firewirerecorder.cpp 208"); 208 209 } 209 210 } 210 211 -
libs/libmythtv/siscan.cpp
743 743 // If we have a DTV Signal Monitor, perform table scanner reset 744 744 if (GetDTVSignalMonitor() && GetDTVSignalMonitor()->GetScanStreamData()) 745 745 { 746 GetDTVSignalMonitor()->GetScanStreamData()->Reset( );746 GetDTVSignalMonitor()->GetScanStreamData()->Reset("siscan.cpp 746"); 747 747 GetDTVSignalMonitor()->SetChannel(-1,-1); 748 748 } 749 749 -
libs/libmythtv/mpeg/mpegstreamdata.cpp
76 76 77 77 MPEGStreamData::~MPEGStreamData() 78 78 { 79 Reset(-1 );79 Reset(-1, "~MPEGStreamData()"); 80 80 SetPATSingleProgram(NULL); 81 81 SetPMTSingleProgram(NULL); 82 82 … … 90 90 _mpeg_sp_listeners.clear(); 91 91 } 92 92 93 void MPEGStreamData::SetDesiredProgram(int p )93 void MPEGStreamData::SetDesiredProgram(int p, const QString &where) 94 94 { 95 VERBOSE(VB_IMPORTANT, 96 QString("MPEGStreamData::SetDesiredProgram(%1) called from %2") 97 .arg(p).arg(where)); 98 95 99 bool reset = true; 96 100 uint pid = 0; 97 101 const ProgramAssociationTable* pat = NULL; … … 120 124 ReturnCachedPATTables(pats); 121 125 122 126 if (reset) 123 Reset(p );127 Reset(p, QString("MPEGStreamData::SetDesiredProgram(%1)").arg(p)); 124 128 } 125 129 126 130 void MPEGStreamData::SetEITHelper(EITHelper *eit_helper) … … 135 139 _eit_rate = rate; 136 140 } 137 141 138 void MPEGStreamData::Reset(int desiredProgram )142 void MPEGStreamData::Reset(int desiredProgram, const QString &where) 139 143 { 144 VERBOSE(VB_IMPORTANT, 145 QString("MPEGStreamData::Reset(%1) called from %2") 146 .arg(desiredProgram).arg(where)); 147 140 148 _desired_program = desiredProgram; 141 149 _invalid_pat_seen = false; 142 150 … … 500 508 501 509 if (TableID::PAT == table_id) 502 510 { 511 VERBOSE(VB_IMPORTANT, "PAT seen"); 503 512 if (VersionPAT(psip.TableIDExtension()) != version) 504 513 return false; 505 514 return PATSectionSeen(psip.TableIDExtension(), psip.Section()); … … 510 519 511 520 if (TableID::PMT == table_id) 512 521 { 522 VERBOSE(VB_IMPORTANT, "PMT seen"); 513 523 if (VersionPMT(psip.TableIDExtension()) != version) 514 524 return false; 515 525 return PMTSectionSeen(psip.TableIDExtension(), psip.Section()); -
libs/libmythtv/mpeg/atscstreamdata.cpp
44 44 45 45 ATSCStreamData::~ATSCStreamData() 46 46 { 47 Reset(-1,-1 );47 Reset(-1,-1, "~ATSCStreamData"); 48 48 49 49 QMutexLocker locker(&_listener_lock); 50 50 _atsc_main_listeners.clear(); … … 52 52 _atsc_eit_listeners.clear(); 53 53 } 54 54 55 void ATSCStreamData::SetDesiredChannel(int major, int minor) 55 void ATSCStreamData::SetDesiredChannel( 56 int major, int minor, const QString &where) 56 57 { 58 VERBOSE(VB_IMPORTANT, 59 QString("ATSCStreamData::SetDesiredChannel(%1,%2) called from %3") 60 .arg(major).arg(minor).arg(where)); 61 57 62 bool reset = true; 58 63 const MasterGuideTable *mgt = GetCachedMGT(); 59 64 tvct_vec_t tvcts = GetAllCachedTVCTs(); … … 86 91 if (cvct) 87 92 { 88 93 ProcessCVCT(cvct->TransportStreamID(), cvct); 89 SetDesiredProgram(cvct->ProgramNumber(chan_idx)); 94 SetDesiredProgram( 95 cvct->ProgramNumber(chan_idx), 96 QString("ATSCStreamData::SetDesiredChannel(%1,%2) CVCT") 97 .arg(major).arg(minor)); 90 98 } 91 99 else if (tvct) 92 100 { 93 101 ProcessTVCT(tvct->TransportStreamID(), tvct); 94 SetDesiredProgram(tvct->ProgramNumber(chan_idx)); 102 SetDesiredProgram( 103 tvct->ProgramNumber(chan_idx), 104 QString("ATSCStreamData::SetDesiredChannel(%1,%2) TVCT") 105 .arg(major).arg(minor)); 95 106 } 96 107 reset = false; 97 108 } … … 102 113 ReturnCachedCVCTTables(cvcts); 103 114 104 115 if (reset) 105 Reset(major, minor); 116 { 117 Reset(major, minor, 118 QString("ATSCStreamData::SetDesiredChannel(%1,%2) Reset") 119 .arg(major).arg(minor)); 120 } 106 121 } 107 122 108 void ATSCStreamData::Reset(int desiredProgram) 123 /* 124 void ATSCStreamData::Reset(int desiredProgram, const QString &where) 109 125 { 110 Reset(-1,-1); 111 MPEGStreamData::Reset(desiredProgram); 126 VERBOSE(VB_IMPORTANT, 127 QString("ATSCStreamData::Reset(int) called from %1").arg(where)); 128 129 Reset(-1,-1, "ATSCStreamData::Reset(int)"); 130 131 MPEGStreamData::Reset(desiredProgram, "ATSCStreamData::Reset(int)"); 112 132 AddListeningPID(ATSC_PSIP_PID); 113 133 } 134 */ 114 135 115 void ATSCStreamData::Reset(int major, int minor )136 void ATSCStreamData::Reset(int major, int minor, const QString &where) 116 137 { 138 VERBOSE(VB_IMPORTANT, 139 QString("ATSCStreamData::Reset(%1,%2) called from %3") 140 .arg(major).arg(minor).arg(where)); 141 117 142 _desired_major_channel = major; 118 143 _desired_minor_channel = minor; 119 144 120 MPEGStreamData::Reset(-1); 145 MPEGStreamData::Reset(-1, QString("ATSCStreamData::Reset(%1,%2)") 146 .arg(major).arg(minor)); 147 121 148 _mgt_version = -1; 122 149 _tvct_version.clear(); 123 150 _cvct_version.clear(); -
libs/libmythtv/mpeg/dvbstreamdata.cpp
27 27 28 28 DVBStreamData::~DVBStreamData() 29 29 { 30 Reset(_desired_netid, _desired_tsid, _desired_program );30 Reset(_desired_netid, _desired_tsid, _desired_program, "~DVBStreamData()"); 31 31 32 32 QMutexLocker locker(&_listener_lock); 33 33 _dvb_main_listeners.clear(); … … 36 36 _dvb_has_eit.clear(); 37 37 } 38 38 39 void DVBStreamData::SetDesiredService(uint netid, uint tsid, int serviceid) 39 void DVBStreamData::SetDesiredService(uint netid, uint tsid, int serviceid, 40 const QString &where) 40 41 { 42 VERBOSE(VB_IMPORTANT, 43 QString("DVBStreamData::SetDesiredSevice(%1,%2,%3) called from %4") 44 .arg(netid).arg(tsid).arg(serviceid).arg(where)); 45 41 46 bool reset = true; 42 47 43 48 if (HasCachedAllSDT(tsid, true)) … … 58 63 ProcessSDT(_desired_tsid, sdt); 59 64 ReturnCachedTable(sdt); 60 65 } 61 SetDesiredProgram(serviceid); 66 SetDesiredProgram( 67 serviceid, 68 QString("DVBStreamData::SetDesiredSevice(%1,%2,%3)") 69 .arg(netid).arg(tsid).arg(serviceid)); 62 70 } 63 71 } 64 72 65 73 if (reset) 66 Reset(netid, tsid, serviceid); 74 { 75 Reset(netid, tsid, serviceid, 76 QString("DVBStreamData::SetDesiredService(%1,%2,%3)") 77 .arg(netid).arg(tsid).arg(serviceid)); 78 } 67 79 } 68 80 69 81 … … 165 177 } 166 178 167 179 void DVBStreamData::Reset(uint desired_netid, uint desired_tsid, 168 int desired_serviceid )180 int desired_serviceid, const QString &where) 169 181 { 170 MPEGStreamData::Reset(desired_serviceid); 182 VERBOSE(VB_IMPORTANT, 183 QString("DVBStreamData::Reset(%1,%2,%3) called from %4") 184 .arg(desired_netid).arg(desired_tsid) 185 .arg(desired_serviceid).arg(where)); 171 186 187 MPEGStreamData::Reset(desired_serviceid, "DVBStreamData::Reset()"); 188 172 189 _desired_netid = desired_netid; 173 190 _desired_tsid = desired_tsid; 174 191 -
libs/libmythtv/mpeg/scanstreamdata.h
18 18 bool IsRedundant(uint pid, const PSIPTable&) const; 19 19 bool HandleTables(uint pid, const PSIPTable &psip); 20 20 21 void Reset( void);21 void Reset(const QString &where); 22 22 23 23 bool HasEITPIDChanges(const uint_vec_t& /*in_use_pids*/) const 24 24 { return false; } -
libs/libmythtv/mpeg/mpegstreamdata.h
74 74 virtual ~MPEGStreamData(); 75 75 76 76 void SetCaching(bool cacheTables) { _cache_tables = cacheTables; } 77 virtual void Reset(int desiredProgram); 77 virtual void Reset(const QString &where) 78 { 79 VERBOSE(VB_IMPORTANT, 80 QString("MPEGStreamData::Reset(void) called from %1") 81 .arg(where)); 78 82 83 Reset(-1, "MPEGStreamData::Reset(void)"); 84 } 85 virtual void Reset(int desiredProgram, const QString &where); 86 79 87 /// \brief Current Offset from computer time to DVB time in seconds 80 88 double TimeOffset(void) const; 81 89 … … 209 217 210 218 public: 211 219 // Single program stuff, sets 212 void SetDesiredProgram(int p );220 void SetDesiredProgram(int p, const QString &where); 213 221 inline void SetPATSingleProgram(ProgramAssociationTable*); 214 222 inline void SetPMTSingleProgram(ProgramMapTable*); 215 223 void SetVideoStreamsRequired(uint num) -
libs/libmythtv/mpeg/atscstreamdata.h
27 27 bool cacheTables = false); 28 28 ~ATSCStreamData(); 29 29 30 void Reset(void) { Reset(-1, -1); } 31 void Reset(int desiredProgram); 32 void Reset(int desiredMajorChannel, int desiredMinorChannel); 33 void SetDesiredChannel(int major, int minor); 30 void Reset(const QString &where) 31 { 32 VERBOSE(VB_IMPORTANT, 33 QString("ATSCStreamData::Reset(void) called from %1") 34 .arg(where)); 34 35 36 Reset(-1, -1, "ATSCStreamData::Reset(void)"); 37 } 38 //void Reset(int desiredProgram, const QString &where); 39 void Reset(int desiredMajorChannel, int desiredMinorChannel, 40 const QString &where); 41 void SetDesiredChannel(int major, int minor, const QString &where); 42 35 43 // Table processing 36 44 virtual bool HandleTables(uint pid, const PSIPTable &psip); 37 45 virtual bool IsRedundant(uint, const PSIPTable&) const; -
libs/libmythtv/mpeg/dvbstreamdata.h
26 26 int desired_program, bool cacheTables = false); 27 27 ~DVBStreamData(); 28 28 29 void Reset(void) { Reset(0, 0, -1); } 30 void Reset(uint desired_netid, uint desired_tsid, int desired_sid); 29 void Reset(const QString &where) 30 { 31 VERBOSE(VB_IMPORTANT, 32 QString("DVBStreamData::Reset(void) called from %1") 33 .arg(where)); 31 34 35 Reset(0, 0, -1, "DVBStreamData::Reset(void)"); 36 } 37 void Reset(uint desired_netid, uint desired_tsid, 38 int desired_sid, const QString &where); 39 32 40 // DVB table monitoring 33 void SetDesiredService(uint netid, uint tsid, int serviceid); 41 void SetDesiredService(uint netid, uint tsid, int serviceid, 42 const QString &where); 34 43 uint DesiredNetworkID(void) const { return _desired_netid; } 35 44 uint DesiredTransportID(void) const { return _desired_tsid; } 36 45 -
libs/libmythtv/mpeg/scanstreamdata.cpp
32 32 return h0 || h1; 33 33 } 34 34 35 void ScanStreamData::Reset( void)35 void ScanStreamData::Reset(const QString &where) 36 36 { 37 MPEGStreamData::Reset(-1); 38 ATSCStreamData::Reset(-1,-1); 39 DVBStreamData::Reset(0,0,-1); 37 VERBOSE(VB_IMPORTANT, 38 QString("ScanStreamData::Reset(void) called from %1").arg(where)); 40 39 40 MPEGStreamData::Reset(-1, "ScanStreamData::Reset(void)"); 41 ATSCStreamData::Reset(-1,-1, "ScanStreamData::Reset(void)"); 42 DVBStreamData::Reset(0,0,-1, "ScanStreamData::Reset(void)"); 43 41 44 AddListeningPID(MPEG_PAT_PID); 42 45 AddListeningPID(ATSC_PSIP_PID); 43 46 AddListeningPID(DVB_NIT_PID); -
libs/libmythtv/iptvrecorder.cpp
75 75 Open(); 76 76 77 77 if (_stream_data) 78 _stream_data->Reset(_stream_data->DesiredProgram() );78 _stream_data->Reset(_stream_data->DesiredProgram(), "iptvrecorder.cpp:78"); 79 79 80 80 DTVRecorder::Unpause(); 81 81 -
libs/libmythtv/tv_rec.cpp
1688 1688 GetDTVRecorder()->SetStreamData(asd); 1689 1689 } 1690 1690 1691 asd->Reset(major, minor); 1691 asd->Reset("tv_rec.cpp:1691"); 1692 //asd->Reset(major, minor, "tv_rec.cpp:1691"); 1692 1693 sm->SetStreamData(sd); 1693 1694 sm->SetChannel(major, minor); 1694 1695 sd->SetVideoStreamsRequired(neededVideo); … … 1730 1731 if (GetDVBChannel()) 1731 1732 sd->SetIgnoreCRC(GetDVBChannel()->HasCRCBug()); 1732 1733 1733 dsd->Reset(netid, tsid, progNum); 1734 dsd->Reset("tv_rec.cpp:1734"); 1735 //dsd->Reset(netid, tsid, progNum); 1734 1736 sm->SetStreamData(sd); 1735 1737 sm->SetDVBService(netid, tsid, progNum); 1736 1738 sd->SetVideoStreamsRequired(neededVideo); … … 1768 1770 sd->SetIgnoreCRC(GetDVBChannel()->HasCRCBug()); 1769 1771 #endif // USING_DVB 1770 1772 1771 sd->Reset(progNum); 1773 //sd->Reset("tv_rec.cpp:1773"); 1774 //sd->Reset(progNum, "tv_rec.cpp:1774"); 1772 1775 sm->SetStreamData(sd); 1773 1776 sm->SetProgramNumber(progNum); 1774 1777 sd->SetVideoStreamsRequired(neededVideo); … … 3411 3414 3412 3415 ATSCStreamData *atsc = dynamic_cast<ATSCStreamData*>(mpeg); 3413 3416 if (atsc) 3414 atsc->SetDesiredChannel(request.majorChan, request.minorChan); 3417 atsc->SetDesiredChannel(request.majorChan, request.minorChan, 3418 "tv_rec.cpp 3418"); 3415 3419 } 3416 3420 else if (request.progNum >= 0) 3417 3421 { 3418 3422 channel->SetChannelByString(request.channel); 3419 3423 3420 3424 if (mpeg) 3421 mpeg->SetDesiredProgram(request.progNum );3425 mpeg->SetDesiredProgram(request.progNum, "tv_rec.cpp 3425"); 3422 3426 } 3423 3427 } 3424 3428 -
libs/libmythtv/dtvsignalmonitor.cpp
193 193 kDTVSigMon_CryptSeen | kDTVSigMon_CryptMatch); 194 194 majorChannel = major; 195 195 minorChannel = minor; 196 GetATSCStreamData()->SetDesiredChannel(major, minor); 196 GetATSCStreamData()->SetDesiredChannel( 197 major, minor, "DTVSignalMonitor::SetChannel"); 197 198 AddFlags(kDTVSigMon_WaitForVCT | kDTVSigMon_WaitForPAT); 198 199 } 199 200 } … … 207 208 kDTVSigMon_CryptSeen | kDTVSigMon_CryptMatch); 208 209 programNumber = progNum; 209 210 if (GetStreamData()) 210 GetStreamData()->SetDesiredProgram(programNumber); 211 GetStreamData()->SetDesiredProgram( 212 programNumber, "DTVSignalMonitor::SetProgramNumber"); 211 213 AddFlags(kDTVSigMon_WaitForPMT); 212 214 } 213 215 } … … 233 235 234 236 if (GetDVBStreamData()) 235 237 { 236 GetDVBStreamData()->SetDesiredService(netid, tsid, programNumber); 238 GetDVBStreamData()->SetDesiredService( 239 netid, tsid, programNumber, "DTVSignalMonitor::SetDVBService"); 237 240 AddFlags(kDTVSigMon_WaitForPMT | kDTVSigMon_WaitForSDT); 238 241 GetDVBStreamData()->AddListeningPID(DVB_SDT_PID); 239 242 }