Project

General

Profile

Bug #1285

vdr-compat-Patch (IsPmtPid)

Added by lhanisch almost 5 years ago. Updated over 1 year ago.

Status:
Closed
Priority:
Normal
Assignee:
-
Category:
Enhancement
Target version:
Start date:
03/08/2013
Due date:
% Done:

0%


Description

Just removing the PMT-Pid from the logger output wasn't enough, because the format parameters weren't adjusted accordingly.
This patch re-adds the removed PMT-Pid to the logger-call.

Additionally it corrects the include of the libsi-header.

--- a/scanner.c
+++ b/scanner.c
@@ -26,7 +26,7 @@
 #include <sys/stat.h>
 #include <vdr/remux.h>
 #include <vdr/device.h>
-#include "libsi/si.h" 
+#include <libsi/si.h>

 #define DEBUG(x...) isyslog(x)
@@ -390,7 +390,7 @@
  logger::debug(format( "scanning ts positions: {0}/{1}-{2}/{3}") % start.first % start.second % end.first % end.second);

  bool PmtFound = false;
- int PatVersion, PmtVersion;
+ int PatVersion, PmtVersion, pmtPid;

  PatPmtParser.Reset();
  m_vdrFile.seek(start);
@@ -405,15 +405,17 @@
  if ( Pid == 0)
  PatPmtParser.ParsePat(DataPtr, TS_SIZE);
 #if VDRVERSNUM < 10733
- else if (Pid == PatPmtParser.PmtPid())
+ else if (Pid == PatPmtParser.PmtPid()) {
 #else
- else if (PatPmtParser.IsPmtPid(Pid))
+ else if (PatPmtParser.IsPmtPid(Pid)) {
 #endif
+ pmtPid = Pid;
  PatPmtParser.ParsePmt(DataPtr, TS_SIZE);
+ }
  else if (PatPmtParser.GetVersions(PatVersion, PmtVersion)) {
  PmtFound = true;
  int streams = 0;
- logger::debug(format( "PID found: Vpid=0x{1}, Vtype=0x{2}") % format::base( PatPmtParser.Vpid(), 16 ) % format::base( PatPmtParser.Vtype(), 16 ));
+ logger::debug(format( "PID found: PMT PID=0x{0}, Vpid=0x{1}, Vtype=0x{2}") % format::base( pmtPid, 16 ) % format::base( PatPmtParser.Vpid(), 16 ) % format::base( PatPmtParser.Vtype(), 16 ));
  if ( PatPmtParser.Vpid() && (PatPmtParser.Vtype() == 2)) { // accept only MPEG2
  track_info track( PatPmtParser.Vpid(), track_info::streamtype_video );
  m_tracks.push_back( track );

History

#1 Updated by FireFly over 4 years ago

  • Category set to Enhancement
  • Status changed from New to Confirmed
  • Target version set to 0.2.3

#2 Updated by FireFly over 1 year ago

  • Status changed from Confirmed to Closed

fixed

Also available in: Atom PDF