Ticket #8264: patch1

File patch1, 2.8 KB (added by Emmanuel Anne <emmanuel.anne@…>, 16 years ago)
Line 
1Index: libs/libmythtv/mpeg/mpegstreamdata.cpp
2===================================================================
3--- libs/libmythtv/mpeg/mpegstreamdata.cpp (révision 23865)
4+++ libs/libmythtv/mpeg/mpegstreamdata.cpp (copie de travail)
5@@ -371,6 +371,7 @@
6 // There might be another section after this one in the
7 // current packet. We need room before the end of the
8 // packet, and it must not be packet stuffing.
9+#if 0
10 if ((offset + psip->SectionLength() < TSPacket::SIZE) &&
11 (pesdata[psip->SectionLength() + 1] != 0xff))
12 {
13@@ -381,6 +382,7 @@
14 SavePartialPES(tspacket->PID(), pesp);
15 return psip;
16 }
17+#endif
18
19 moreTablePackets = false;
20 return psip;
21@@ -924,7 +926,7 @@
22 _mpeg_sp_listeners[i]->HandleSingleProgramPMT(pmt_sp);
23 }
24 DONE_WITH_PES_PACKET(); // already parsed this table, toss it.
25- }
26+ }
27
28 HandleTables(tspacket->PID(), *psip);
29
30Index: libs/libmythtv/mpeg/pespacket.cpp
31===================================================================
32--- libs/libmythtv/mpeg/pespacket.cpp (révision 23865)
33+++ libs/libmythtv/mpeg/pespacket.cpp (copie de travail)
34@@ -156,10 +156,10 @@
35 {
36 VERBOSE(VB_SIPARSER,
37 QString("PESPacket: Failed CRC check 0x%1 != 0x%2 "
38- "for StreamID = 0x%3")
39+ "for StreamID = 0x%3 - ignored")
40 .arg(CRC(),0,16).arg(CalcCRC(),0,16).arg(StreamID(),0,16));
41 }
42- return ret;
43+ return true;
44 }
45
46 // These are pixel aspect ratios
47Index: libs/libmythtv/mpeg/mpegtables.cpp
48===================================================================
49--- libs/libmythtv/mpeg/mpegtables.cpp (révision 23865)
50+++ libs/libmythtv/mpeg/mpegtables.cpp (copie de travail)
51@@ -168,9 +168,9 @@
52 {
53 VERBOSE(VB_SIPARSER,
54 QString("PSIPTable: Failed CRC check 0x%1 != 0x%2 "
55- "for StreamID = 0x%3")
56+ "for StreamID = 0x%3 - ignored")
57 .arg(CRC(),0,16).arg(CalcCRC(),0,16).arg(StreamID(),0,16));
58- return false;
59+ return true;
60 }
61
62 unsigned char *bufend = _fullbuffer + _allocSize;
63Index: libs/libmythtv/iptv/iptvchannelfetcher.cpp
64===================================================================
65--- libs/libmythtv/iptv/iptvchannelfetcher.cpp (révision 23865)
66+++ libs/libmythtv/iptv/iptvchannelfetcher.cpp (copie de travail)
67@@ -320,6 +320,13 @@
68 QString msg = QObject::tr("Encountered malformed channel");
69 if (!channum.isEmpty())
70 {
71+ while (chanmap.contains(channum)) {
72+ char buffer[10];
73+ int num = channum.toInt()+1;
74+ sprintf(buffer,"%d",num);
75+ channum = buffer;
76+ }
77+
78 chanmap[channum] = info;
79
80 msg = QObject::tr("Parsing Channel #%1 : %2 : %3")