summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--device.c6
-rw-r--r--frontend.c12
-rw-r--r--frontend.h6
-rw-r--r--frontend_local.c8
-rw-r--r--frontend_local.h4
-rw-r--r--frontend_svr.c12
-rw-r--r--frontend_svr.h4
7 files changed, 27 insertions, 25 deletions
diff --git a/device.c b/device.c
index 17164923..f947d26d 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: device.c,v 1.101 2010-02-28 07:54:29 phintuka Exp $
+ * $Id: device.c,v 1.102 2010-03-13 12:04:29 phintuka Exp $
*
*/
@@ -1099,11 +1099,11 @@ int cXinelibDevice::PlayAny(const uchar *buf, int length)
if(m_local) {
length = (isMpeg1 ? m_local->Play_Mpeg1_PES(buf,length) :
- m_local->Play_PES(buf,length));
+ m_local->Play(buf, length));
}
if(m_server && length > 0) {
int length2 = isMpeg1 ? m_server->Play_Mpeg1_PES(buf, length) :
- m_server->Play_PES(buf, length);
+ m_server->Play(buf, length);
if(!m_local)
return length2;
}
diff --git a/frontend.c b/frontend.c
index 97e64281..b8bce3e9 100644
--- a/frontend.c
+++ b/frontend.c
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: frontend.c,v 1.81 2010-03-03 16:34:44 phintuka Exp $
+ * $Id: frontend.c,v 1.82 2010-03-13 12:04:29 phintuka Exp $
*
*/
@@ -397,7 +397,7 @@ int cXinelibThread::Poll(cPoller& Poller, int TimeoutMs)
// Data transfer
//
-int cXinelibThread::Play_PES(const uchar *data, int len)
+int cXinelibThread::Play(const uchar *data, int len, eStreamId StreamId)
{
Lock();
m_StreamPos += len;
@@ -482,7 +482,7 @@ int cXinelibThread::Play_Mpeg1_PES(const uchar *data1, int len)
while(!Poll(p,100) && loops++ < 10) {
LOGDBG("Play_Mpeg1_PES: poll failed");
}
- r = Play_PES(data2,newlen+6);
+ r = Play(data2, newlen + 6);
}
delete data2;
@@ -507,7 +507,7 @@ bool cXinelibThread::Play_Mpeg2_ES(const uchar *data, int len, int streamID, boo
hdr_pts[3] = (uchar)streamID;
Poll(p, 100);
- Play_PES(hdr_pts, sizeof(hdr_pts));
+ Play(hdr_pts, sizeof(hdr_pts));
hdr_vid[3] = (uchar)streamID;
while(todo) {
@@ -525,7 +525,7 @@ bool cXinelibThread::Play_Mpeg2_ES(const uchar *data, int len, int streamID, boo
Poll(p, 100);
- if(blocklen+hdrlen != Play_PES(frame,blocklen+hdrlen)) {
+ if (blocklen + hdrlen != Play(frame, blocklen + hdrlen)) {
delete frame;
return false;
}
@@ -536,7 +536,7 @@ bool cXinelibThread::Play_Mpeg2_ES(const uchar *data, int len, int streamID, boo
seq_end[3] = (uchar)streamID;
seq_end[12] = h264 ? NAL_END_SEQ : SC_SEQUENCE_END;
Poll(p, 100);
- Play_PES(seq_end, sizeof(seq_end));
+ Play(seq_end, sizeof(seq_end));
}
delete[] frame;
diff --git a/frontend.h b/frontend.h
index 71e0fd19..38094dfa 100644
--- a/frontend.h
+++ b/frontend.h
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: frontend.h,v 1.37 2010-03-03 16:34:44 phintuka Exp $
+ * $Id: frontend.h,v 1.38 2010-03-13 12:04:29 phintuka Exp $
*
*/
@@ -15,6 +15,8 @@
#include <vdr/thread.h>
#include <vdr/device.h> // ePlayMode
+#include "xine_input_vdr_net.h" // eStreamId
+
class cStatus;
//----------------------------- cXinelibThread --------------------------------
@@ -72,7 +74,7 @@ class cXinelibThread : public cThread, public cListObject
virtual int Poll(cPoller &Poller, int TimeoutMs);
virtual bool Flush(int TimeoutMs);
virtual void Clear(void);
- virtual int Play_PES(const uchar *buf, int len);
+ virtual int Play(const uchar *buf, int len, eStreamId StreamId = sidVdr);
virtual void OsdCmd(void *cmd) = 0;
virtual int64_t GetSTC(void) { return -1; }
virtual void SetHDMode(bool On) { (void)Xine_Control("HDMODE", m_bHDMode = On); };
diff --git a/frontend_local.c b/frontend_local.c
index d48cc743..973d0d50 100644
--- a/frontend_local.c
+++ b/frontend_local.c
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: frontend_local.c,v 1.45 2010-03-13 12:00:05 phintuka Exp $
+ * $Id: frontend_local.c,v 1.46 2010-03-13 12:04:29 phintuka Exp $
*
*/
@@ -116,16 +116,16 @@ cXinelibLocal::~cXinelibLocal()
// Data transfer
//
-int cXinelibLocal::Play_PES(const uchar *data, int len)
+int cXinelibLocal::Play(const uchar *data, int len, eStreamId StreamId)
{
- TRACEF("cXinelibLocal::Play_PES");
+ TRACEF("cXinelibLocal::Play");
{
LOCK_FE;
if (fe && Running()) {
int done = fe->xine_queue_pes_packet(fe, 0, m_StreamPos, (const char *)data, len);
if (done >= 0)
- return cXinelibThread::Play_PES(data, len);
+ return cXinelibThread::Play(data, done, StreamId);
}
}
diff --git a/frontend_local.h b/frontend_local.h
index 2054ec51..72552b03 100644
--- a/frontend_local.h
+++ b/frontend_local.h
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: frontend_local.h,v 1.7 2009-08-18 12:36:56 phintuka Exp $
+ * $Id: frontend_local.h,v 1.8 2010-03-13 12:04:29 phintuka Exp $
*
*/
@@ -32,7 +32,7 @@ class cXinelibLocal : public cXinelibThread
public:
// Data transfer
- virtual int Play_PES(const uchar *buf, int len);
+ virtual int Play(const uchar *buf, int len, eStreamId StreamId = sidVdr);
virtual void OsdCmd(void *cmd);
virtual int64_t GetSTC();
diff --git a/frontend_svr.c b/frontend_svr.c
index e68f7002..0bb840b7 100644
--- a/frontend_svr.c
+++ b/frontend_svr.c
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: frontend_svr.c,v 1.88 2010-01-30 10:50:36 phintuka Exp $
+ * $Id: frontend_svr.c,v 1.89 2010-03-13 12:04:29 phintuka Exp $
*
*/
@@ -417,7 +417,7 @@ void cXinelibServer::SetHeader(const uchar *Data, int Length, bool Reset)
}
}
-int cXinelibServer::Play_PES(const uchar *data, int len)
+int cXinelibServer::Play(const uchar *data, int len, eStreamId StreamId)
{
int TcpClients = 0, UdpClients = 0, RtpClients = 0;
@@ -436,10 +436,10 @@ int cXinelibServer::Play_PES(const uchar *data, int len)
int result = m_Writer[i]->Put(m_StreamPos, data, len);
if(!result) {
- LOGMSG("cXinelibServer::Play_PES Write/Queue error (TCP/PIPE)");
+ LOGMSG("cXinelibServer::Play Write/Queue error (TCP/PIPE)");
CloseConnection(i);
} else if(result<0) {
- LOGMSG("cXinelibServer::Play_PES Buffer overflow (TCP/PIPE)");
+ LOGMSG("cXinelibServer::Play Buffer overflow (TCP/PIPE)");
if(m_ConnType[i] == ctHttp)
m_Writer[i]->Clear();
}
@@ -454,10 +454,10 @@ int cXinelibServer::Play_PES(const uchar *data, int len)
if(UdpClients || RtpClients)
if(! m_Scheduler->Queue(m_StreamPos, data, len))
- LOGMSG("cXinelibServer::Play_PES Buffer overflow (UDP/RTP)");
+ LOGMSG("cXinelibServer::Play Buffer overflow (UDP/RTP)");
if(TcpClients || UdpClients || RtpClients)
- cXinelibThread::Play_PES(data, len);
+ cXinelibThread::Play(data, len, StreamId);
return len;
}
diff --git a/frontend_svr.h b/frontend_svr.h
index b17eede4..198e3065 100644
--- a/frontend_svr.h
+++ b/frontend_svr.h
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: frontend_svr.h,v 1.28 2010-01-29 13:54:54 phintuka Exp $
+ * $Id: frontend_svr.h,v 1.29 2010-03-13 12:04:29 phintuka Exp $
*
*/
@@ -45,7 +45,7 @@ class cXinelibServer : public cXinelibThread
virtual int Poll(cPoller &Poller, int TimeoutMs);
virtual bool Flush(int TimeoutMs);
virtual void Clear(void);
- virtual int Play_PES(const uchar *buf, int len);
+ virtual int Play(const uchar *buf, int len, eStreamId StreamId = sidVdr);
virtual void OsdCmd(void *cmd);
virtual int64_t GetSTC();
virtual void SetHDMode(bool On);
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-25 20:46:24 +0000