diff options
Diffstat (limited to 'libsi')
| -rw-r--r-- | libsi/descriptor.c | 83 | ||||
| -rw-r--r-- | libsi/descriptor.h | 42 | ||||
| -rw-r--r-- | libsi/headers.h | 54 | ||||
| -rw-r--r-- | libsi/si.c | 5 | ||||
| -rw-r--r-- | libsi/si.h | 17 |
5 files changed, 193 insertions, 8 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); } diff --git a/libsi/descriptor.h b/libsi/descriptor.h index f105f7a..3025876 100644 --- a/libsi/descriptor.h +++ b/libsi/descriptor.h @@ -6,7 +6,7 @@ * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * - * $Id: descriptor.h 2.2 2011/06/15 21:26:00 kls Exp $ + * $Id: descriptor.h 2.4 2012/01/11 11:35:17 kls Exp $ * * ***************************************************************************/ @@ -538,6 +538,25 @@ private: const descr_extension *s; }; +class T2DeliverySystemDescriptor : public Descriptor { +public: + int getExtendedDataFlag() const; + int getExtensionDescriptorTag() const; + int getPlpId() const; + int getT2SystemId() const; + int getSisoMiso() const; + int getBandwidth() const; + int getGuardInterval() const; + int getTransmissionMode() const; + int getOtherFrequencyFlag() const; + int getTfsFlag() const; +protected: + virtual void Parse(); +private: + const descr_t2_delivery_system *s; + int extended_data_flag; +}; + // Private DVB Descriptor Premiere.de // 0xF2 Content Transmission Descriptor // http://dvbsnoop.sourceforge.net/examples/example-private-section.html @@ -639,17 +658,29 @@ protected: class MHP_TransportProtocolDescriptor : public Descriptor { public: + class UrlExtensionEntry : public LoopElement { + public: + virtual int getLength() { return sizeof(descr_url_extension_entry)+UrlExtension.getLength(); } + String UrlExtension; + protected: + virtual void Parse(); + }; + enum Protocol { ObjectCarousel = 0x01, IPviaDVB = 0x02, HTTPoverInteractionChannel = 0x03 }; int getProtocolId() const; int getProtocolLabel() const; bool isRemote() const; int getComponentTag() const; + char *getUrlBase(char *buffer, int size); + StructureLoop<UrlExtensionEntry> UrlExtensionLoop; + protected: virtual void Parse(); private: const descr_transport_protocol *s; bool remote; int componentTag; + String UrlBase; }; class MHP_DVBJApplicationDescriptor : public Descriptor { @@ -685,6 +716,15 @@ private: const descr_application_icons_descriptor_end *s; }; +class MHP_SimpleApplicationLocationDescriptor : public Descriptor { +public: + char *getLocation(char *buffer, int size); +protected: + virtual void Parse(); +private: + String location; +}; + class RegistrationDescriptor : public Descriptor { public: int getFormatIdentifier() const; diff --git a/libsi/headers.h b/libsi/headers.h index 6867d2c..daea50e 100644 --- a/libsi/headers.h +++ b/libsi/headers.h @@ -10,7 +10,7 @@ * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * - * $Id: headers.h 2.2 2011/06/15 21:26:00 kls Exp $ + * $Id: headers.h 2.4 2012/01/11 11:35:17 kls Exp $ * * ***************************************************************************/ @@ -1839,6 +1839,37 @@ struct descr_extension { u_char descriptor_tag_extension :8; }; +/* extension 0x04 t2_delivery_system_descriptor */ + +struct descr_t2_delivery_system { + u_char descriptor_tag :8; + u_char descriptor_length :8; + u_char descriptor_tag_extension :8; + u_char plp_id :8; + u_char t2_system_id_hi :8; + u_char t2_system_id_lo :8; +#if BYTE_ORDER == BIG_ENDIAN + u_char siso_miso :2; + u_char bandwidth :4; + u_char reserved :2; + u_char guard_interval :3; + u_char transmission_mode :3; + u_char other_frequency_flag :1; + u_char tfs_flag :1; +#else + u_char reserved :2; + u_char bandwidth :4; + u_char siso_miso :2; + u_char tfs_flag :1; + u_char other_frequency_flag :1; + u_char transmission_mode :3; + u_char guard_interval :3; +#endif +/* now follow cell_id, frequency_loop_length, centre_frequency, + subcell_info_loop_length, cell_id_extension, transposer_frequency + fields looping to the end */ +}; + /* MHP 0x00 application_descriptor */ #define DESCR_APPLICATION_LEN 3 @@ -1907,6 +1938,11 @@ struct descr_transport_protocol { /* protocol_id-specific selector bytes follow */ }; +struct descr_url_extension_entry { + u_char url_extension_length :8; + /* URL extension string */ +}; + #define TRANSPORT_VIA_OC_LEN 1 struct transport_via_oc { @@ -1940,6 +1976,12 @@ struct transport_via_oc_end { u_char component_tag :8; }; +#define TRANSPORT_VIA_HTTP_LEN 1 + +struct transport_via_http { + u_char url_base_length :8; +}; + /* 0x03 dvb_j_application_descriptor() */ #define DESCR_DVBJ_APPLICATION_LEN 2 @@ -1991,6 +2033,16 @@ struct descr_application_icons_descriptor_end { u_char icon_flags_lo :8; }; +/* 0x15 simple application location descrptor */ + +#define DESCR_SIMPLE_APPLICATION_LOCATION_LEN 3 + +struct descr_simple_application_location_descriptor { + u_char descriptor_tag :8; + u_char descriptor_length :8; + /* inital_path_bytes */ +}; + // Private DVB Descriptor Premiere.de // 0xF2 Content Transmission Descriptor // http://dvbsnoop.sourceforge.net/examples/example-private-section.html @@ -6,7 +6,7 @@ * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * - * $Id: si.c 2.5 2011/12/04 15:06:18 kls Exp $ + * $Id: si.c 2.6 2011/12/10 15:47:15 kls Exp $ * * ***************************************************************************/ @@ -690,6 +690,9 @@ Descriptor *Descriptor::getDescriptor(CharArray da, DescriptorTagDomain domain, case MHP_DVBJApplicationLocationDescriptorTag: d=new MHP_DVBJApplicationLocationDescriptor(); break; + case MHP_SimpleApplicationLocationDescriptorTag: + d=new MHP_SimpleApplicationLocationDescriptor(); + break; // 0x05 - 0x0A is unimplemented this library case MHP_ExternalApplicationAuthorisationDescriptorTag: case MHP_IPv4RoutingDescriptorTag: @@ -6,7 +6,7 @@ * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * - * $Id: si.h 2.3 2010/02/13 10:31:34 kls Exp $ + * $Id: si.h 2.5 2012/01/11 11:35:17 kls Exp $ * * ***************************************************************************/ @@ -134,6 +134,19 @@ enum DescriptorTag { DTSDescriptorTag = 0x7B, AACDescriptorTag = 0x7C, ExtensionDescriptorTag = 0x7F, + // 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 TS 102 812 (MHP) // They once again start with 0x00 (see page 234, MHP specification) @@ -153,6 +166,8 @@ enum DescriptorTag { MHP_PrefetchDescriptorTag = 0x0C, MHP_DelegatedApplicationDescriptorTag = 0x0E, MHP_ApplicationStorageDescriptorTag = 0x10, + MHP_SimpleApplicationLocationDescriptorTag = 0x15, + MHP_SimpleApplicationBoundaryDescriptorTag = 0x17, // Premiere private Descriptor Tags PremiereContentTransmissionDescriptorTag = 0xF2, |