Generalise Demuxer::findPTS() to include audio

diff --git a/demuxer.h b/demuxer.h
index d168dd0cb3d2edf719896dd403999aff832e4c9c..ca32c1ec94ae324dcf9525a30be12bff093ddb9b 100644 (file)
--- a/demuxer.h
+++ b/demuxer.h
@@ -77,7 +77,7 @@ protected:
     bool writeVideo();
 
     virtual int scan(UCHAR* buf, int len) = 0;
-    virtual int findVideoPTS(UCHAR* buf, int len, ULLONG* dest) = 0;
+    virtual int findPTS(UCHAR* buf, int len, ULLONG* dest) = 0;
     virtual int put(UCHAR* buf, int len) = 0;
     virtual void setFrameNum(ULONG frame) {}
     virtual ULONG getFrameNumFromPTS(ULLONG pts) {return 0;}

diff --git a/demuxervdr.cc b/demuxervdr.cc
index 9444b5b764f8be18fd0251b1b5c50d3ab9b5617f..f37ab6bbf615566f5d490d71292604825dd7f017 100644 (file)
--- a/demuxervdr.cc
+++ b/demuxervdr.cc
@@ -95,18 +95,18 @@ int DemuxerVDR::scan(UCHAR *buf, int len)
   return ret;
 }
 
-int DemuxerVDR::findVideoPTS(UCHAR* buf, int len, ULLONG* dest)
+int DemuxerVDR::findPTS(UCHAR* buf, int len, ULLONG* dest)
 {
   while (len >= 14)
   {
     UINT pattern = *(UINT*)buf;
     buf++; len--;
 #if __BYTE_ORDER == __BIG_ENDIAN
-    if (pattern < (0x100 | PESTYPE_VID0) ||
+    if (pattern < (0x100 | PESTYPE_AUD0) ||
         pattern > (0x100 | PESTYPE_VIDMAX)) continue;
 #else
     if ((pattern & 0xFFFFFF) != 0x010000 ||
-         pattern < ((UINT)PESTYPE_VID0 << 24) ||
+         pattern < ((UINT)PESTYPE_AUD0 << 24) ||
          pattern > ((UINT)PESTYPE_VIDMAX << 24)) continue;
 #endif
     if ((buf[5] & 0xC0) != 0x80) continue;

diff --git a/demuxervdr.h b/demuxervdr.h
index ff2d0302487043700b72f0e30233bcd5ecd50932..7c7a36e8eea9e43edddf3c8c6fe2cac30ba49b36 100644 (file)
--- a/demuxervdr.h
+++ b/demuxervdr.h
@@ -39,7 +39,7 @@ class DemuxerVDR : public Demuxer
     void reset();
     void flush();
     int scan(UCHAR* buf, int len);
-    int findVideoPTS(UCHAR* buf, int len, ULLONG* dest);
+    int findPTS(UCHAR* buf, int len, ULLONG* dest);
     int put(UCHAR* buf, int len);
     void setFrameNum(ULONG frame);
     ULONG getFrameNumFromPTS(ULLONG pts);