From 7a554d8f54a6906ec063d2f8cd667e4c5c0a6449 Mon Sep 17 00:00:00 2001
From: focus <focus@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: Wed, 30 Dec 2009 14:47:04 +0000
Subject: [PATCH] testing dvb subtitles

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@128 e54a6e83-5905-42d5-8d5c-058d10e6a962
---
 lib/libdvbsub/dvbsub.cpp      |  9 ++++-----
 lib/libdvbsub/dvbsubtitle.cpp | 22 +++++-----------------
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/lib/libdvbsub/dvbsub.cpp b/lib/libdvbsub/dvbsub.cpp
index bbd54e4e0..1d2f5ce0c 100644
--- a/lib/libdvbsub/dvbsub.cpp
+++ b/lib/libdvbsub/dvbsub.cpp
@@ -243,7 +243,7 @@ void* reader_thread(void * /*arg*/)
 			}
 		}
 		if(!dvbsub_paused) {
-			sub_debug.print(Debug::VERBOSE, "[subtitles] adding packet, len %d\n", count);
+			sub_debug.print(Debug::VERBOSE, "[subtitles] adding packet, len %d buf 0x%x\n", count, buf);
 			/* Packet now in memory */
 			packet_queue.push(buf);
 			/* TODO: allocation exception */
@@ -324,11 +324,10 @@ void* dvbsub_thread(void* /*arg*/)
 #endif
 		sub_debug.print(Debug::VERBOSE, "PES: Wakeup, queue size %d\n\n", packet_queue.size());
 		if(dvbsub_paused) {
-			do {
+			while(packet_queue.size()) {
 				packet = packet_queue.pop();
-				if(packet)
-					delete[] packet;
-			} while(packet);
+				delete[] packet;
+			}
 			continue;
 		}
 		packet = packet_queue.pop();
diff --git a/lib/libdvbsub/dvbsubtitle.cpp b/lib/libdvbsub/dvbsubtitle.cpp
index ce389b93a..7f20b2305 100644
--- a/lib/libdvbsub/dvbsubtitle.cpp
+++ b/lib/libdvbsub/dvbsubtitle.cpp
@@ -685,7 +685,8 @@ void cDvbSubtitleBitmaps::Clear()
 {
 	dbgconverter("cDvbSubtitleBitmaps::Clear: x=% d y= %d, w= %d, h= %d\n", min_x, min_y, max_x-min_x, max_y-min_y);
 	if(max_x && max_y) {
-		CFrameBuffer::getInstance()->paintBackgroundBoxRel (min_x, min_y-10, max_x-min_x, max_y-min_y+10);
+		//CFrameBuffer::getInstance()->paintBackgroundBoxRel (min_x, min_y-10, max_x-min_x, max_y-min_y+10);
+		CFrameBuffer::getInstance()->paintBackground();
 		max_x = max_y = 0;
 		min_x = min_y = 0xFFFF;
 	}
@@ -799,7 +800,8 @@ void cDvbSubtitleConverter::Clear(void)
 {
 	if(max_x && max_y) {
 		dbgconverter("cDvbSubtitleConverter::Clear: x=% d y= %d, w= %d, h= %d\n", min_x, min_y, max_x-min_x, max_y-min_y);
-		CFrameBuffer::getInstance()->paintBackgroundBoxRel (min_x, min_y-10, max_x-min_x, max_y-min_y+10);
+		//CFrameBuffer::getInstance()->paintBackgroundBoxRel (min_x, min_y-10, max_x-min_x, max_y-min_y+10);
+		CFrameBuffer::getInstance()->paintBackground();
 		max_x = max_y = 0;
 		min_x = min_y = 0xFFFF;
 	}
@@ -827,19 +829,7 @@ int cDvbSubtitleConverter::ConvertFragments(const uchar *Data, int Length, int64
      int SubstreamHeaderLength = 4;
      bool ResetSubtitleAssembler = Data[PayloadOffset + 3] == 0x00;
 
-     // Compatibility mode for old subtitles plugin:
-#if 0
-     if ((Data[7] & 0x01) && (Data[PayloadOffset - 3] & 0x81) == 0x01 && Data[PayloadOffset - 2] == 0x81) {
-        PayloadOffset--;
-        SubstreamHeaderLength = 1;
-        ResetSubtitleAssembler = Data[8] >= 5;
-        }
-#endif
-
      if (Length > PayloadOffset + SubstreamHeaderLength) {
-//        int64_t pts = 0;//PesGetPts(Data);
-        //if (pts)
-        //   dbgconverter("Converter PTS: %lld\n", pts);
         const uchar *data = Data + PayloadOffset + SubstreamHeaderLength; // skip substream header
         int length = Length - PayloadOffset - SubstreamHeaderLength; // skip substream header
         if (ResetSubtitleAssembler)
@@ -874,9 +864,6 @@ int cDvbSubtitleConverter::Convert(const uchar *Data, int Length, int64_t pts)
   if (Data && Length > 8) {
      int PayloadOffset = 0;//PesPayloadOffset(Data);
      if (Length > PayloadOffset) {
-//        int64_t pts = 0;//PesGetPts(Data);
-        //if (pts)
-        //   dbgconverter("Converter PTS: %lld\n", pts);
         const uchar *data = Data + PayloadOffset;
         int length = Length - PayloadOffset;
         if (length > 3) {
@@ -950,6 +937,7 @@ int cDvbSubtitleConverter::Action(void)
 					Timeout.Set(sb->Timeout() * 1000);//max: was 1000 and timeout seems in 1/10 of sec ??
 				}
 				bitmaps->Del(sb, true);
+				WaitMs = 1000;
 			}
 			else if (Delta < WaitMs)
 				WaitMs = Delta;