From c11caab8aa7f1e296694e2eaa4477d299adcd1e6 Mon Sep 17 00:00:00 2001
From: Jochen Dolze <vdr@dolze.de>
Date: Tue, 6 Oct 2009 00:36:26 +0200
Subject: Fixed TS packet processing (buffer overflows) Added packet injection

---
 demux.cpp | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'demux.cpp')

diff --git a/demux.cpp b/demux.cpp
index 9c28c34..89855d7 100644
--- a/demux.cpp
+++ b/demux.cpp
@@ -48,7 +48,6 @@ void cMarkAdDemux::ProcessVDR(MarkAdPid Pid, uchar *Data, int Count, uchar **Pkt
         if (!pes2audioes) pes2audioes=new cMarkAdPES2ES(recvnumber,"PES2ES audio");
         if (!pes2audioes) return;
         pes2audioes->Process(Pid,pkt,pktlen,Pkt,PktLen);
-        return;
     }
 
     if ((Pid.Type==MARKAD_PIDTYPE_VIDEO_H262) || (Pid.Type==MARKAD_PIDTYPE_VIDEO_H264))
@@ -56,14 +55,14 @@ void cMarkAdDemux::ProcessVDR(MarkAdPid Pid, uchar *Data, int Count, uchar **Pkt
         if (!pes2videoes) pes2videoes=new cMarkAdPES2ES(recvnumber,"PES2ES video",65536);
         if (!pes2videoes) return;
         pes2videoes->Process(Pid,pkt,pktlen,Pkt,PktLen);
-        return;
     }
+
     return;
 }
 
 void cMarkAdDemux::ProcessTS(MarkAdPid Pid, uchar *Data, int Count, uchar **Pkt, int *PktLen)
 {
-    if ((!Pkt) || (!PktLen) || (!Data)) return;
+    if ((!Pkt) || (!PktLen)) return;
     *Pkt=NULL;
     *PktLen=0;
 
@@ -80,14 +79,24 @@ void cMarkAdDemux::ProcessTS(MarkAdPid Pid, uchar *Data, int Count, uchar **Pkt,
         if (!pes2audioes) pes2audioes=new cMarkAdPES2ES(recvnumber,"PES2ES audio");
         if (!pes2audioes) return;
         pes2audioes->Process(Pid,pkt,pktlen,Pkt,PktLen);
-        return;
     }
 
-    if (pkt)
+    if ((Pid.Type==MARKAD_PIDTYPE_VIDEO_H262) || (Pid.Type==MARKAD_PIDTYPE_VIDEO_H264))
+    {
+        if ((pkt) && ((pkt[3] & 0xF0)==0xE0) && (pkt[4]!=0) && (pkt[5]!=0))
+        {
+            ts2pkt->InjectVideoPES(pkt,pktlen);
+            pkt=NULL;
+            pktlen=0;
+        }
+    }
+
+    if ((pkt) && (!*Pkt))
     {
         *Pkt=pkt;
         *PktLen=pktlen;
     }
+
     return;
 }
 
-- 
cgit v1.2.3