summaryrefslogtreecommitdiff
path: root/libsi/descriptor.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <kls (at) cadsoft (dot) de>2012-01-15 16:10:00 +0100
committerDieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>2012-01-15 16:38:48 +0100
commit59f0138a7d03fed4fc33e1083928bf5b28e0e4ff (patch)
tree5d238aabf1b703dff01c9f381a7e552ed6bdf092 /libsi/descriptor.c
parent5a28d999363f8ace192489d4f6b13dfeb6cfc20b (diff)
downloadvdr-patches-59f0138a7d03fed4fc33e1083928bf5b28e0e4ff.tar.gz
vdr-patches-59f0138a7d03fed4fc33e1083928bf5b28e0e4ff.tar.bz2
Version 1.7.23
Original announce message: VDR developer version 1.7.23 is now available at ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.23.tar.bz2 A 'diff' against the previous version is available at ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.22-1.7.23.diff MD5 checksums: de136f7be28c4b6f1fa0e2218b4acc11 vdr-1.7.23.tar.bz2 2977b75cd8dacad187d11c10b867d56a vdr-1.7.22-1.7.23.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. From the HISTORY file: - Removed the '.pl' suffix from svdrpsend.pl (sorry, I missed that one). - Fixed bonding more than two devices. - Fixed handling symbolic links in cRecordings::ScanVideoDir() (reported by Sundararaj Reel). - Fixed a memory leak in cRecordings::ScanVideoDir() in case there are too many link levels (reported by Sundararaj Reel). - Removed redundant memset() in the ctor of cSatCableNumbers (triggered by Ville Skyttä pointing out that the argument sequence in the call was wrong). - Removed a redundant NULL check in cDvbSpuDecoder::setTime() (thanks to Ville Skyttä). - Added HasSnr to the DEBUG_SIGNALQUALITY output in cDvbTuner::GetSignalQuality() (triggered by Ville Skyttä pointing out that the variable HasSnr was unused). - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg). - Added support for HbbTV to libsi (thanks to Christoph Haubrich). - Added support for devices with more than one delivery system per frontend. This requires a DVB driver with version 5.5 or higher that can handle the DTV_ENUM_DELSYS call. With older drivers it will fall back to one delivery system per frontend. - Updated the Hungarian language texts (thanks to István Füley). - cDvbTuner::ExecuteDiseqc() now makes sure only one tuner sends SCR commands at any given time (reported by Frank Neumann). - cEvent::FixEpgBugs() now replaces any newline characters in stream component descriptions with blanks (thanks to Torsten Lang for reporting a problem with EPG data from BSkyB's "MTV MUSIC", S28.2E-2-2010-7012). - Fixed cDvbSubtitleConverter::SetOsdData() (thanks to Rolf Ahrenberg). - Fixed cListBase::Move() in case From and To are equal (reported by Sundararaj Reel). - Added support for DVB-T2 to libsi (thanks to Rolf Ahrenberg). - Added support for handling DVB-T2 transponders. This requires a DVB driver with version 5.3 or higher that can handle the DTV_DVBT2_PLP_ID call (thanks to Rolf Ahrenberg). - Fixed cConfig::Load() for g++ version 4.7.0 (thanks to Ville Skyttä). - Fixed a possible memory corruption in cTsToPes::GetPes() in case of broken TS packets, e.g. when switching channels. - Fixed the SVDRP command CLRE for a single channel in case there are events that have a timer (thanks to Timo Eskola). - BIDI support now checks at runtime whether the system runs with UTF-8 (suggested by Torsten Lang). - Added member functions Adapter() and Frontend() to cDvbDevice (suggested by Rolf Ahrenberg). - The parameters that are only used by "second generation" delivery systems (DVB-S2 and DVB-T2) are no longer written into channels.conf for "first generation" delivery systems (DVB-S and DVB-T). - Changed IndexToHMSF() so that it can handle negative Index values. - Added option -N to the msgmerge call in the Makefile, because fuzzy translation mostly resulted in useless strings. - The new setup option "Replay/Show remaining time" can be used to switch between showing the total length or the remaining time of the recording that is currently replayed. - Fixed wrongfully displaying the length of a recording in the title of the replay progress display. - Fixed frozen live view with device bonding in case the bonded master is used for live viewing (reported by Uwe Scheffler).
Diffstat (limited to 'libsi/descriptor.c')
-rw-r--r--libsi/descriptor.c83
1 files changed, 79 insertions, 4 deletions
diff --git a/libsi/descriptor.c b/libsi/descriptor.c
index 06a58c0..07429b5 100644
--- a/libsi/descriptor.c
+++ b/libsi/descriptor.c
@@ -6,7 +6,7 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
- * $Id: descriptor.c 2.2 2011/06/15 21:26:00 kls Exp $
+ * $Id: descriptor.c 2.4 2012/01/11 11:35:17 kls Exp $
* *
***************************************************************************/
@@ -876,6 +876,52 @@ int ExtensionDescriptor::getExtensionDescriptorTag() const {
return s->descriptor_tag_extension;
}
+void T2DeliverySystemDescriptor::Parse() {
+ int offset=0;
+ data.setPointerAndOffset<const descr_t2_delivery_system>(s, offset);
+ extended_data_flag = s->descriptor_length > 0x04;
+}
+
+int T2DeliverySystemDescriptor::getExtendedDataFlag() const {
+ return extended_data_flag;
+}
+
+int T2DeliverySystemDescriptor::getExtensionDescriptorTag() const {
+ return s->descriptor_tag_extension;
+}
+
+int T2DeliverySystemDescriptor::getPlpId() const {
+ return s->plp_id;
+}
+
+int T2DeliverySystemDescriptor::getT2SystemId() const {
+ return HILO(s->t2_system_id);
+}
+
+int T2DeliverySystemDescriptor::getSisoMiso() const {
+ return extended_data_flag ? s->siso_miso : -1;
+}
+
+int T2DeliverySystemDescriptor::getBandwidth() const {
+ return extended_data_flag ? s->bandwidth : -1;
+}
+
+int T2DeliverySystemDescriptor::getGuardInterval() const {
+ return extended_data_flag ? s->guard_interval : -1;
+}
+
+int T2DeliverySystemDescriptor::getTransmissionMode() const {
+ return extended_data_flag ? s->transmission_mode : -1;
+}
+
+int T2DeliverySystemDescriptor::getOtherFrequencyFlag() const {
+ return extended_data_flag ? s->other_frequency_flag : -1;
+}
+
+int T2DeliverySystemDescriptor::getTfsFlag() const {
+ return extended_data_flag ? s->tfs_flag : -1;
+}
+
int PremiereContentTransmissionDescriptor::getOriginalNetworkId() const {
return HILO(s->original_network_id);
}
@@ -1005,8 +1051,14 @@ int MHP_TransportProtocolDescriptor::getComponentTag() const {
return componentTag;
}
+char *MHP_TransportProtocolDescriptor::getUrlBase(char *buffer, int size) {
+ return UrlBase.getText(buffer, size);
+}
+
void MHP_TransportProtocolDescriptor::Parse() {
int offset=0;
+ remote=false;
+ componentTag=-1;
data.setPointerAndOffset<const descr_transport_protocol>(s, offset);
if (getProtocolId() == ObjectCarousel) {
const transport_via_oc *oc;
@@ -1021,12 +1073,24 @@ void MHP_TransportProtocolDescriptor::Parse() {
data.setPointerAndOffset<const transport_via_oc_end>(rem, offset);
componentTag=rem->component_tag;
}
- } else { //unimplemented
- remote=false;
- componentTag=-1;
+ } else if (getProtocolId() == HTTPoverInteractionChannel) {
+ const transport_via_http *http;
+ data.setPointerAndOffset<const transport_via_http>(http, offset);
+ UrlBase.setDataAndOffset(data+offset, http->url_base_length, offset);
+
+ // fill URL Extension,
+ UrlExtensionLoop.setData(data+offset, getLength()-offset);
+ } else {
+ //unimplemented
}
}
+void MHP_TransportProtocolDescriptor::UrlExtensionEntry::Parse() {
+ const descr_url_extension_entry *s;
+ s=data.getData<const descr_url_extension_entry>();
+ UrlExtension.setData(data, s->url_extension_length);
+}
+
void MHP_DVBJApplicationDescriptor::Parse() {
applicationLoop.setData(data+sizeof(descr_dvbj_application), getLength()-sizeof(descr_dvbj_application));
}
@@ -1059,6 +1123,17 @@ void MHP_ApplicationIconsDescriptor::Parse() {
data.setPointerAndOffset<const descr_application_icons_descriptor_end>(s, offset);
}
+char *MHP_SimpleApplicationLocationDescriptor::getLocation(char *buffer, int size) {
+ return location.getText(buffer, size);
+}
+
+void MHP_SimpleApplicationLocationDescriptor::Parse() {
+ int offset=0;
+ const descr_simple_application_location_descriptor *loc;
+ data.setPointerAndOffset<const descr_simple_application_location_descriptor>(loc, offset);
+ location.setDataAndOffset(data+offset, loc->descriptor_length, offset);
+}
+
int RegistrationDescriptor::getFormatIdentifier() const {
return HILOHILO(s->format_identifier);
}