From: ghost <andreas.monzner@multimedia-labs.de>
Date: Mon, 8 Jun 2009 22:01:37 +0000 (+0200)
Subject: estring.cpp: add support for ISO/IEC 10646-1 (Basic Multilingual Plane) (aka UTF... 
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=ddd3b54bd32d9bbf0768856093fcf2329525832e

estring.cpp: add support for ISO/IEC 10646-1 (Basic Multilingual Plane) (aka UTF-16 ... aka Unicode) dvb encoded strings
---

diff --git a/lib/base/estring.cpp b/lib/base/estring.cpp
index 85bbcc6..be07145 100644
--- a/lib/base/estring.cpp
+++ b/lib/base/estring.cpp
@@ -398,8 +398,9 @@ std::string convertDVBUTF8(const unsigned char *data, int len, int table, int ts
 			}
 			break;
 		}
-		case 0x11:
-			eDebug("unsup. Basic Multilingual Plane of ISO/IEC 10646-1 enc.");
+		case 0x11: //  Basic Multilingual Plane of ISO/IEC 10646-1 enc  (UTF-16... Unicode)
+			table = 65;
+			tsidonid = 0;
 			++i;
 			break;
 		case 0x12:
@@ -438,8 +439,16 @@ std::string convertDVBUTF8(const unsigned char *data, int len, int table, int ts
 		unsigned long code=0;
 		if ( useTwoCharMapping && i+1 < len && (code=doVideoTexSuppl(data[i], data[i+1])) )
 			i+=2;
-		if (!code)
-			code=recode(data[i++], table);
+		if (!code) {
+			if (table == 65) { // unicode
+				if (i+1 < len) {
+					code=(data[i] << 8) | data[i+1];
+					i += 2;
+				}
+			}
+			else
+				code=recode(data[i++], table);
+		}
 		if (!code)
 			continue;
 				// Unicode->UTF8 encoding