[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/multimedia/kaffeine/src/dvb
From:       Christoph Pfister <christophpfister () gmail ! com>
Date:       2009-04-15 21:24:20
Message-ID: 1239830660.829316.14779.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 954540 by pfister:

kill duplicated pmt parser


 M  +3 -21     dvbscan.cpp  


--- trunk/extragear/multimedia/kaffeine/src/dvb/dvbscan.cpp #954539:954540
@@ -481,28 +481,10 @@
 {
 	DvbPreviewChannel channel;
 
-	for (DvbPmtSectionEntry entry = section.entries(); entry.isValid(); entry.advance()) {
-		switch (entry.streamType()) {
-		case 0x01:   // MPEG1 video
-		case 0x02:   // MPEG2 video
-		case 0x10:   // MPEG4 video
-		case 0x1b: { // H264 video
-			channel.videoPid = entry.pid();
-			break;
-		    }
+	DvbPmtParser parser(section);
+	channel.videoPid = parser.videoPid;
+	channel.audioPids = parser.audioPids.keys();
 
-		case 0x03:   // MPEG1 audio
-		case 0x04:   // MPEG2 audio
-		case 0x0f:   // AAC audio
-		case 0x11:   // AAC / LATM audio
-		case 0x81:   // AC-3 audio (ATSC specific)
-		case 0x87: { // enhanced AC-3 audio (ATSC specific)
-			channel.audioPids.append(entry.pid());
-			break;
-		    }
-		}
-	}
-
 	if ((channel.videoPid != -1) || !channel.audioPids.isEmpty()) {
 		channel.source = source;
 		channel.transponder = transponder;
[prev in list] [next in list] [prev in thread] [next in thread]