frodovdr/vdr-plugin-satip
1
0
Fork 0
mirror of https://github.com/rofafor/vdr-plugin-satip.git synced 2023-10-10 13:37:42 +02:00
Code Issues Releases Wiki Activity

Get rid of CheckData() as we are receiving only live streams.

Browse Source
This commit is contained in:
Rolf Ahrenberg 2014-11-23 19:08:15 +02:00
parent 80abbddae7
commit 1642f59980
8 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
device.c
View File

@ -418,14 +418,6 @@ void cSatipDevice::WriteData(uchar *bufferP, int lengthP)
pSectionFilterHandlerM->Write(bufferP, lengthP); pSectionFilterHandlerM->Write(bufferP, lengthP);
} }
unsigned int cSatipDevice::CheckData(void)
{
//debug("cSatipDevice::%s(%u)", __FUNCTION__, deviceIndexM);
if (tsBufferM)
return (unsigned int)tsBufferM->Free();
return 0;
}
int cSatipDevice::GetId(void) int cSatipDevice::GetId(void)
{ {
//debug("cSatipDevice::%s(%u)", __FUNCTION__, deviceIndexM); //debug("cSatipDevice::%s(%u)", __FUNCTION__, deviceIndexM);

1
device.h
View File

@ -107,7 +107,6 @@ public:
// for internal device interface // for internal device interface
public: public:
virtual void WriteData(u_char *bufferP, int lengthP); virtual void WriteData(u_char *bufferP, int lengthP);
virtual unsigned int CheckData(void);
virtual int GetId(void); virtual int GetId(void);
}; };

1
deviceif.h
View File

@ -13,7 +13,6 @@ public:
cSatipDeviceIf() {} cSatipDeviceIf() {}
virtual ~cSatipDeviceIf() {} virtual ~cSatipDeviceIf() {}
virtual void WriteData(u_char *bufferP, int lengthP) = 0; virtual void WriteData(u_char *bufferP, int lengthP) = 0;
virtual unsigned int CheckData(void) = 0;
virtual int GetId(void) = 0; virtual int GetId(void) = 0;
private: private:

2
rtcp.c
View File

@ -34,7 +34,7 @@ int cSatipRtcp::GetFd(void)
int cSatipRtcp::GetApplicationOffset(int *lengthP) int cSatipRtcp::GetApplicationOffset(int *lengthP)
{ {
//debug("cSatipRtcp::%s() [device %d]", __FUNCTION__, tunerM.GetId()); //debug("cSatipRtcp::%s(%d) [device %d]", __FUNCTION__, *lengthP, tunerM.GetId());
if (!lengthP) if (!lengthP)
return -1; return -1;
int offset = 0; int offset = 0;

6
rtp.c
View File

@ -50,7 +50,7 @@ void cSatipRtp::Close(void)
int cSatipRtp::GetHeaderLenght(unsigned int lengthP) int cSatipRtp::GetHeaderLenght(unsigned int lengthP)
{ {
//debug("cSatipRtp::%s() [device %d]", __FUNCTION__, tunerM.GetId()); //debug("cSatipRtp::%s(%d) [device %d]", __FUNCTION__, lengthP, tunerM.GetId());
unsigned int headerlen = 0; unsigned int headerlen = 0;
if (lengthP > 0) { if (lengthP > 0) {
@ -109,9 +109,9 @@ int cSatipRtp::GetHeaderLenght(unsigned int lengthP)
void cSatipRtp::Process(int fdP) void cSatipRtp::Process(int fdP)
{ {
//debug("cSatipRtp::%s() [device %d]", __FUNCTION__, tunerM.GetId()); //debug("cSatipRtp::%s(%d) [device %d]", __FUNCTION__, fdP, tunerM.GetId());
if (bufferM) { if (bufferM) {
int length = Read(bufferM, min(tunerM.GetVideoDataSize(), bufferLenM)); int length = Read(bufferM, bufferLenM);
if (length > 0) { if (length > 0) {
int headerlen = GetHeaderLenght(length); int headerlen = GetHeaderLenght(length);
if ((headerlen >= 0) && (headerlen < length)) if ((headerlen >= 0) && (headerlen < length))

6
tuner.c
View File

@ -248,12 +248,6 @@ bool cSatipTuner::Disconnect(void)
return true; return true;
} }
unsigned int cSatipTuner::GetVideoDataSize(void)
{
//debug("cSatipTuner::%s() [device %d]", __FUNCTION__, deviceIdM);
return deviceM->CheckData();
}
void cSatipTuner::ProcessVideoData(u_char *bufferP, int lengthP) void cSatipTuner::ProcessVideoData(u_char *bufferP, int lengthP)
{ {
//debug("cSatipTuner::%s(%d) [device %d]", __FUNCTION__, lengthP, deviceIdM); //debug("cSatipTuner::%s(%d) [device %d]", __FUNCTION__, lengthP, deviceIdM);

1
tuner.h
View File

@ -115,7 +115,6 @@ public:
// for internal tuner interface // for internal tuner interface
public: public:
virtual unsigned int GetVideoDataSize(void);
virtual void ProcessVideoData(u_char *bufferP, int lengthP); virtual void ProcessVideoData(u_char *bufferP, int lengthP);
virtual void ProcessApplicationData(u_char *bufferP, int lengthP); virtual void ProcessApplicationData(u_char *bufferP, int lengthP);
virtual void SetStreamId(int streamIdP); virtual void SetStreamId(int streamIdP);

1
tunerif.h
View File

@ -12,7 +12,6 @@ class cSatipTunerIf {
public: public:
cSatipTunerIf() {} cSatipTunerIf() {}
virtual ~cSatipTunerIf() {} virtual ~cSatipTunerIf() {}
virtual unsigned int GetVideoDataSize(void) = 0;
virtual void ProcessVideoData(u_char *bufferP, int lenghtP) = 0; virtual void ProcessVideoData(u_char *bufferP, int lenghtP) = 0;
virtual void ProcessApplicationData(u_char *bufferP, int lenghtP) = 0; virtual void ProcessApplicationData(u_char *bufferP, int lenghtP) = 0;
virtual void SetStreamId(int streamIdP) = 0; virtual void SetStreamId(int streamIdP) = 0;