frodovdr/vdr-plugin-streamdev
1
0
Fork 0
mirror of https://projects.vdr-developer.org/git/vdr-plugin-streamdev.git synced 2023-10-10 19:16:51 +02:00
Code Issues Releases Wiki Activity

- updated to 1.3.19

Browse Source
This commit is contained in:
lordjaxom 2005-01-25 14:14:43 +00:00
parent 302fa2e672
commit 04a5985dcc
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/assembler.c
View File

@ -1,5 +1,5 @@
/* /*
* $Id: assembler.c,v 1.1 2004/12/30 22:44:04 lordjaxom Exp $ * $Id: assembler.c,v 1.2 2005/01/25 14:14:43 lordjaxom Exp $
*/ */
#include "client/assembler.h" #include "client/assembler.h"
@ -33,7 +33,7 @@ cStreamdevAssembler::cStreamdevAssembler(cTBSocket *Socket)
cStreamdevAssembler::~cStreamdevAssembler() { cStreamdevAssembler::~cStreamdevAssembler() {
if (m_Active) { if (m_Active) {
m_Active = false; m_Active = false;
WakeUp(); /* WakeUp();*/
Cancel(3); Cancel(3);
} }
close(m_Pipe[0]); close(m_Pipe[0]);

16
client/device.c
View File

@ -1,5 +1,5 @@
/* /*
* $Id: device.c,v 1.1 2004/12/30 22:44:00 lordjaxom Exp $ * $Id: device.c,v 1.2 2005/01/25 14:14:43 lordjaxom Exp $
*/ */
#include "client/device.h" #include "client/device.h"
@ -131,11 +131,15 @@ void cStreamdevDevice::CloseDvr(void) {
} }
bool cStreamdevDevice::GetTSPacket(uchar *&Data) { bool cStreamdevDevice::GetTSPacket(uchar *&Data) {
if (m_TSBuffer) { if (m_TSBuffer) {
int r; Data = m_TSBuffer->Get();
return true;
}
return false;
/*int r;
while ((r = m_TSBuffer->Read()) >= 0) { while ((r = m_TSBuffer->Read()) >= 0) {
Data = m_TSBuffer->Get(); Data = m_TSBuffer->Get();
#if VDRVERSNUM >= 10300 #if VDRVERSNUM >= 10300 // --> TODO: no filter streaming yet
if (Data != NULL) { if (Data != NULL) {
u_short pid = (((u_char)Data[1] & PID_MASK_HI) << 8) | Data[2]; u_short pid = (((u_char)Data[1] & PID_MASK_HI) << 8) | Data[2];
u_char tid = Data[3]; u_char tid = Data[3];
@ -151,9 +155,7 @@ bool cStreamdevDevice::GetTSPacket(uchar *&Data) {
LOG_ERROR; LOG_ERROR;
return false; return false;
} }
return true; return true;*/
}
return false;
} }
#if VDRVERSNUM >= 10300 #if VDRVERSNUM >= 10300

4
client/device.h
View File

@ -1,5 +1,5 @@
/* /*
* $Id: device.h,v 1.1 2004/12/30 22:44:00 lordjaxom Exp $ * $Id: device.h,v 1.2 2005/01/25 14:14:43 lordjaxom Exp $
*/ */
#ifndef VDR_STREAMDEV_DEVICE_H #ifndef VDR_STREAMDEV_DEVICE_H
@ -30,7 +30,7 @@ private:
protected: protected:
virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView); virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
virtual bool HasLock(void) { return m_TSBuffer != NULL; } virtual bool HasLock(int TimeoutMs) { return m_TSBuffer != NULL; } // TODO
virtual bool SetPid(cPidHandle *Handle, int Type, bool On); virtual bool SetPid(cPidHandle *Handle, int Type, bool On);
virtual bool OpenDvr(void); virtual bool OpenDvr(void);

2
remux/tsremux.h
View File

@ -4,6 +4,8 @@
#include "libdvbmpeg/transform.h" #include "libdvbmpeg/transform.h"
#include <vdr/remux.h> #include <vdr/remux.h>
#define RESULTBUFFERSIZE KILOBYTE(256)
class cTSRemux { class cTSRemux {
protected: protected:
uchar m_ResultBuffer[RESULTBUFFERSIZE]; uchar m_ResultBuffer[RESULTBUFFERSIZE];