mirror of
https://github.com/vdr-projects/vdr.git
synced 2025-03-01 10:50:46 +00:00
VDR developer version 2.3.1 is now available at ftp://ftp.tvdr.de/vdr/Developer/vdr-2.3.1.tar.bz2 A 'diff' against the previous version is available at ftp://ftp.tvdr.de/vdr/Developer/vdr-2.2.0-2.3.1.diff MD5 checksums: 391c2ed60e2f7d24563fe3ed5854bc4f vdr-2.3.1.tar.bz2 983fd4bad7d19cd98301d54173107129 vdr-2.2.0-2.3.1.diff WARNING: ======== This is a *developer* version. Even though *I* use it in my productive environment, I strongly recommend that you only use it under controlled conditions and for testing and debugging. *** PLEASE BE VERY CAREFUL WHEN USING THIS DEVELOPER VERSION, ESPECIALLY *** IF YOU ENABLE THE NEW SVDRP PEERING! KEEP BACKUPS OF ALL YOUR TIMERS *** AND OBSERVE VERY CLOSELY WHETHER EVERYTHING WORKS AS EXPECTED. THIS *** VERSION INTRODUCES SOME MAJOR CHANGES IN HANDLING GLOBAL LISTS AND *** LOCKING, SO ANYTHING CAN HAPPEN! YOU HAVE BEEN WARNED! The main focus of this developer version is on the new locking mechanism for global lists, and the ability to handle remote timers. Any plugins that access the global lists of timers, channels, schedules or recordings, will need to be adjusted (see below for details). Please do initial tests with plain vanilla VDR and just the output plugin you need. Known bugs/problems: - After deleting the last recording in a sub folder, the cursor may not be positioned correctly. - Instant recordings and pausing live video don't (yet) use the default SVDRP host for recording. From the HISTORY file: - The new function cOsd::MaxPixmapSize() can be called to determine the maximum size a cPixmap may have on the current OSD. The 'osddemo' example has been modified accordingly. Plugin authors may want to use this function in case they use pixmaps that are larger than the full OSD size. The default implementation sets this limit to 2048x2048 pixel. - The Setup/CAM menu now displays which device an individual CAM is currently assigned to (suggested by Frank Neumann). - Added detection of 24fps (thanks to Thomas Reufer). - Added a note about the VDR User Counter and VDR's facebook page to the README file. - The dvbhddevice plugin is no longer part of the VDR source archive. You can get the latest version of this plugin from the author's repository at https://bitbucket.org/powARman/dvbhddevice. - The dvbsddevice and rcu plugins are no longer part of the VDR source archive. You can get the latest versions of these plugins from ftp://ftp.tvdr.de/vdr/Plugins. - Added a section about Output Devices to the INSTALL file. - Fixed setting the source value of newly created channels, in case the NIT is received from a different, but very close satellite position (reported by Daniel Ribeiro). The code for handling different NITs has been removed from nit.c, because according to the DVB standard table id 0x40 carries only the NIT of the actual network. - Added some comment to cPixmap about the relation between OSD, ViewPort and DrawPort (suggested by Thomas Reufer). - Improved syncing on sections when parsing the NIT and SDT. - Fixed scaling subtitles (their areas could sometimes extend outside the actual OSD). - Reduced the priority of the "video directory scanner" thread (suggested by Thomas Reufer) and checking cIoThrottle::Engaged() when it is running. - The script that gets called for recordings is now also called right before a recording is edited, with the first parameter being "editing" (suggested by Dieter Ferdinand). - The new setup option "OSD/Default sort mode for recordings" can be used to define how recordings shall be sorted by default (either by time or by name, with "by time" being the default). If a particular sort mode has been selected for a folder by pressing '0', the default no longer applies to that folder. Repeating timers no longer write a ".sort" file into a recordings folder to have the recordings sorted by time. - The command line option -D now accepts the value '-' (as in -D-), which prevents VDR from using any DVB devices (suggested by Dietmar Spingler). - The -V and -h options now list the plugins in alphabetical order (suggested by Dietmar Spingler). - Fixed a compiler warning in font.c. - Commented out the line #define DEPRECATED_VIDEOSYSTEM in device.h. If a plugin doesn't compile with this version of VDR, you can uncomment this line as a quick workaround. In the long run the plugin will need to be adapted. - The function cOsd::GetBitmap() is now 'protected'. If a plugin doesn't compile with this version of VDR, you can uncomment the line //#define DEPRECATED_GETBITMAP in osd.h as a quick workaround. In the long run the plugin will need to be adapted. - The -u option now also accepts a numerical user id (suggested by Derek Kelly). - The SVDRP port now accepts multiple concurrent connections. You can now keep an SVDRP connection open as long as you wish, without preventing others from connecting. Note, though, that SVDRP connections still get closed automatically if there has been no activity for 300 seconds (configurable via "Setup/Miscellaneous/SVDRP timeout (s)"). - The SVDRP log messages have been unified and now always contain the IP and port number of the remote host. - SVDRP connections are now handled in a separate "SVDRP server handler" thread, which makes them more responsive. Note that there is only one thread that handles all concurrent SVDRP connections. That way each SVDRP command is guaranteed to be processed separately, without interfering with any other SVDRP commands that might be issued at the same time. Plugins that implement SVDRP commands may need to take care of proper locking if the commands access global data. - VDR now sends out a broadcast to port 6419/udp, which was assigned to 'svdrp-disc' by the IANA. VDRs listening on that port will automatically initiate an SVDRP connection to the broadcasting VDR, and in turn send out a broadcast to make other VDRs connect to them. That way all VDRs within the local network will have permanent "peer-to-peer" SVDRP connections between each other. The configuration in the svdrphosts.conf file is taken into account when considering whether or not to respond to an SVDRP discover broadcast. - The new SVDRP command PING is used by automatically established peer-to-peer connections to keep them alive. - The new function GetSVDRPServerNames() can be used to get a list of all VDRs this VDR is connected to via SVDRP. - The new function ExecSVDRPCommand() can be used to execute an SVDRP command on one of the servers this VDR is connected to, and retrieve the result. The helper functions SVDRPCode() and SVDRPValue() can be used to easily access the codes and values returned by ExecSVDRPCommand(). - The cTimer class now has a new member named 'remote', which holds the name of the remote server this timer will record on. If this is NULL, it is a local timer. - Timers from other VDRs that are connected to this VDR via SVDRP are now automatically fetched and stored in the global Timers list. In order for this to work, all of the channels used by timers on the remote VDR must also be defined on the local VDR (however, not necessarily in the same sequence). Automatic channel syncing will be implemented later. - The main menu of the LCARS skin now displays a small rectangle on the left side of a timer if this is a remote timer. The color of that rectangle changes if the timer is currently recording on the remote VDR. - Accessing the global Timers list now has to be protected by proper locking, because SVDRP commands are now executed in a separate thread. The introduction of this locking mechanism required the following changes: + The new classes cStateLock and cStateKey are used to implement locking with quick detection of state changes. + cConfig::cConfig() now has a parameter that indicates whether this list requires locking. + The global lists of Timers, Channels, Schedules and Recordings are no longer static variables. They are now pointers that need to be retrieved through a call to cTimers::GetTimersRead/Write(), cChannels::GetChannelsRead/Write(), cSchedules::GetSchedulesRead/Write() and cRecordings::GetRecordingsRead/Write(), respectively. + References from/to link channels are now removed in cChannels::Del() rather than cChannel::~cChannel(), to make sure the caller holds a proper lock. + cChannel::HasTimer() has been removed. This information is now retrieved via cSchedule::HasTimer(). + Several member functions of cChannel, cTimer, cMarks and cRecording have been made 'const', and some of them are now available as both 'const' and 'non-const' versions. + The cChannel::Set...() functions are now 'bool' and return true if they have actually changed any of the channels's members. + cChannels::SetModified() has been renamed to cChannels::SetModifiedByUser(). + cChannels::Modified() has been renamed to cChannels::ModifiedByUser(), and now has a 'State' parameter that allows the caller to see whether a channel has been modified since the last call to this function with the same State variable. + The macros CHANNELSMOD_NONE/_AUTO/_USER have been removed. + cMarks now requires locking via cStateKey. + cSortedTimers now requires a pointer to the list of timers. + cEvent::HasTimer() no longer scans the list of timers to check whether an event is referenced by a timer, but rather keeps score of how many timers reference it. This was necessary in order to avoid having to lock the list of timers from within a cEvent. + The new class cListGarbageCollector is used to temporary store any objects deleted from cLists that require locking. This allows pointers to such objects to be dereferenced even if the objects are no longer part of the list. + cListBase::Contains() can be used to check whether a particular object is still contained in that list. + Outdated events are no longer "phased out", but rather deleted right away and thus taken care of by the new "garbage collector" of the list. + Deleted cRecording objects are no longer kept in a list of "vanished" recordings, but are rather taken care of by the new "garbage collector" of the list. + cSchedules::ClearAll() has been removed. The functionality is now implemented directly in cSVDRPServer::CmdCLRE(). + tEventID has been changed to u_int16_t in order to make room for the new member numTimers in cEvent. + cSchedule now has a member Modified(), which can be used with a State variable to quickly determine whether this schedule has been modified since the last call to this function with the same State variable. + cSchedulesLock has been removed. Locking the list of schedules is now done via the cList's new locking mechanism. + The 'OnlyRunningStatus' parameters in cEpgHandler::BeginSegmentTransfer() and cEpgHandler::EndSegmentTransfer() are now obsolete. They are still present in the interface for backward compatibility, but may be removed in a future version. Their value is always 'false'. + The constant tcMod is no longer used in cStatus::TimerChange(). The definition is still there for backward compatibility. Plugins that access the global lists of Timers, Channels, Recordings or Schedules will need to be adapted as follows: + Instead of directly accessing the global variables Timers, Channels or Recordings, they need to set up a cStateKey variable and call the proper getter function, as in cStateKey StateKey; if (const cTimers *Timers = cTimers::GetTimersRead(StateKey)) { // access the timers StateKey.Remove(); } and cStateKey StateKey; if (cTimers *Timers = cTimers::GetTimersWrite(StateKey)) { // access the timers StateKey.Remove(); } See timers.h, thread.h and tools.h for details on this new locking mechanism. + There are convenience macros for easily accessing these lists without having to explicitly set up a cStateKey and calling its Remove() function. These macros have the form LOCK_*_READ/WRITE (with '*' being TIMERS, CHANNELS, SCHEDULES or RECORDINGS). Simply put such a macro before the point where you need to access the respective list, and there will be a pointer named Timers, Channels, Schedules or Recordings, respectively, which is valid until the end of the current block. + If a plugin needs to access several of the global lists in parallel, locking must always be done in the sequence Timers, Channels, Recordings, Schedules. This is necessary to make sure that different threads that need to lock several lists at the same time don't end up in a deadlock. + Some pointer variables may need to be made 'const'. The compiler will tell you about these. - cSectionSyncer has been improved to better handle missed sections. - Added a missing initialization of 'seen' in cChannel's copy constructor. - Background modifications of channels, timers and events are now displayed immediately in the corresponding menus. - cEIT now checks the version of the tables before doing any processing, which saves a lot of locking and processing. - If a timer is newly created with the Red button in the Schedule menu, and the timer is presented to the user in the "Edit timer" menu because it will start immediately, it now *must* be confirmed with "Ok" to set the timer. Otherwise the timer will not be created. - Recordings and deleted recordings are now scanned in a single thread. - The new SVDRP command POLL is used by automatically established peer-to-peer connections to trigger fetching remote timers. - You can now set DumpSVDRPDataTransfer in svdrp.c to true to have all SVDRP communication printed to the console for debugging. - Added a missing 'const' to cReceiver::Receive(), to protect the given Data from being modified. - The SVDRP commands that deal with timers (DELT, LSTT, MODT, NEWT, NEXT and UPDT) as well as any log messages that refer to timers, now use a unique id for each timer, which remains valid as long as this instance of VDR is running. This means that timers are no longer continuously numbered from 1 to N in LSTT. There may be gaps in the sequence, in case timers have been deleted. - The Timers menu now displays the name of the remote VDR in front of the timer's file name, if this is a remote timer. - The new options "Setup/Miscellaneous/SVDRP peering", ".../SVDRP host name" and ".../SVDRP default host" can be used to configure automatic peering between VDRs in the same network. Peering is disabled by default and can be enabled by setting "SVDRP peering" to "yes". - The function cTimer::ToText() no longer returns a newline character at the end of the string. The newline is now added by the caller as necessary. This was changed because cTimer::ToText() is now also needed in a context where the terminating newline can't be used. Consequently, cChannel::ToText() and cMark::ToText() have been modified accordingly. - All timer related response strings from SVDRP commands now use the channel ID instead of channel numbers. - The "Edit timer" menu now has a new parameter "Record on", which can be used to select the VDR on which this timer shall record. Timers can be freely moved between connected VDRs by simply selecting the desired machine in this field. - The SVDRP command DELT no longer checks whether the timer that shall be deleted is currently recording. - The character 0x0D is now stripped from EPG texts (reported by Janne Pänkälä). - The EPG scanner no longer moves the dish if there is a positioner. - The 'newplugin' script now creates the 'po' subdirectory for translations (thanks to Thomas Reufer). - Skins can now implement cSkinDisplayMenu::MenuOrientation() to display horizontal menus (thanks to Stefan Braun). - Fixed a possible stack overflow in cListBase::Sort() (thanks to Oliver Endriss). - Changed the description of the --chartab option in the INSTALL file to refer to "DVB SI table strings" instead of "EPG data". - The width and height of the OSD are now limited to the actual maximum dimensions of the output device, taking into account the top and left offset. - The new setup option "Recording/Record key handling" can be used to define what happens if the Record key on the remote control is pressed during live tv (suggested by Dietmar Spingler). - Empty adaptation field TS packets are now skipped when recording (thanks to Christopher Reimer, based on the "AFFcleaner" by Stefan Pöschel).
543 lines
22 KiB
C++
543 lines
22 KiB
C++
/***************************************************************************
|
|
* Copyright (c) 2003 by Marcel Wiesweg *
|
|
* *
|
|
* This program 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 of the License, or *
|
|
* (at your option) any later version. *
|
|
* *
|
|
* $Id: si.h 4.0 2015/02/10 13:54:28 kls Exp $
|
|
* *
|
|
***************************************************************************/
|
|
|
|
#ifndef LIBSI_SI_H
|
|
#define LIBSI_SI_H
|
|
|
|
#include <stdint.h>
|
|
|
|
#include "util.h"
|
|
#include "headers.h"
|
|
|
|
namespace SI {
|
|
|
|
enum TableId { TableIdPAT = 0x00, //program association section
|
|
TableIdCAT = 0x01, //conditional access section
|
|
TableIdPMT = 0x02, //program map section
|
|
TableIdTSDT = 0x03,//transport stream description section
|
|
TableIdNIT = 0x40, //network information, actual network section
|
|
TableIdNIT_other = 0x41, //network information section, other network
|
|
TableIdSDT = 0x42, //service description section
|
|
TableIdSDT_other = 0x46,
|
|
TableIdBAT = 0x4A, //bouquet association section
|
|
TableIdEIT_presentFollowing = 0x4E, //event information section
|
|
TableIdEIT_presentFollowing_other = 0x4F,
|
|
//range from 0x50 to 0x5F
|
|
TableIdEIT_schedule_first = 0x50,
|
|
TableIdEIT_schedule_last = 0x5F,
|
|
//range from 0x60 to 0x6F
|
|
TableIdEIT_schedule_Other_first = 0x60,
|
|
TableIdEIT_schedule_Other_last = 0x6F,
|
|
TableIdTDT = 0x70, //time date section
|
|
TableIdRST = 0x71, //running status section
|
|
TableIdST = 0x72, //stuffing section
|
|
TableIdTOT = 0x73, //time offset section
|
|
TableIdDIT = 0x7E, //discontinuity information section
|
|
TableIdSIT = 0x7F, //service information section
|
|
TableIdAIT = 0x74, //application information section
|
|
TableIdPremiereCIT = 0xA0 //premiere content information section
|
|
};
|
|
|
|
|
|
enum DescriptorTag {
|
|
// defined by ISO/IEC 13818-1
|
|
VideoStreamDescriptorTag = 0x02,
|
|
AudioStreamDescriptorTag = 0x03,
|
|
HierarchyDescriptorTag = 0x04,
|
|
RegistrationDescriptorTag = 0x05,
|
|
DataStreamAlignmentDescriptorTag = 0x06,
|
|
TargetBackgroundGridDescriptorTag = 0x07,
|
|
VideoWindowDescriptorTag = 0x08,
|
|
CaDescriptorTag = 0x09,
|
|
ISO639LanguageDescriptorTag = 0x0A,
|
|
SystemClockDescriptorTag = 0x0B,
|
|
MultiplexBufferUtilizationDescriptorTag = 0x0C,
|
|
CopyrightDescriptorTag = 0x0D,
|
|
MaximumBitrateDescriptorTag = 0x0E,
|
|
PrivateDataIndicatorDescriptorTag = 0x0F,
|
|
SmoothingBufferDescriptorTag = 0x10,
|
|
STDDescriptorTag = 0x11,
|
|
IBPDescriptorTag = 0x12,
|
|
// defined by ISO-13818-6 (DSM-CC)
|
|
CarouselIdentifierDescriptorTag = 0x13,
|
|
// 0x14 - 0x3F Reserved
|
|
// defined by ISO/IEC 13818-1 Amendment
|
|
AVCDescriptorTag = 0x28,
|
|
SVCExtensionDescriptorTag = 0x30,
|
|
MVCExtensionDescriptorTag = 0x31,
|
|
// defined by ETSI (EN 300 468)
|
|
NetworkNameDescriptorTag = 0x40,
|
|
ServiceListDescriptorTag = 0x41,
|
|
StuffingDescriptorTag = 0x42,
|
|
SatelliteDeliverySystemDescriptorTag = 0x43,
|
|
CableDeliverySystemDescriptorTag = 0x44,
|
|
VBIDataDescriptorTag = 0x45,
|
|
VBITeletextDescriptorTag = 0x46,
|
|
BouquetNameDescriptorTag = 0x47,
|
|
ServiceDescriptorTag = 0x48,
|
|
CountryAvailabilityDescriptorTag = 0x49,
|
|
LinkageDescriptorTag = 0x4A,
|
|
NVODReferenceDescriptorTag = 0x4B,
|
|
TimeShiftedServiceDescriptorTag = 0x4C,
|
|
ShortEventDescriptorTag = 0x4D,
|
|
ExtendedEventDescriptorTag = 0x4E,
|
|
TimeShiftedEventDescriptorTag = 0x4F,
|
|
ComponentDescriptorTag = 0x50,
|
|
MocaicDescriptorTag = 0x51,
|
|
StreamIdentifierDescriptorTag = 0x52,
|
|
CaIdentifierDescriptorTag = 0x53,
|
|
ContentDescriptorTag = 0x54,
|
|
ParentalRatingDescriptorTag = 0x55,
|
|
TeletextDescriptorTag = 0x56,
|
|
TelephoneDescriptorTag = 0x57,
|
|
LocalTimeOffsetDescriptorTag = 0x58,
|
|
SubtitlingDescriptorTag = 0x59,
|
|
TerrestrialDeliverySystemDescriptorTag = 0x5A,
|
|
MultilingualNetworkNameDescriptorTag = 0x5B,
|
|
MultilingualBouquetNameDescriptorTag = 0x5C,
|
|
MultilingualServiceNameDescriptorTag = 0x5D,
|
|
MultilingualComponentDescriptorTag = 0x5E,
|
|
PrivateDataSpecifierDescriptorTag = 0x5F,
|
|
ServiceMoveDescriptorTag = 0x60,
|
|
ShortSmoothingBufferDescriptorTag = 0x61,
|
|
FrequencyListDescriptorTag = 0x62,
|
|
PartialTransportStreamDescriptorTag = 0x63,
|
|
DataBroadcastDescriptorTag = 0x64,
|
|
ScramblingDescriptorTag = 0x65,
|
|
DataBroadcastIdDescriptorTag = 0x66,
|
|
TransportStreamDescriptorTag = 0x67,
|
|
DSNGDescriptorTag = 0x68,
|
|
PDCDescriptorTag = 0x69,
|
|
AC3DescriptorTag = 0x6A,
|
|
AncillaryDataDescriptorTag = 0x6B,
|
|
CellListDescriptorTag = 0x6C,
|
|
CellFrequencyLinkDescriptorTag = 0x6D,
|
|
AnnouncementSupportDescriptorTag = 0x6E,
|
|
ApplicationSignallingDescriptorTag = 0x6F,
|
|
AdaptationFieldDataDescriptorTag = 0x70,
|
|
ServiceIdentifierDescriptorTag = 0x71,
|
|
ServiceAvailabilityDescriptorTag = 0x72,
|
|
// defined by ETSI (EN 300 468) v 1.7.1
|
|
DefaultAuthorityDescriptorTag = 0x73,
|
|
RelatedContentDescriptorTag = 0x74,
|
|
TVAIdDescriptorTag = 0x75,
|
|
ContentIdentifierDescriptorTag = 0x76,
|
|
TimeSliceFecIdentifierDescriptorTag = 0x77,
|
|
ECMRepetitionRateDescriptorTag = 0x78,
|
|
S2SatelliteDeliverySystemDescriptorTag = 0x79,
|
|
EnhancedAC3DescriptorTag = 0x7A,
|
|
DTSDescriptorTag = 0x7B,
|
|
AACDescriptorTag = 0x7C,
|
|
ExtensionDescriptorTag = 0x7F,
|
|
// defined by EICTA/EACEM/DIGITALEUROPE
|
|
LogicalChannelDescriptorTag = 0x83,
|
|
PreferredNameListDescriptorTag = 0x84,
|
|
PreferredNameIdentifierDescriptorTag = 0x85,
|
|
EacemStreamIdentifierDescriptorTag = 0x86,
|
|
HdSimulcastLogicalChannelDescriptorTag = 0x88,
|
|
// Extension descriptors
|
|
ImageIconDescriptorTag = 0x00,
|
|
CpcmDeliverySignallingDescriptor = 0x01,
|
|
CPDescriptorTag = 0x02,
|
|
CPIdentifierDescriptorTag = 0x03,
|
|
T2DeliverySystemDescriptorTag = 0x04,
|
|
SHDeliverySystemDescriptorTag = 0x05,
|
|
SupplementaryAudioDescriptorTag = 0x06,
|
|
NetworkChangeNotifyDescriptorTag = 0x07,
|
|
MessageDescriptorTag = 0x08,
|
|
TargetRegionDescriptorTag = 0x09,
|
|
TargetRegionNameDescriptorTag = 0x0A,
|
|
ServiceRelocatedDescriptorTag = 0x0B,
|
|
// defined by ETSI (EN 300 468) v 1.12.1
|
|
XAITPidDescriptorTag = 0x0C,
|
|
C2DeliverySystemDescriptorTag = 0x0D,
|
|
// 0x0E - 0x0F Reserved
|
|
VideoDepthRangeDescriptorTag = 0x10,
|
|
T2MIDescriptorTag = 0x11,
|
|
|
|
// Defined by ETSI TS 102 812 (MHP)
|
|
// They once again start with 0x00 (see page 234, MHP specification)
|
|
MHP_ApplicationDescriptorTag = 0x00,
|
|
MHP_ApplicationNameDescriptorTag = 0x01,
|
|
MHP_TransportProtocolDescriptorTag = 0x02,
|
|
MHP_DVBJApplicationDescriptorTag = 0x03,
|
|
MHP_DVBJApplicationLocationDescriptorTag = 0x04,
|
|
// 0x05 - 0x0A is unimplemented this library
|
|
MHP_ExternalApplicationAuthorisationDescriptorTag = 0x05,
|
|
MHP_IPv4RoutingDescriptorTag = 0x06,
|
|
MHP_IPv6RoutingDescriptorTag = 0x07,
|
|
MHP_DVBHTMLApplicationDescriptorTag = 0x08,
|
|
MHP_DVBHTMLApplicationLocationDescriptorTag = 0x09,
|
|
MHP_DVBHTMLApplicationBoundaryDescriptorTag = 0x0A,
|
|
MHP_ApplicationIconsDescriptorTag = 0x0B,
|
|
MHP_PrefetchDescriptorTag = 0x0C,
|
|
MHP_DelegatedApplicationDescriptorTag = 0x0E,
|
|
MHP_ApplicationStorageDescriptorTag = 0x10,
|
|
MHP_SimpleApplicationLocationDescriptorTag = 0x15,
|
|
MHP_SimpleApplicationBoundaryDescriptorTag = 0x17,
|
|
// Premiere private Descriptor Tags
|
|
PremiereContentTransmissionDescriptorTag = 0xF2,
|
|
|
|
//a descriptor currently unimplemented in this library
|
|
//the actual value 0xFF is "forbidden" according to the spec.
|
|
UnimplementedDescriptorTag = 0xFF
|
|
};
|
|
|
|
enum DescriptorTagDomain { SI, MHP, PCIT };
|
|
|
|
enum RunningStatus { RunningStatusUndefined = 0,
|
|
RunningStatusNotRunning = 1,
|
|
RunningStatusStartsInAFewSeconds = 2,
|
|
RunningStatusPausing = 3,
|
|
RunningStatusRunning = 4
|
|
};
|
|
|
|
enum LinkageType { LinkageTypeInformationService = 0x01,
|
|
LinkageTypeEPGService = 0x02,
|
|
LinkageTypeCaReplacementService = 0x03,
|
|
LinkageTypeTSContainingCompleteNetworkBouquetSi = 0x04,
|
|
LinkageTypeServiceReplacementService = 0x05,
|
|
LinkageTypeDataBroadcastService = 0x06,
|
|
LinkageTypeRCSMap = 0x07,
|
|
LinkageTypeMobileHandover = 0x08,
|
|
LinkageTypeSystemSoftwareUpdateService = 0x09,
|
|
LinkageTypeTSContainingSsuBatOrNit = 0x0A,
|
|
LinkageTypePremiere = 0xB0
|
|
};
|
|
|
|
enum AudioType { AudioTypeUndefined = 0x00,
|
|
AudioTypeCleanEffects = 0x01,
|
|
AudioTypeHearingImpaired = 0x02,
|
|
AudioTypeVisualImpairedCommentary = 0x03
|
|
};
|
|
|
|
/* Some principles:
|
|
- Objects that return references to other objects contained in their data must make sure
|
|
that the returned objects have been parsed.
|
|
(the Loop subclasses take care of that.)
|
|
Note that this does not apply to Loops and Strings (their are never returned by reference, BTW).
|
|
*/
|
|
|
|
class Object : public Parsable {
|
|
public:
|
|
Object();
|
|
Object(CharArray &d);
|
|
//can only be called once since data is immutable
|
|
void setData(const unsigned char*data, int size, bool doCopy=true);
|
|
CharArray getData() { return data; }
|
|
//returns the valid flag which indicates if data is all right or errors have been encountered
|
|
bool isValid() { return data.isValid(); }
|
|
virtual int getLength() = 0;
|
|
protected:
|
|
CharArray data;
|
|
//is protected - not used for sections
|
|
template <class T> friend class StructureLoop;
|
|
void setData(CharArray &d);
|
|
//returns whether the given offset fits within the limits of the actual data
|
|
//The valid flag will be set accordingly
|
|
bool checkSize(int offset);
|
|
};
|
|
|
|
class Section : public Object {
|
|
public:
|
|
//convenience: sets data and parses if doParse
|
|
Section(const unsigned char *data, bool doCopy=true);
|
|
Section() {}
|
|
TableId getTableId() const;
|
|
virtual int getLength();
|
|
|
|
static int getLength(const unsigned char *d);
|
|
static TableId getTableId(const unsigned char *d);
|
|
};
|
|
|
|
class CRCSection : public Section {
|
|
public:
|
|
//convenience: sets data and parses if doParse
|
|
CRCSection(const unsigned char *data, bool doCopy=true) : Section(data, doCopy) {}
|
|
CRCSection() {}
|
|
bool isCRCValid();
|
|
//convenience: isValid+CheckParse
|
|
bool CheckCRCAndParse();
|
|
};
|
|
|
|
/* A section which has the ExtendedSectionHeader
|
|
(section_syntax_indicator==1) */
|
|
class NumberedSection : public CRCSection {
|
|
public:
|
|
NumberedSection(const unsigned char *data, bool doCopy=true) : CRCSection(data, doCopy) {}
|
|
NumberedSection() {}
|
|
int getTableIdExtension() const;
|
|
bool getCurrentNextIndicator() const;
|
|
int getVersionNumber() const;
|
|
int getSectionNumber() const;
|
|
int getLastSectionNumber() const;
|
|
bool moreThanOneSection() const { return getLastSectionNumber()>0; }
|
|
|
|
static int getTableIdExtension(const unsigned char *d);
|
|
};
|
|
|
|
class VariableLengthPart : public Object {
|
|
public:
|
|
//never forget to call this
|
|
void setData(CharArray d, int l) { Object::setData(d); checkSize(l); length=l; }
|
|
//convenience method
|
|
void setDataAndOffset(CharArray d, int l, int &offset) { Object::setData(d); checkSize(l); length=l; offset+=l; }
|
|
virtual int getLength() { return length; }
|
|
private:
|
|
int length;
|
|
};
|
|
|
|
class LoopElement : public Object {
|
|
};
|
|
|
|
class Descriptor : public LoopElement {
|
|
public:
|
|
virtual int getLength();
|
|
DescriptorTag getDescriptorTag() const;
|
|
|
|
static int getLength(const unsigned char *d);
|
|
static DescriptorTag getDescriptorTag(const unsigned char *d);
|
|
protected:
|
|
friend class DescriptorLoop;
|
|
//returns a subclass of descriptor according to the data given.
|
|
//The object is allocated with new and must be delete'd.
|
|
//setData() will have been called, CheckParse() not.
|
|
//if returnUnimplemetedDescriptor==true:
|
|
// Never returns null - maybe the UnimplementedDescriptor.
|
|
//if returnUnimplemetedDescriptor==false:
|
|
// Never returns the UnimplementedDescriptor - maybe null
|
|
static Descriptor *getDescriptor(CharArray d, DescriptorTagDomain domain, bool returnUnimplemetedDescriptor);
|
|
};
|
|
|
|
class Loop : public VariableLengthPart {
|
|
public:
|
|
class Iterator {
|
|
public:
|
|
Iterator() { i=0; }
|
|
void reset() { i=0; }
|
|
private:
|
|
template <class T> friend class StructureLoop;
|
|
friend class DescriptorLoop;
|
|
template <class T> friend class TypeLoop;
|
|
friend class ExtendedEventDescriptors;
|
|
int i;
|
|
};
|
|
protected:
|
|
virtual void Parse() {}
|
|
};
|
|
|
|
//contains LoopElements of one type only
|
|
template <class T> class StructureLoop : public Loop {
|
|
public:
|
|
//currently you must use a while-loop testing for hasNext()
|
|
//i must be 0 to get the first descriptor (with the first call)
|
|
bool getNext(T &obj, Iterator &it)
|
|
{
|
|
if (!isValid() || it.i >= getLength())
|
|
return false;
|
|
CharArray d=data;
|
|
d.addOffset(it.i);
|
|
T ret;
|
|
ret.setData(d);
|
|
ret.CheckParse();
|
|
if (!checkSize(ret.getLength()))
|
|
return false;
|
|
it.i+=ret.getLength();
|
|
obj=ret;
|
|
return true;
|
|
}
|
|
T* getNextAsPointer(Iterator &it)
|
|
{
|
|
if (!isValid() || it.i >= getLength())
|
|
return 0;
|
|
CharArray d=data;
|
|
d.addOffset(it.i);
|
|
T *ret=new T();
|
|
ret->setData(d);
|
|
ret->CheckParse();
|
|
if (!checkSize(ret->getLength())) {
|
|
delete ret;
|
|
return 0;
|
|
}
|
|
it.i+=ret->getLength();
|
|
return ret;
|
|
}
|
|
//bool hasNext(Iterator &it) { return getLength() > it.i; }
|
|
};
|
|
|
|
//contains descriptors of different types
|
|
class DescriptorLoop : public Loop {
|
|
public:
|
|
DescriptorLoop() { domain=SI; }
|
|
//i must be 0 to get the first descriptor (with the first call)
|
|
//All returned descriptors must be delete'd.
|
|
//returns null if no more descriptors available
|
|
Descriptor *getNext(Iterator &it);
|
|
//return the next descriptor with given tag, or 0 if not available.
|
|
//if returnUnimplemetedDescriptor==true:
|
|
// an UnimplementedDescriptor may be returned if the next matching descriptor is unimplemented,
|
|
// 0 will be returned if and only if no matching descriptor is found.
|
|
//if returnUnimplemetedDescriptor==false:
|
|
// if 0 is returned, either no descriptor with the given tag was found,
|
|
// or descriptors were found, but the descriptor type is not implemented
|
|
//In either case, a return value of 0 indicates that no further calls to this method
|
|
//with the iterator shall be made.
|
|
Descriptor *getNext(Iterator &it, DescriptorTag tag, bool returnUnimplemetedDescriptor=false);
|
|
//return the next descriptor with one of the given tags, or 0 if not available.
|
|
//if returnUnimplemetedDescriptor==true:
|
|
// returns 0 if and only if no descriptor with one of the given tags was found.
|
|
// The UnimplementedDescriptor may be returned.
|
|
//if returnUnimplemetedDescriptor==false:
|
|
// if 0 is returned, either no descriptor with one of the given tags was found,
|
|
// or descriptors were found, but none of them are implemented.
|
|
// The UnimplementedDescriptor will never be returned.
|
|
//In either case, a return value of 0 indicates that no further calls to this method
|
|
//with the iterator shall be made.
|
|
Descriptor *getNext(Iterator &it, DescriptorTag *tags, int arrayLength, bool returnUnimplemetedDescriptor=false);
|
|
//returns the number of descriptors in this loop
|
|
int getNumberOfDescriptors();
|
|
//writes the tags of the descriptors in this loop in the array,
|
|
// which must at least have the size getNumberOfDescriptors().
|
|
//The number of descriptors, i.e. getNumberOfDescriptors(), is returned.
|
|
// You can specify the array type (Descriptor tags are 8 Bit,
|
|
// you might e.g. choose a char, short, int or DescriptorTag array)
|
|
template <typename T> int getDescriptorTags(T *tags)
|
|
{
|
|
const unsigned char *p=data.getData();
|
|
const unsigned char *end=p+getLength();
|
|
int count=0;
|
|
while (p < end) {
|
|
tags[count++]=(T)Descriptor::getDescriptorTag(p);
|
|
p+=Descriptor::getLength(p);
|
|
}
|
|
return count;
|
|
}
|
|
protected:
|
|
Descriptor *createDescriptor(int &i, bool returnUnimplemetedDescriptor);
|
|
DescriptorTagDomain domain;
|
|
};
|
|
|
|
typedef uint8_t EightBit;
|
|
typedef uint16_t SixteenBit;
|
|
typedef uint32_t ThirtyTwoBit;
|
|
typedef uint64_t SixtyFourBit;
|
|
|
|
template <typename T> class TypeLoop : public Loop {
|
|
public:
|
|
int getCount() { return getLength()/sizeof(T); }
|
|
T operator[](const int index) const
|
|
{
|
|
switch (sizeof(T)) {
|
|
case 1:
|
|
return data[index];
|
|
case 2:
|
|
return data.TwoBytes(index);
|
|
case 4:
|
|
return data.FourBytes(index);
|
|
case 8:
|
|
return (SixtyFourBit(data.FourBytes(index)) << 32) | data.FourBytes(index+4);
|
|
default:
|
|
return 0; // just to avoid a compiler warning
|
|
}
|
|
return 0; // just to avoid a compiler warning
|
|
}
|
|
T getNext(Iterator &it) const
|
|
{
|
|
T ret=operator[](it.i);
|
|
it.i+=sizeof(T);
|
|
return ret;
|
|
}
|
|
bool hasNext(Iterator &it) { return isValid() && (getLength() > it.i); }
|
|
};
|
|
|
|
class MHP_DescriptorLoop : public DescriptorLoop {
|
|
public:
|
|
MHP_DescriptorLoop() { domain=MHP; }
|
|
};
|
|
|
|
//Premiere Content Information Table
|
|
class PCIT_DescriptorLoop : public DescriptorLoop {
|
|
public:
|
|
PCIT_DescriptorLoop() { domain=PCIT; }
|
|
};
|
|
|
|
//The content of the ExtendedEventDescriptor may be split over several
|
|
//descriptors if the text is longer than 256 bytes.
|
|
//The following classes provide base functionality to handle this case.
|
|
class GroupDescriptor : public Descriptor {
|
|
public:
|
|
virtual int getDescriptorNumber() = 0;
|
|
virtual int getLastDescriptorNumber() = 0;
|
|
};
|
|
|
|
class DescriptorGroup {
|
|
public:
|
|
DescriptorGroup(bool deleteOnDesctruction=true);
|
|
~DescriptorGroup();
|
|
bool Add(GroupDescriptor *d);
|
|
void Delete();
|
|
int getLength() { return length; }
|
|
GroupDescriptor **getDescriptors() { return array; }
|
|
bool isComplete(); //if all descriptors have been added
|
|
protected:
|
|
int length;
|
|
GroupDescriptor **array;
|
|
bool deleteOnDesctruction;
|
|
};
|
|
|
|
class String : public VariableLengthPart {
|
|
public:
|
|
//A note to the length: getLength() returns the length of the raw data.
|
|
//The text may be shorter. Its length can be obtained with one of the
|
|
//getText functions and strlen.
|
|
|
|
//returns text. Data is allocated with new and must be delete'd by the user.
|
|
char *getText();
|
|
//copies text into given buffer.
|
|
//a buffer of size getLength()+1 is guaranteed to be sufficiently large.
|
|
//In most descriptors the string length is an 8-bit field,
|
|
//so the maximum there is 256.
|
|
//returns the given buffer for convenience.
|
|
//The emphasis marks 0x86 and 0x87 are still available.
|
|
char *getText(char *buffer, int size);
|
|
//The same semantics as for getText(char*) apply.
|
|
//The short version of the text according to ETSI TR 101 211 (chapter 4.6)
|
|
//will be written into the shortVersion buffer (which should, therefore, have the same
|
|
//length as buffer). If no shortVersion is available, shortVersion will contain
|
|
//an empty string.
|
|
//The emphasis marks 0x86 and 0x87 are still available in buffer, but not in shortVersion.
|
|
char *getText(char *buffer, char *shortVersion, int sizeBuffer, int sizeShortVersion);
|
|
protected:
|
|
virtual void Parse() {}
|
|
void decodeText(char *buffer, int size);
|
|
void decodeText(char *buffer, char *shortVersion, int sizeBuffer, int sizeShortVersion);
|
|
};
|
|
|
|
// Set the character table to use for strings that do not begin with a character
|
|
// table indicator. Call with NULL to turn this off.
|
|
void SetOverrideCharacterTable(const char *CharacterTable);
|
|
// Call this function to set the system character table. CharacterTable is a string
|
|
// like "iso8859-15" or "utf-8" (case insensitive).
|
|
// Returns true if the character table was recognized.
|
|
bool SetSystemCharacterTable(const char *CharacterTable);
|
|
// Determines the character table used in the given buffer and returns
|
|
// a string indicating that table. If no table can be determined, the
|
|
// default ISO6937 is returned. If a table can be determined, the buffer
|
|
// and length are adjusted accordingly.
|
|
const char *getCharacterTable(const unsigned char *&buffer, int &length, bool *isSingleByte = NULL);
|
|
bool convertCharacterTable(const char *from, size_t fromLength, char *to, size_t toLength, const char *fromCode);
|
|
bool systemCharacterTableIsSingleByte(void);
|
|
|
|
} //end of namespace
|
|
|
|
#endif //LIBSI_SI_H
|