From 22a96623971e3634e7030b110f57315c21214a1d Mon Sep 17 00:00:00 2001 From: ghost Date: Sun, 26 Jul 2009 08:54:28 +0200 Subject: [PATCH] pmt.cpp: more streamtype detection fixes (?!?) dont handle pids with teletext descriptor as audio/video --- lib/dvb/pmt.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp index e1aa096..833a521 100644 --- a/lib/dvb/pmt.cpp +++ b/lib/dvb/pmt.cpp @@ -460,11 +460,16 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program) default: break; } - if (issubtitle && (isaudio || isvideo)) + if (program.textPid != -1 && (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) { -- 2.7.4