mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-27 15:32:52 +02:00
neutrino: TD-dvbsub fix did break coolstream dvbsub
Origin commit data
------------------
Commit: 41a2f7a803
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-12-25 (Sun, 25 Dec 2011)
This commit is contained in:
@@ -249,8 +249,11 @@ static void* reader_thread(void * /*arg*/)
|
||||
uint8_t* buf;
|
||||
|
||||
dmx = new cDemux(0);
|
||||
dmx->Open(DMX_PES_CHANNEL, NULL, 16*1024);
|
||||
|
||||
#if HAVE_TRIPLEDRAGON
|
||||
dmx->Open(DMX_PES_CHANNEL, NULL, 16*1024);
|
||||
#else
|
||||
dmx->Open(DMX_PES_CHANNEL, NULL, 64*1024);
|
||||
#endif
|
||||
while (reader_running) {
|
||||
if(dvbsub_stopped /*dvbsub_paused*/) {
|
||||
sub_debug.print(Debug::VERBOSE, "%s stopped\n", __FUNCTION__);
|
||||
|
@@ -300,8 +300,10 @@ void dvbsub_get_stc(int64_t * STC);
|
||||
int cDvbSubtitleConverter::Action(void)
|
||||
{
|
||||
int WaitMs = WAITMS;
|
||||
#if 0
|
||||
retry:
|
||||
bool shown = false;
|
||||
#endif
|
||||
if (!running)
|
||||
return 0;
|
||||
|
||||
@@ -332,7 +334,7 @@ dbgconverter("cDvbSubtitleConverter::Action: PTS: %012llx STC: %012llx (%lld) ti
|
||||
if(sb->Count())
|
||||
WaitMs = MIN_DISPLAY_TIME;
|
||||
bitmaps->Del(sb, true);
|
||||
shown = true;
|
||||
// shown = true;
|
||||
}
|
||||
else if (Delta < WaitMs)
|
||||
WaitMs = (Delta > SHOW_DELTA) ? Delta - SHOW_DELTA : Delta;
|
||||
@@ -350,9 +352,10 @@ dbgconverter("cDvbSubtitleConverter::Action: PTS: %012llx STC: %012llx (%lld) ti
|
||||
}
|
||||
}
|
||||
Unlock();
|
||||
#if 0
|
||||
if (shown)
|
||||
goto retry;
|
||||
|
||||
#endif
|
||||
if(WaitMs != WAITMS)
|
||||
dbgconverter("cDvbSubtitleConverter::Action: finish, WaitMs %d\n", WaitMs);
|
||||
|
||||
|
Reference in New Issue
Block a user