diff options
| -rw-r--r-- | device.c | 10 | ||||
| -rw-r--r-- | device.h | 4 | ||||
| -rw-r--r-- | tools/udp_buffer.h | 4 |
3 files changed, 9 insertions, 9 deletions
@@ -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.111 2010-06-02 10:26:21 phintuka Exp $ + * $Id: device.c,v 1.112 2010-06-04 10:40:20 rofafor Exp $ * */ @@ -1118,7 +1118,7 @@ int cXinelibDevice::PlayAny(const uchar *buf, int length) return length; } -#if VDRVERSNUM >= 10701 +#if VDRVERSNUM >= 10701 || defined(TSPLAY_PATCH_VERSION) /* * hook to PlayTs() to get PAT and PMT */ @@ -1249,7 +1249,7 @@ int cXinelibDevice::PlayTsVideo(const uchar *Data, int Length) return PlayTsAny(Data, Length); } -#endif // VDRVERSNUM >= 10701 +#endif // VDRVERSNUM >= 10701 || defined(TSPLAY_PATCH_VERSION) bool cXinelibDevice::AcceptVideoPacket(const uchar *Data, int Length) { @@ -1356,7 +1356,7 @@ void cXinelibDevice::StillPicture(const uchar *Data, int Length) bool isPes = DATA_IS_PES(Data) && ((Data[3] & 0xF0) == 0xE0); bool isMpeg1 = isPes && ((Data[6] & 0xC0) != 0x80); bool isH264 = isPes && pes_is_frame_h264(Data, Length); -#if VDRVERSNUM >= 10701 +#if VDRVERSNUM >= 10701 || defined(TSPLAY_PATCH_VERSION) bool isTs = DATA_IS_TS(Data); #endif @@ -1383,7 +1383,7 @@ void cXinelibDevice::StillPicture(const uchar *Data, int Length) &mmin<int>, Length); } else if(isPes) { /*cDevice::*/PlayPes(Data, Length, m_SkipAudio); -#if VDRVERSNUM >= 10701 +#if VDRVERSNUM >= 10701 || defined(TSPLAY_PATCH_VERSION) } else if(isTs) { int written = 0, total = (Length/TS_SIZE)*TS_SIZE; while (written < total) { @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: device.h,v 1.59 2010-06-02 10:26:21 phintuka Exp $ + * $Id: device.h,v 1.60 2010-06-04 10:40:20 rofafor Exp $ * */ @@ -250,7 +250,7 @@ class cXinelibDevice : public cDevice virtual int PlayAudio(const uchar *Data, int Length, uchar Id); virtual int PlaySubtitle(const uchar *Data, int Length); -#if VDRVERSNUM >= 10701 +#if VDRVERSNUM >= 10701 || defined(TSPLAY_PATCH_VERSION) // join multiple TS packets to xineliboutput transport packet cMutex m_TsBufLock; uint8_t m_TsBuf[4096]; diff --git a/tools/udp_buffer.h b/tools/udp_buffer.h index 76bebf1d..94643d1e 100644 --- a/tools/udp_buffer.h +++ b/tools/udp_buffer.h @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: udp_buffer.h,v 1.7 2010-03-14 11:50:50 phintuka Exp $ + * $Id: udp_buffer.h,v 1.8 2010-06-04 10:40:21 rofafor Exp $ * */ @@ -111,7 +111,7 @@ class cUdpBackLog // RTP header header->rtp_hdr.raw[0] = RTP_VERSION_BYTE | RTP_HDREXT_BIT; -#if VDRVERSNUM >= 10701 +#if VDRVERSNUM >= 10701 || defined(TSPLAY_PATCH_VERSION) if (DATA_IS_TS(Data)) header->rtp_hdr.raw[1] = RTP_PAYLOAD_TYPE_TS; else |