summaryrefslogtreecommitdiff
path: root/libdtv/libsi/si_debug_services.h
diff options
context:
space:
mode:
authorKlaus Schmidinger <kls (at) cadsoft (dot) de>2004-01-04 18:00:00 +0100
committerKlaus Schmidinger <kls (at) cadsoft (dot) de>2004-01-04 18:00:00 +0100
commit93a94b18b540fbcb9bcdaaea9abd26cdf23d6ee6 (patch)
treebede17e6cd329d36ec02bc53dfe567b95ec835a5 /libdtv/libsi/si_debug_services.h
parentc432905dd60630f906ac89f58592ad835a9063ef (diff)
downloadvdr-patch-lnbsharing-93a94b18b540fbcb9bcdaaea9abd26cdf23d6ee6.tar.gz
vdr-patch-lnbsharing-93a94b18b540fbcb9bcdaaea9abd26cdf23d6ee6.tar.bz2
Version 1.3.0vdr-1.3.0
- Changed thread handling to make it work with NPTL ("Native Posix Thread Library"). Thanks to Jon Burgess, Andreas Schultz, Werner Fink and Stefan Huelswitt. - The cThread class now accepts a 'Description' parameter, which is used to log the beginning and end of the thread, together with its process and thread id. For descriptions that need additional parameters you can use the function cThread::SetDescription(), which accepts 'printf()' like arguments. Existing plugins that use threads should be changed to use this functionality instead of explicit 'dsyslog()' calls inside their Action() function in order to support logging the thread ids. - Added "Slovak Link" and "Czech Link" to 'ca.conf' (thanks to Emil Petersky). However, 'ca.conf' is now pretty much obsolete due to the automatic CA handling. - Mutexes are now created with PTHREAD_MUTEX_ERRORCHECK_NP, which makes the 'lockingTid' stuff obsolete (thanks to Stefan Huelswitt). - Changed font handling to allow language specific character sets. - Adopted the small font character set from the "Elchi" patch (originally provided by Alessio Sangalli). - Greek language texts now use iso8859-7 character set (thanks to Dimitrios Dimitrakos). - Rearranged section data handling, so that the actual data handling can be done separately, even from within plugins. - The EPG data structures have been moved from eit.[hc] to epg.[hc] and have been adapted to the general VDR coding style. Plugins that use these data structures may need to change some function names (which should be obvious). The name 'subtitle' has been changed to 'shortText' to avoid clashes with actual subtitles that are part of a movie. The name 'extendedDescription' has been shortened to 'description'. - Replaced 'libdtv' with 'libsi' (thanks to Marcel Wiesweg), which is thread safe and can be used by multiple section filters simultaneously. - Added 'cRwLock' to 'thread.[hc]'. Note that all plugin Makefiles need to define _GNU_SOURCE for this to work (see the example plugin Makefiles and 'newplugin'). - Fixed a problem with crc32 in SI handling on 64bit systems (thanks to Pedro Miguel Sequeira de Justo Teixeira for reporting this one). - Fixed an alignment problem in CAM access on 64bit systems (thanks to Pedro Miguel Sequeira de Justo Teixeira for reporting this one). - Added 'StreamType' setting to CAM communication, which is important for Aston/SECA CAMs (thanks to Antonino Sergi). - Now the CA descriptors are sent to the CAM in the 'program' or 'ES level' sections, depending on where they are found in the PMT (thanks to Hans-Peter Raschke for reporting this one). This should make SkyCrypt CAMs work. - Now using the 'version number' of EPG events to avoid unnecessary work. - Channel data is now automatically derived from the DVB data stream (inspired by the 'autopid' patch from Andreas Schultz). - The current channel is now automatically re-tuned if the PIDs or other settings change. If a recording is going on on a channel that has a change in its settings, the recording will be stopped and immediately restarted to use the new channel settings. - EPG events now use the complete channel ID with NID, TID and SID. - Channel names in 'channels.conf' can now have a short form, as provided by some tv stations (see man vdr(5)). Currently channels that provide short names in addition to long ones are listed in the OSD as "short,long name", as in "RTL,RTL Television". The short names will be used explicitly later. - The Ca parameter in 'channels.conf' has been extended and now contains all the CA system ids for the given channel. When switching to a channel VDR now tests for a device that provides one of these CA system ids. The devices automatically get their supported ids from the CI handler. - The values in 'ca.conf' are currently without any real meaning. Whether or not a channel with conditional access can be received is now determined automatically by evaluating its CA descriptors and comparing them to the CA system ids provided by the installed CAM. Only the special values 1-16 are used to assign a channel to a particular device. - Increased the maximum number of possible OSD colors to 256. - Limited the line length in the EPG bugfix report, which appears to fix a buffer overflow that caused a crash when cleaning up the EPG data (at 05:00 in the morning).
Diffstat (limited to 'libdtv/libsi/si_debug_services.h')
-rw-r--r--libdtv/libsi/si_debug_services.h245
1 files changed, 0 insertions, 245 deletions
diff --git a/libdtv/libsi/si_debug_services.h b/libdtv/libsi/si_debug_services.h
deleted file mode 100644
index 404f3c7..0000000
--- a/libdtv/libsi/si_debug_services.h
+++ /dev/null
@@ -1,245 +0,0 @@
-//////////////////////////////////////////////////////////////
-/// ///
-/// si_debug_services.h: local debugging definitions ///
-/// ///
-//////////////////////////////////////////////////////////////
-
-// $Revision: 1.2 $
-// $Date: 2003/02/04 18:45:35 $
-// $Author: hakenes $
-//
-// (C) 2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
-//
-// libsi is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2, or (at your option)
-// any later version.
-//
-// libsi is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You may have received a copy of the GNU General Public License
-// along with libsi; see the file COPYING. If not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-struct component_type {
- u_char Content;
- u_char Type;
- char *Description;
-};
-
-static struct component_type ComponentTypes[] = {
- { 0x01, 0x01, "video, 4:3 aspect ratio, 25 Hz" },
- { 0x01, 0x02, "video, 16:9 aspect ratio with pan vectors, 25 Hz" },
- { 0x01, 0x03, "video, 16:9 aspect ratio without pan vectors, 25 Hz" },
- { 0x01, 0x04, "video, > 16:9 aspect ratio, 25 Hz" },
- { 0x01, 0x05, "video, 4:3 aspect ratio, 30 Hz" },
- { 0x01, 0x06, "video, 16:9 aspect ratio with pan vectors, 30 Hz" },
- { 0x01, 0x07, "video, 16:9 aspect ratio without pan vectors, 30 Hz" },
- { 0x01, 0x08, "video, > 16:9 aspect ratio, 30 Hz" },
- { 0x01, 0x09, "HD video, 4:3 aspect ratio, 25 Hz" },
- { 0x01, 0x0A, "HD video, 16:9 aspect ratio with pan vectors, 25 Hz" },
- { 0x01, 0x0B, "HD video, 16:9 aspect ratio without pan vectors, 25 Hz" },
- { 0x01, 0x0C, "HD video, > 16:9 aspect ratio, 25 Hz" },
- { 0x01, 0x0D, "HD video, 4:3 aspect ratio, 30 Hz" },
- { 0x01, 0x0E, "HD video, 16:9 aspect ratio with pan vectors, 30 Hz" },
- { 0x01, 0x0F, "HD video, 16:9 aspect ratio without pan vectors, 30 Hz" },
- { 0x01, 0x10, "HD video, > 16:9 aspect ratio, 30 Hz" },
- { 0x02, 0x01, "audio, single mono channel" },
- { 0x02, 0x02, "audio, dual mono channel" },
- { 0x02, 0x03, "audio, stereo (2 channel)" },
- { 0x02, 0x04, "audio, multi lingual, multi channel" },
- { 0x02, 0x05, "audio, surround sound" },
- { 0x02, 0x40, "audio description for the visually impaired" },
- { 0x02, 0x41, "audio for the hard of hearing" },
- { 0x03, 0x01, "EBU Teletext subtitles" },
- { 0x03, 0x02, "associated EBU Teletext" },
- { 0x03, 0x03, "VBI data" },
- { 0x03, 0x10, "DVB subtitles (normal), no aspect criticality" },
- { 0x03, 0x11, "DVB subtitles (normal), aspect 4:3 only" },
- { 0x03, 0x12, "DVB subtitles (normal), aspect 16:9 only" },
- { 0x03, 0x13, "DVB subtitles (normal), aspect 2.21:1 only" },
- { 0x03, 0x20, "DVB subtitles (hard of hearing), no aspect criticality" },
- { 0x03, 0x21, "DVB subtitles (hard of hearing), aspect 4:3 only" },
- { 0x03, 0x22, "DVB subtitles (hard of hearing), aspect 16:9 only" },
- { 0x03, 0x23, "DVB subtitles (hard of hearing), aspect 2.21:1 only" }
-};
-#define COMPONENT_TYPE_NUMBER 35
-
-
-struct service_type {
- u_char Type;
- char *Description;
-};
-
-static struct service_type ServiceTypes[] = {
- { 0x01, "digital television service" },
- { 0x02, "digital radio sound service" },
- { 0x03, "Teletext service" },
- { 0x04, "NVOD reference service" },
- { 0x05, "NVOD time-shifted service" },
- { 0x06, "mosaic service" },
- { 0x07, "PAL coded signal" },
- { 0x08, "SECAM coded signal" },
- { 0x09, "D/D2-MAC" },
- { 0x0A, "FM Radio" },
- { 0x0B, "NTSC coded signal" },
- { 0x0C, "data broadcast service" },
- { 0x0D, "common interface data" },
- { 0x0E, "RCS Map" },
- { 0x0F, "RCS FLS" },
- { 0x10, "DVB MHP service" }
-};
-#define SERVICE_TYPE_NUMBER 16
-
-
-struct content_type {
- u_char Nibble1;
- u_char Nibble2;
- char *Description;
-};
-
-static struct content_type ContentTypes[] = {
- /* Movie/Drama: */
- { 0x01, 0x00, "movie/drama (general)" },
- { 0x01, 0x01, "detective/thriller" },
- { 0x01, 0x02, "adventure/western/war" },
- { 0x01, 0x03, "science fiction/fantasy/horror" },
- { 0x01, 0x04, "comedy" },
- { 0x01, 0x05, "soap/melodrama/folkloric" },
- { 0x01, 0x06, "romance" },
- { 0x01, 0x07, "serious/classical/religious/historical movie/drama" },
- { 0x01, 0x08, "adult movie/drama" },
- /* News/Current affairs: */
- { 0x02, 0x00, "news/current affairs (general)" },
- { 0x02, 0x01, "news/weather report" },
- { 0x02, 0x02, "news magazine" },
- { 0x02, 0x03, "documentary" },
- { 0x02, 0x04, "discussion/interview/debate" },
- /* Show/Game show: */
- { 0x03, 0x00, "show/game show (general)" },
- { 0x03, 0x01, "game show/quiz/contest" },
- { 0x03, 0x02, "variety show" },
- { 0x03, 0x03, "talk show" },
- /* Sports: */
- { 0x04, 0x00, "sports (general)" },
- { 0x04, 0x01, "special events (Olympic Games, World Cup etc.)" },
- { 0x04, 0x02, "sports magazines" },
- { 0x04, 0x03, "football/soccer" },
- { 0x04, 0x04, "tennis/squash" },
- { 0x04, 0x05, "team sports (excluding football)" },
- { 0x04, 0x06, "athletics" },
- { 0x04, 0x07, "motor sport" },
- { 0x04, 0x08, "water sport" },
- { 0x04, 0x09, "winter sports" },
- { 0x04, 0x0A, "equestrian" },
- { 0x04, 0x0B, "martial sports" },
- /* Children's/Youth programmes: */
- { 0x05, 0x00, "children's/youth programmes (general)" },
- { 0x05, 0x01, "pre-school children's programmes" },
- { 0x05, 0x02, "entertainment programmes for 6 to14" },
- { 0x05, 0x03, "entertainment programmes for 10 to 16" },
- { 0x05, 0x04, "informational/educational/school programmes" },
- { 0x05, 0x05, "cartoons/puppets" },
- /* Music/Ballet/Dance: */
- { 0x06, 0x00, "music/ballet/dance (general)" },
- { 0x06, 0x01, "rock/pop" },
- { 0x06, 0x02, "serious music/classical music" },
- { 0x06, 0x03, "folk/traditional music" },
- { 0x06, 0x04, "jazz" },
- { 0x06, 0x05, "musical/opera" },
- { 0x06, 0x06, "ballet" },
- /* Arts/Culture (without music): */
- { 0x07, 0x00, "arts/culture (without music, general)" },
- { 0x07, 0x01, "performing arts" },
- { 0x07, 0x02, "fine arts" },
- { 0x07, 0x03, "religion" },
- { 0x07, 0x04, "popular culture/traditional arts" },
- { 0x07, 0x05, "literature" },
- { 0x07, 0x06, "film/cinema" },
- { 0x07, 0x07, "experimental film/video" },
- { 0x07, 0x08, "broadcasting/press" },
- { 0x07, 0x09, "new media" },
- { 0x07, 0x0A, "arts/culture magazines" },
- { 0x07, 0x0B, "fashion" },
- /* Social/Political issues/Economics: */
- { 0x08, 0x00, "social/political issues/economics (general)" },
- { 0x08, 0x01, "magazines/reports/documentary" },
- { 0x08, 0x02, "economics/social advisory" },
- { 0x08, 0x03, "remarkable people" },
- /* Children's/Youth programmes: */
- /* Education/ Science/Factual topics: */
- { 0x09, 0x00, "education/science/factual topics (general)" },
- { 0x09, 0x01, "nature/animals/environment" },
- { 0x09, 0x02, "technology/natural sciences" },
- { 0x09, 0x03, "medicine/physiology/psychology" },
- { 0x09, 0x04, "foreign countries/expeditions" },
- { 0x09, 0x05, "social/spiritual sciences" },
- { 0x09, 0x06, "further education" },
- { 0x09, 0x07, "languages" },
- /* Leisure hobbies: */
- { 0x0A, 0x00, "leisure hobbies (general)" },
- { 0x0A, 0x01, "tourism/travel" },
- { 0x0A, 0x02, "handicraft" },
- { 0x0A, 0x03, "motoring" },
- { 0x0A, 0x04, "fitness & health" },
- { 0x0A, 0x05, "cooking" },
- { 0x0A, 0x06, "advertisement/shopping" },
- { 0x0A, 0x07, "gardening" },
- { 0x0B, 0x00, "original language" },
- { 0x0B, 0x01, "black & white" },
- { 0x0B, 0x02, "unpublished" },
- { 0x0B, 0x03, "live broadcast" }
-};
-#define CONTENT_TYPE_NUMBER 79
-
-static char *StreamTypes[] = {
- "ITU-T|ISO/IEC Reserved",
- "ISO/IEC Video",
- "13818-2 Video or 11172-2 constrained parameter video stream",
- "ISO/IEC 11172 Audio",
- "ISO/IEC 13818-3 Audio",
- "private_sections",
- "packets containing private data / Videotext",
- "ISO/IEC 13522 MPEG",
- "ITU-T Rec. H.222.1",
- "ISO/IEC 13818-6 type A",
- "ISO/IEC 13818-6 type B",
- "ISO/IEC 13818-6 type C",
- "ISO/IEC 13818-6 type D",
- "ISO/IEC 13818-1 auxiliary",
- "ITU-T Rec. H.222.0 | ISO 13818-1 Reserved",
- "User private"
-};
-
-static char *CaIdents[] = {
- "Standardized systems",
- "Canal Plus",
- "CCETT",
- "Deutsche Telecom",
- "Eurodec",
- "France Telecom",
- "Irdeto",
- "Jerrold/GI",
- "Matra Communication",
- "News Datacom",
- "Nokia",
- "Norwegian Telekom",
- "NTL",
- "Philips",
- "Scientific Atlanta",
- "Sony",
- "Tandberg Television",
- "Thomson",
- "TV/Com",
- "HPT - Croatian Post and Telecommunications",
- "HRT - Croatian Radio and Television",
- "IBM",
- "Nera",
- "BetaTechnik"
-};
-#define MAX_CA_IDENT 24