Fix PCR packets being stripped from transport stream following [0f0e678]

stuartm · Paul Harrison · commit a14b34bf706f · 2015-05-18T11:29:51.000+01:00
(cherry picked from commit d947e91) Refs #12422
diff --git a/mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp b/mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp
@@ -601,12 +601,13 @@ bool MPEGStreamData::CreatePMTSingleProgram(const ProgramMapTable &pmt)
         // Filter out streams not used for basic television
         if (_recording_type == "tv" && !is_audio && !is_video &&
             !MPEGDescriptor::Find(desc, DescriptorID::teletext) &&
-            !MPEGDescriptor::Find(desc, DescriptorID::subtitling))
+            !MPEGDescriptor::Find(desc, DescriptorID::subtitling) &&
+            pid != pmt.PCRPID()) // We must not strip the PCR!
         {
             continue;
         }
 
-        if (!is_audio && !is_video)
+        if (!is_audio && !is_video) //NOTE: Anything which isn't audio or video is data
             dataPIDs.push_back(pid);
 
         pdesc.push_back(desc);

Original file line number	Diff line number	Diff line change
`@@ -601,12 +601,13 @@ bool MPEGStreamData::CreatePMTSingleProgram(const ProgramMapTable &pmt)`
`601`	`601`	`// Filter out streams not used for basic television`
`602`	`602`	`if (_recording_type == "tv" && !is_audio && !is_video &&`
`603`	`603`	`!MPEGDescriptor::Find(desc, DescriptorID::teletext) &&`
`604`		`- !MPEGDescriptor::Find(desc, DescriptorID::subtitling))`
	`604`	`+ !MPEGDescriptor::Find(desc, DescriptorID::subtitling) &&`
	`605`	`+ pid != pmt.PCRPID()) // We must not strip the PCR!`
`605`	`606`	`{`
`606`	`607`	`continue;`
`607`	`608`	`}`
`608`	`609`
`609`		`- if (!is_audio && !is_video)`
	`610`	`+ if (!is_audio && !is_video) //NOTE: Anything which isn't audio or video is data`
`610`	`611`	`dataPIDs.push_back(pid);`
`611`	`612`
`612`	`613`	`pdesc.push_back(desc);`