X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb%2Fsubtitle.cpp;h=3787ab1b4effdbc4b1efd722fbc9c2a45741be77;hp=60d48ff7e10b6a624e6adb0286bc0431218a32bd;hb=cddb13ae57507610df08f5f11e0b19a7e36f63cb;hpb=7e5b66316f891fd526991891196308f098ceece9;ds=sidebyside

diff --git a/lib/dvb/subtitle.cpp b/lib/dvb/subtitle.cpp
index 60d48ff..3787ab1 100644
--- a/lib/dvb/subtitle.cpp
+++ b/lib/dvb/subtitle.cpp
@@ -81,7 +81,7 @@ void eDVBSubtitleParser::subtitle_process_line(subtitle_page *page, int object_i
 				}
 //				//eDebug("inserting %d bytes (into region %d)", len, region->region_id);
 //				eDebug("put data to region_buffer %p", &(*region->region_buffer));
-				memcpy((__u8*)region->region_buffer->surface->data + region->region_width * y + x, data, len);
+				memcpy((__u8*)region->region_buffer->surface->data + region->region_buffer->surface->stride * y + x, data, len);
 			}
 			object = object->next;
 		}
@@ -243,17 +243,17 @@ int eDVBSubtitleParser::subtitle_process_pixel_data(subtitle_page *page, int obj
 		bitstream_init(&bit, data, 4);
 		for ( int i=0; i < 4; ++i )
 			bitstream_get(&bit);
-		break;
+		return 2 + 1;
 	case 0x21:  // ignore 2 -> 8bit map table
 		bitstream_init(&bit, data, 8);
 		for ( int i=0; i < 4; ++i )
 			bitstream_get(&bit);
-		break;
+		return 4 + 1;
 	case 0x22:  // ignore 4 -> 8bit map table
 		bitstream_init(&bit, data, 8);
 		for ( int i=0; i < 16; ++i )
 			bitstream_get(&bit);
-		break;
+		return 16 + 1;
 	case 0xF0:
 		subtitle_process_line(page, object_id, *linenr, line, *linep);
 /*		{
@@ -290,9 +290,9 @@ int eDVBSubtitleParser::subtitle_process_segment(__u8 *segment)
 		return segment_length + 6;
 	if (page_id != m_composition_page_id && page_id != m_ancillary_page_id)
 		return segment_length + 6;
-//	//eDebug("have %d bytes of segment data", segment_length);
+	//eDebug("have %d bytes of segment data", segment_length);
 
-//	//eDebug("page_id %d, segtype %02x", page_id, segment_type);
+	//eDebug("page_id %d, segtype %02x", page_id, segment_type);
 
 	subtitle_page *page, **ppage;
 
@@ -345,19 +345,37 @@ int eDVBSubtitleParser::subtitle_process_segment(__u8 *segment)
 			}
 		}
 
-//		eDebug("page updated: old: %d, new: %d", page->page_version_number, page_version_number);
+		page->state = page_state;
+
+		//eDebug("page updated: old: %d, new: %d", page->page_version_number, page_version_number);
 			// when acquisition point or mode change: remove all displayed pages.
 		if ((page_state == 1) || (page_state == 2))
 		{
 			while (page->page_regions)
 			{
 				subtitle_page_region *p = page->page_regions->next;
+				//eDebug("delete page_region %d", page->page_regions->region_id);
 				delete page->page_regions;
 				page->page_regions = p;
 			}
+			while (page->regions)
+			{
+				subtitle_region *p = page->regions->next;
+				//eDebug("delete region %d", page->regions->region_id);
+				while(page->regions->region_objects)
+				{
+					//eDebug("delete region object");
+					subtitle_region_object *ob = page->regions->region_objects->next;
+					delete page->regions->region_objects;
+					page->regions->region_objects = ob;
+				}
+				delete page->regions;
+				page->regions = p;
+			}
+
 		}
 
-//		eDebug("new page.. (%d)", page_state);
+		//eDebug("new page.. (%d)", page_state);
 
 		page->page_time_out = page_time_out;
 
@@ -371,6 +389,12 @@ int eDVBSubtitleParser::subtitle_process_segment(__u8 *segment)
 		while (*r)
 			r = &(*r)->next;
 
+		if (processed_length == segment_length && !page->page_regions)
+		{
+			//eDebug("no regions in page.. clear screen!!");
+			subtitle_redraw(page->page_id);
+		}
+
 		while (processed_length < segment_length)
 		{
 			subtitle_page_region *pr;
@@ -428,6 +452,7 @@ int eDVBSubtitleParser::subtitle_process_segment(__u8 *segment)
 
 		if (!region)
 		{
+			//eDebug("create region !!!!!!!!!!");
 			*pregion = region = new subtitle_region;
 			region->next = 0;
 			region->committed = false;
@@ -435,6 +460,7 @@ int eDVBSubtitleParser::subtitle_process_segment(__u8 *segment)
 		else if (region->region_version_number != region_version_number)
 		{
 			subtitle_region_object *objects = region->region_objects;
+			//eDebug("unequal version %p %p", objects, objects?objects->next:objects);
 			while (objects)
 			{
 				subtitle_region_object *n = objects->next;
@@ -443,7 +469,7 @@ int eDVBSubtitleParser::subtitle_process_segment(__u8 *segment)
 			}
 			if (region->region_buffer)
 			{
-//				eDebug("no more need of region_buffer %p", &(*region->region_buffer));
+				//eDebug("no more need of region_buffer %p", &(*region->region_buffer));
 				region->region_buffer=0;
 			}
 			region->committed = false;
@@ -464,8 +490,9 @@ int eDVBSubtitleParser::subtitle_process_segment(__u8 *segment)
 		region->region_height |= *segment++;
 		processed_length += 2;
 
-		region->region_buffer = new gPixmap(eSize(region->region_width, region->region_height), 8);
-//		eDebug("new region_buffer %p", &(*region->region_buffer));
+		region->region_buffer = new gPixmap(eSize(region->region_width, region->region_height), 8, 1);
+		memset(region->region_buffer->surface->data, 0, region->region_height * region->region_buffer->surface->stride);
+		//eDebug("new region_buffer %p", &(*region->region_buffer));
 
 		int region_level_of_compatibility, region_depth;
 
@@ -492,7 +519,7 @@ int eDVBSubtitleParser::subtitle_process_segment(__u8 *segment)
 
 		if (region_fill_flag)
 		{
-//			eDebug("region fill region_buffer %p", &(*region->region_buffer));
+			//eDebug("region fill region_buffer %p", &(*region->region_buffer));
 			if (region_depth == 1)
 				memset(region->region_buffer->surface->data, region_2bit_pixel_code, region->region_height * region->region_width);
 			else if (region_depth == 2)
@@ -669,7 +696,7 @@ int eDVBSubtitleParser::subtitle_process_segment(__u8 *segment)
 
 			bottom_field_data_blocklength  = *segment++ << 8;
 			bottom_field_data_blocklength |= *segment++;
-			//eDebug("%d / %d bytes", top_field_data_blocklength, bottom_field_data_blocklength);
+			eDebug("%d / %d bytes", top_field_data_blocklength, bottom_field_data_blocklength);
 			processed_length += 4;
 
 			i = 0;
@@ -718,7 +745,7 @@ int eDVBSubtitleParser::subtitle_process_segment(__u8 *segment)
 	}
 	case 0x80: // end of display set segment
 	{
-//		eDebug("end of display set segment");
+		//eDebug("end of display set segment");
 		subtitle_redraw_all();
 	}
 	case 0xFF: // stuffing
@@ -732,9 +759,10 @@ int eDVBSubtitleParser::subtitle_process_segment(__u8 *segment)
 
 void eDVBSubtitleParser::subtitle_process_pes(__u8 *pkt, int len)
 {
-//	eDebug("subtitle_process_pes");
+	eDebugNoNewLine("subtitle_process_pes");
 	if (!extract_pts(m_show_time, pkt))
 	{
+		eDebug(" %lld", m_show_time);
 		pkt += 6; len -= 6;
 		// skip PES header
 		pkt++; len--;
@@ -766,11 +794,11 @@ void eDVBSubtitleParser::subtitle_process_pes(__u8 *pkt, int len)
 			pkt += l;
 			len -= l;
 		}
-	//	if (len && *pkt != 0xFF)
-	//		eDebug("strange data at the end");
+		if (len && *pkt != 0xFF)
+			eDebug("strange data at the end");
 	}
 	else
-		eDebug("dvb subtitle packet without PTS.. ignore!!");
+		eDebug("\ndvb subtitle packet without PTS.. ignore!!");
 }
 
 void eDVBSubtitleParser::subtitle_redraw_all()
@@ -779,41 +807,42 @@ void eDVBSubtitleParser::subtitle_redraw_all()
 	subtitle_page *page = m_pages;
 	while(page)
 	{
-		subtitle_redraw(page->page_id);
+		if (page->state != 0)
+			subtitle_redraw(page->page_id);
 		page = page->next;
 	}
 #else
 	subtitle_page *page = m_pages;
-	//eDebug("----------- end of display set");
-	//eDebug("active pages:");
+	eDebug("----------- end of display set");
+	eDebug("active pages:");
 	while (page)
 	{
-		//eDebug("  page_id %02x", page->page_id);
-		//eDebug("  page_version_number: %d", page->page_version_number);
-		//eDebug("  active regions:");
+		eDebug("  page_id %02x", page->page_id);
+		eDebug("  page_version_number: %d", page->page_version_number);
+		eDebug("  active regions:");
 		{
 			subtitle_page_region *region = page->page_regions;
 			while (region)
 			{
-				//eDebug("    region_id: %04x", region->region_id);
-				//eDebug("    region_horizontal_address: %d", region->region_horizontal_address);
-				//eDebug("    region_vertical_address: %d", region->region_vertical_address);
+				eDebug("    region_id: %04x", region->region_id);
+				eDebug("    region_horizontal_address: %d", region->region_horizontal_address);
+				eDebug("    region_vertical_address: %d", region->region_vertical_address);
 
 				region = region->next;
 			}
 		}
 
 		subtitle_redraw(page->page_id);
-		//eDebug("defined regions:");
+		eDebug("defined regions:");
 		subtitle_region *region = page->regions;
 		while (region)
 		{
-			//eDebug("  region_id %04x, version %d, %dx%d", region->region_id, region->region_version_number, region->region_width, region->region_height);
+			eDebug("  region_id %04x, version %d, %dx%d", region->region_id, region->region_version_number, region->region_width, region->region_height);
 
 			subtitle_region_object *object = region->region_objects;
 			while (object)
 			{
-				//eDebug("  object %02x, type %d, %d:%d", object->object_id, object->object_type, object->object_horizontal_position, object->object_vertical_position);
+				eDebug("  object %02x, type %d, %d:%d", object->object_id, object->object_type, object->object_horizontal_position, object->object_vertical_position);
 				object = object->next;
 			}
 			region = region->next;