mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 15:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

neutrino: TD-dvbsub fix did break coolstream dvbsub

Browse Source
This commit is contained in:
Stefan Seyfried
2011-12-25 23:39:41 +01:00
parent bf86a07a0d
commit 41a2f7a803
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/libdvbsub/dvbsub.cpp
View File

@@ -249,8 +249,11 @@ static void* reader_thread(void * /*arg*/)
uint8_t* buf; uint8_t* buf;
dmx = new cDemux(0); dmx = new cDemux(0);
#if HAVE_TRIPLEDRAGON
dmx->Open(DMX_PES_CHANNEL, NULL, 16*1024); dmx->Open(DMX_PES_CHANNEL, NULL, 16*1024);
#else
dmx->Open(DMX_PES_CHANNEL, NULL, 64*1024);
#endif
while (reader_running) { while (reader_running) {
if(dvbsub_stopped /*dvbsub_paused*/) { if(dvbsub_stopped /*dvbsub_paused*/) {
sub_debug.print(Debug::VERBOSE, "%s stopped\n", __FUNCTION__); sub_debug.print(Debug::VERBOSE, "%s stopped\n", __FUNCTION__);

7
lib/libdvbsub/dvbsubtitle.cpp
View File

@@ -300,8 +300,10 @@ void dvbsub_get_stc(int64_t * STC);
int cDvbSubtitleConverter::Action(void) int cDvbSubtitleConverter::Action(void)
{ {
int WaitMs = WAITMS; int WaitMs = WAITMS;
#if 0
retry: retry:
bool shown = false; bool shown = false;
#endif
if (!running) if (!running)
return 0; return 0;
@@ -332,7 +334,7 @@ dbgconverter("cDvbSubtitleConverter::Action: PTS: %012llx STC: %012llx (%lld) ti
if(sb->Count()) if(sb->Count())
WaitMs = MIN_DISPLAY_TIME; WaitMs = MIN_DISPLAY_TIME;
bitmaps->Del(sb, true); bitmaps->Del(sb, true);
shown = true; // shown = true;
} }
else if (Delta < WaitMs) else if (Delta < WaitMs)
WaitMs = (Delta > SHOW_DELTA) ? Delta - SHOW_DELTA : Delta; WaitMs = (Delta > SHOW_DELTA) ? Delta - SHOW_DELTA : Delta;
@@ -350,9 +352,10 @@ dbgconverter("cDvbSubtitleConverter::Action: PTS: %012llx STC: %012llx (%lld) ti
} }
} }
Unlock(); Unlock();
#if 0
if (shown) if (shown)
goto retry; goto retry;
#endif
if(WaitMs != WAITMS) if(WaitMs != WAITMS)
dbgconverter("cDvbSubtitleConverter::Action: finish, WaitMs %d\n", WaitMs); dbgconverter("cDvbSubtitleConverter::Action: finish, WaitMs %d\n", WaitMs);