mirrors/recycled-ni-libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git synced 2025-08-26 23:12:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

libspark: stub out unused stuff in cDemux, fix getSTC

Browse Source 
Origin commit data
------------------
Branch: master
Commit: 22f4be6607
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-02-11 (Sat, 11 Feb 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2012-02-11 19:59:18 +01:00
parent 2d15226fc1
commit c3b1e87fa4
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libspark/dmx.cpp
View File

@@ -94,6 +94,7 @@ bool cDemux::Open(DMX_CHANNEL_TYPE pes_type, void * /*hVideoBuffer*/, int uBuffe
int flags = O_RDWR; int flags = O_RDWR;
if (fd > -1) if (fd > -1)
lt_info("%s FD ALREADY OPENED? fd = %d\n", __FUNCTION__, fd); lt_info("%s FD ALREADY OPENED? fd = %d\n", __FUNCTION__, fd);
#if 0
if (pes_type == DMX_TP_CHANNEL) if (pes_type == DMX_TP_CHANNEL)
{ {
if (num == 0) /* streaminfo measurement, let's cheat... */ if (num == 0) /* streaminfo measurement, let's cheat... */
@@ -119,6 +120,7 @@ bool cDemux::Open(DMX_CHANNEL_TYPE pes_type, void * /*hVideoBuffer*/, int uBuffe
devnum = dmx_tp_count; devnum = dmx_tp_count;
} }
} }
#endif
fd = open(devname[devnum], flags); fd = open(devname[devnum], flags);
if (fd < 0) if (fd < 0)
{ {
@@ -130,13 +132,13 @@ bool cDemux::Open(DMX_CHANNEL_TYPE pes_type, void * /*hVideoBuffer*/, int uBuffe
num, DMX_T[pes_type], pes_type, uBufferSize, fd); num, DMX_T[pes_type], pes_type, uBufferSize, fd);
dmx_type = pes_type; dmx_type = pes_type;
#if 0
if (!pesfds.empty()) if (!pesfds.empty())
{ {
lt_info("%s ERROR! pesfds not empty!\n", __FUNCTION__); /* TODO: error handling */ lt_info("%s ERROR! pesfds not empty!\n", __FUNCTION__); /* TODO: error handling */
return false; return false;
} }
#endif
int n = DMX_SOURCE_FRONT0; int n = DMX_SOURCE_FRONT0;
if (ioctl(fd, DMX_SET_SOURCE, &n) < 0) if (ioctl(fd, DMX_SET_SOURCE, &n) < 0)
lt_info("%s DMX_SET_SOURCE failed!\n", __func__); lt_info("%s DMX_SET_SOURCE failed!\n", __func__);
@@ -514,14 +516,13 @@ void cDemux::removePid(unsigned short Pid)
void cDemux::getSTC(int64_t * STC) void cDemux::getSTC(int64_t * STC)
{ {
lt_debug("%s #%d\n", __FUNCTION__, num); /* apparently I can only get the PTS of the video decoder,
struct dmx_stc stc; * but that's good enough for dvbsub */
memset(&stc, 0, sizeof(dmx_stc)); lt_debug("%s #%d\n", __func__, num);
stc.num = 0; int64_t pts = 0;
stc.base = 1; if (videoDecoder)
if (ioctl(fd, DMX_GET_STC, &stc)) pts = videoDecoder->GetPTS();
perror("cDemux::getSTC DMX_GET_STC"); *STC = pts;
*STC = (int64_t)stc.stc;
} }
int cDemux::getUnit(void) int cDemux::getUnit(void)