X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a4c41a67232262305cf2fb96e53ef948d04e404f..29c3340e877cfa1d1818a140f76f14270b84c3d2:/lib/dvb/pmt.cpp

diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp
index e1aa096d..a4fa212d 100644
--- a/lib/dvb/pmt.cpp
+++ b/lib/dvb/pmt.cpp
@@ -184,6 +184,8 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program)
 
 	int first_ac3 = -1;
 	program.defaultAudioStream = 0;
+	int rdsPid = -1;
+	audioStream *prev_audio = 0;
 
 	if ( m_service && !m_service->cacheEmpty() )
 	{
@@ -214,14 +216,16 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program)
 				ElementaryStreamInfoConstIterator es;
 				for (es = pmt.getEsInfo()->begin(); es != pmt.getEsInfo()->end(); ++es)
 				{
-					int isaudio = 0, isvideo = 0, issubtitle = 0, forced_video = 0, forced_audio = 0;
+					int isaudio = 0, isvideo = 0, issubtitle = 0, forced_video = 0, forced_audio = 0, isteletext = 0;
+					int streamtype = (*es)->getType();
 					videoStream video;
 					audioStream audio;
 					audio.component_tag=video.component_tag=-1;
 					video.type = videoStream::vtMPEG2;
 					audio.type = audioStream::atMPEG;
+					audio.rdsPid = -1;
 
-					switch ((*es)->getType())
+					switch (streamtype)
 					{
 					case 0x1b: // AVC Video Stream (MPEG4 H264)
 						video.type = videoStream::vtMPEG4_H264;
@@ -285,11 +289,14 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program)
 						}
 					case 0x06: // PES Private
 					case 0xEA: // TS_PSI_ST_SMPTE_VC1
+					{
+						int num_descriptors = 0;
 						for (DescriptorConstIterator desc = (*es)->getDescriptors()->begin();
 							desc != (*es)->getDescriptors()->end(); ++desc)
 						{
 							uint8_t tag = (*desc)->getTag();
 							/* check descriptors to get the exakt stream type. */
+							++num_descriptors;
 							if (!forced_video && !forced_audio)
 							{
 								switch (tag)
@@ -342,6 +349,7 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program)
 										s.subtitling_type = 0x01; // EBU TELETEXT SUBTITLES
 										s.pid = program.textPid = (*es)->getPid();
 										TeletextDescriptor *d = (TeletextDescriptor*)(*desc);
+										isteletext = 1;
 										const VbiTeletextList *list = d->getVbiTeletexts();
 										for (VbiTeletextConstIterator it(list->begin()); it != list->end(); ++it)
 										{
@@ -399,9 +407,9 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program)
 									case 0x56432d31: // == 'VC-1'
 									{
 										const AdditionalIdentificationInfoVector *vec = d->getAdditionalIdentificationInfo();
-										if (vec->size() > 1 && (*vec)[1] == 0x01) // subdescriptor tag
+										if (vec->size() > 1 && (*vec)[0] == 0x01) // subdescriptor tag
 										{
-											if ((*vec)[2] >= 0x90) // profile_level
+											if ((*vec)[1] >= 0x90) // profile_level
 												video.type = videoStream::vtVC1; // advanced profile
 											else
 												video.type = videoStream::vtVC1_SM; // simple main
@@ -457,14 +465,26 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program)
 								break;
 							}
 						}
+						if (!num_descriptors && streamtype == 0x06 && prev_audio)
+						{
+							prev_audio->rdsPid = (*es)->getPid();
+							eDebug("Rds PID %04x detected ? ! ?", prev_audio->rdsPid);
+						}
+						prev_audio = 0;
+					}
 					default:
 						break;
 					}
-					if (issubtitle && (isaudio || isvideo))
+					if (isteletext && (isaudio || isvideo)) 
+					{
+						eDebug("ambiguous streamtype for PID %04x detected.. forced as teletext!", (*es)->getPid());					
+						continue; // continue with next PID
+					}
+					else if (issubtitle && (isaudio || isvideo))
 						eDebug("ambiguous streamtype for PID %04x detected.. forced as subtitle!", (*es)->getPid());
 					else if (isaudio && isvideo)
 						eDebug("ambiguous streamtype for PID %04x detected.. forced as video!", (*es)->getPid());
-					if (issubtitle)
+					if (issubtitle) // continue with next PID
 						continue;
 					else if (isvideo)
 					{
@@ -490,6 +510,7 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program)
 							first_ac3 = program.audioStreams.size();
 
 						program.audioStreams.push_back(audio);
+						prev_audio = &program.audioStreams.back();
 					}
 					else
 						continue;
@@ -542,6 +563,7 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program)
 			audioStream s;
 			s.type = audioStream::atAC3;
 			s.pid = cached_apid_ac3;
+			s.rdsPid = -1;
 			program.audioStreams.push_back(s);
 			++cnt;
 		}
@@ -550,6 +572,7 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program)
 			audioStream s;
 			s.type = audioStream::atMPEG;
 			s.pid = cached_apid_mpeg;
+			s.rdsPid = -1;
 			program.audioStreams.push_back(s);
 			++cnt;
 		}