Add NIT support

Author: phpbg

README.md

@@ -8,7 +8,7 @@ It tries to comply with "Digital Video Broadcasting (DVB) - Specification for Se
 The initial goal is to provide parsing for following tables :
  * PAT: done
  * PMT: mostly
- * NIT: not yet planned
+ * NIT: mostly (missing some descriptors)
  * BAT: not yet planned
  * SDT: not yet planned
  * EIT: mostly (missing some descriptors)
@@ -22,7 +22,7 @@ The initial goal is to provide parsing for following tables :
 
 # Requirements
 
-* PHP7+
+* PHP7+ x64
 * Composer
 
 Those requirements can be installed on ubuntu 16.04:
@@ -34,6 +34,7 @@ Or on windows:
 1. http://php.net/downloads.php
 2. https://getcomposer.org/download/
 
+NB: **32bit** will partly work but **should be avoided** because some structures are unsigned 32bit and PHP will store them as signed 32bit. See: http://php.net/manual/en/function.unpack.php#refsect1-function.unpack-notes 
 
 # Installation
 

examples/print-all.php

@@ -46,9 +46,12 @@
 $dvbPsiParser->on('error', function ($e) {
     echo "PSI parser error: {$e->getMessage()}\n";
 });
-$dvbPsiParser->on('pat', function ($pat) use ($dvbPsiParser) {
+$dvbPsiParser->on('pat', function ($pat) {
     echo "PAT\r\n{$pat}\r\n";
 });
+$dvbPsiParser->on('nit', function ($nit) {
+    echo "NIT\r\n{$nit}\r\n";
+});
 $dvbPsiParser->on('tdt', function ($tdt) {
     echo "TDT: {$tdt}\n";
 });
@@ -59,8 +62,11 @@
     echo "PMT\r\n{$pmt}\n";
 });
 
-// Prepare mpegts parser
-$mpegTsParser = \PhpBg\MpegTs\ParserFactory::createForDvbPsi();
+// Create MPEG TS parser and filter all requested PIDs
+$mpegTsParser = new \PhpBg\MpegTs\Parser();
+foreach($dvbPsiParser->getRegisteredPids() as $pid) {
+    $mpegTsParser->addPidFilter(new \PhpBg\MpegTs\Pid($pid));
+}
 $mpegTsParser->on('error', function ($e) {
     echo "TS parser error: {$e->getMessage()}\n";
 });

examples/print-with-context.php

@@ -71,8 +71,11 @@
     $streamContext->addPmt($pmt);
 });
 
-// Prepare mpegts parser
-$mpegTsParser = \PhpBg\MpegTs\ParserFactory::createForDvbPsi();
+// Create MPEG TS parser and filter all requested PIDs
+$mpegTsParser = new \PhpBg\MpegTs\Parser();
+foreach($dvbPsiParser->getRegisteredPids() as $pid) {
+    $mpegTsParser->addPidFilter(new \PhpBg\MpegTs\Pid($pid));
+}
 $mpegTsParser->on('error', function ($e) {
     echo "TS parser error: {$e->getMessage()}\n";
 });

src/Descriptors/ExtendedEvent.php

@@ -42,6 +42,11 @@ class ExtendedEvent
     public $items = [];
     public $text;
 
+    /**
+     * ExtendedEvent constructor.
+     * @param $data
+     * @throws \PhpBg\DvbPsi\Exception
+     */
     public function __construct($data)
     {
         $pointer = 0;

src/Descriptors/Identifier.php

@@ -34,12 +34,15 @@
  */
 class Identifier extends Enum
 {
+    const NETWORK_NAME_DESCRIPTOR = 0x40;
+    const SERVICE_LIST_DESCRIPTOR = 0x41;
     const STUFFING_DESCRIPTOR = 0x42;
     const LINKAGE_DESCRIPTOR = 0x4a;
     const SHORT_EVENT_DESCRIPTOR = 0x4d;
     const EXTENDED_EVENT_DESCRIPTOR = 0x4e;
     const TIME_SHIFTED_EVENT_DESCRIPTOR = 0x4f;
     const COMPONENT_DESCRIPTOR = 0x50;
+    const TERRESTRIAL_DELIVERY_SYSTEM_DESCRIPTOR = 0x5a;
     const CA_IDENTIFIER_DESCRIPTOR = 0x53;
     const CONTENT_DESCRIPTOR = 0x54;
     const PARENTAL_RATING_DESCRIPTOR = 0x55;

src/Descriptors/NetworkName.php

@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * MIT License
+ *
+ * Copyright (c) 2018 Samuel CHEMLA
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+namespace PhpBg\DvbPsi\Descriptors;
+
+use PhpBg\DvbPsi\TableParsers\Text;
+
+/**
+ * Class NetworkName
+ * @see Final draft ETSI EN 300 468 V1.15.1 (2016-03), 6.2.27 Network name descriptor
+ */
+class NetworkName
+{
+    use Text;
+
+    /**
+     * A string of char fields specify the name of the delivery system about which the NIT informs
+     * @var string
+     */
+    public $networkName;
+
+    /**
+     * NetworkName constructor.
+     * @param $data
+     * @throws \PhpBg\DvbPsi\Exception
+     */
+    public function __construct($data)
+    {
+        $this->networkName = $this->toUtf8String($data);
+    }
+
+    public function __toString()
+    {
+        return "Network name: $this->networkName";
+    }
+}

src/Descriptors/PrivateDataSpecifier.php

@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * MIT License
+ *
+ * Copyright (c) 2018 Samuel CHEMLA
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+namespace PhpBg\DvbPsi\Descriptors;
+
+/**
+ * Class PrivateDataSpecifier
+ * @see Final draft ETSI EN 300 468 V1.15.1 (2016-03), 6.2.31 Private data specifier descriptor
+ */
+class PrivateDataSpecifier
+{
+    /**
+     * Value of the private data specifier
+     * Name of the organisation which is responsible for delivering private data in SI streams, e.g “ACME, Inc.”
+     * @see https://www.dvbservices.com/identifiers/private_data_spec_id
+     * @var int
+     */
+    public $private_data_specifier;
+
+    public function __construct($data)
+    {
+        $this->private_data_specifier = unpack('N', $data)[1];
+    }
+
+    public function __toString()
+    {
+        return sprintf("PrivateDataSpecifier: 0x%x\n", $this->private_data_specifier);
+    }
+}

src/Descriptors/ServiceList.php

@@ -0,0 +1,68 @@
+<?php
+
+/**
+ * MIT License
+ *
+ * Copyright (c) 2018 Samuel CHEMLA
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+namespace PhpBg\DvbPsi\Descriptors;
+
+use PhpBg\DvbPsi\Descriptors\Values\ServiceType;
+
+/**
+ * Class ServiceList
+ * @see Final draft ETSI EN 300 468 V1.15.1 (2016-03), 6.2.35 Service list descriptor
+ */
+class ServiceList
+{
+    /**
+     * @var array <service id> => <service type>
+     */
+    public $services;
+
+    /**
+     * ServiceList constructor.
+     * @param $data
+     * @throws \PhpBg\DvbPsi\Exception
+     */
+    public function __construct($data)
+    {
+        $pointer = 0;
+        $len = strlen($data);
+        while ($pointer < $len) {
+            $serviceId = unpack('n', substr($data, $pointer, 2))[1];
+            $pointer += 2;
+            $serviceType = unpack('C', $data[$pointer])[1];
+            $pointer += 1;
+            $this->services[$serviceId] = new ServiceType($serviceType);
+        }
+    }
+
+    public function __toString()
+    {
+        $msg = "Services:\n";
+        foreach ($this->services as $serviceId => $serviceType) {
+            $msg .= sprintf("Service ID: %d (0x%x) => %s\n", $serviceId, $serviceId, $serviceType->getKey());
+        }
+        return $msg;
+    }
+}

src/Descriptors/ShortEvent.php

@@ -40,6 +40,11 @@ class ShortEvent
     public $eventName;
     public $text;
 
+    /**
+     * ShortEvent constructor.
+     * @param $data
+     * @throws \PhpBg\DvbPsi\Exception
+     */
     public function __construct($data)
     {
         $pointer = 0;