From: Jaroslav Kysela Date: Fri, 7 Sep 2018 07:48:35 +0000 (+0200) Subject: dvb support: add more comments to charsets in dvb_get_string() X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7374b24aa67ef146e633fd8c5d76bb4baa9a822f;p=thirdparty%2Ftvheadend.git dvb support: add more comments to charsets in dvb_get_string() --- diff --git a/src/input/mpegts/dvb_support.c b/src/input/mpegts/dvb_support.c index 6c0d542a1..252f498ac 100644 --- a/src/input/mpegts/dvb_support.c +++ b/src/input/mpegts/dvb_support.c @@ -283,7 +283,7 @@ dvb_get_string *dst = 0; // empty string (confirmed!) return 0; - case 0x01 ... 0x0b: + case 0x01 ... 0x0b: /* ISO 8859-X */ if (auto_pl_charset && (src[0] + 4) == 5) ic = convert_iso6937; else @@ -291,11 +291,11 @@ dvb_get_string src++; srclen--; break; - case 0x0c ... 0x0f: + case 0x0c ... 0x0f: /* reserved for the future use */ src++; srclen--; break; - case 0x10: /* Table A.4 */ + case 0x10: /* ISO 8859 - Table A.4 */ if(srclen < 3 || src[1] != 0 || src[2] == 0 || src[2] > 0x0f) return -1; @@ -303,34 +303,39 @@ dvb_get_string src+=3; srclen-=3; break; - case 0x11: + case 0x11: /* ISO 10646 */ ic = convert_ucs2; src++; srclen--; break; - case 0x13: - ic = convert_gb; + case 0x12: /* KSX1001-2004 - Korean Character Set - NYI! */ src++; srclen--; break; - case 0x12: + case 0x13: /* GB-2312-1980 */ + ic = convert_gb; src++; srclen--; break; - case 0x14: + case 0x14: /* Big5 subset of ISO 10646 */ ic = convert_ucs2; src++; srclen--; break; - case 0x15: + case 0x15: /* UTF-8 */ ic = convert_utf8; src++; srclen--; break; - case 0x16 ... 0x1f: + case 0x16 ... 0x1e: /* reserved for the future use */ src++; srclen--; break; + case 0x1f: /* Described by encoding_type_id, TS 101 162 */ + if (srclen < 1) + return -1; + return -1; /* NYI */ + default: if (auto_pl_charset) ic = convert_iso_8859[2];