aboutsummaryrefslogtreecommitdiffstats
path: root/util/scan/atsc
diff options
context:
space:
mode:
authorMark Purcell <msp@debian.org>2008-06-22 11:00:40 +1000
committeretobi <git@e-tobi.net>2013-09-03 09:48:42 +0200
commit891c51ff368ed700dec6025eeb47ce4d96f76418 (patch)
tree3729664829e4faa691d403274f38eb10890b533c /util/scan/atsc
parent1c6e1f28f54ec2606c23936c1d8689f2be55a86c (diff)
parentab959d7b4194715870128e616b8e29d4a101e488 (diff)
downloadlinux-dvb-apps-debian/1.1.1+rev1207-1.tar.gz
Imported Debian patch 1.1.1+rev1207-1debian/1.1.1+rev1207-1
Diffstat (limited to '')
-rw-r--r--util/scan/atsc/us-ATSC-center-frequencies-8VSB1
-rw-r--r--util/scan/atsc/us-NTSC-center-frequencies-8VSB1
-rw-r--r--util/scan/atsc/us-NY-TWC-NYC106
-rw-r--r--util/scan/atsc_psip_section.c62
-rw-r--r--util/scan/atsc_psip_section.h60
-rw-r--r--util/scan/atsc_psip_section.pl76
6 files changed, 129 insertions, 177 deletions
diff --git a/util/scan/atsc/us-ATSC-center-frequencies-8VSB b/util/scan/atsc/us-ATSC-center-frequencies-8VSB
index ffd0b02..2e39de1 100644
--- a/util/scan/atsc/us-ATSC-center-frequencies-8VSB
+++ b/util/scan/atsc/us-ATSC-center-frequencies-8VSB
@@ -68,4 +68,3 @@ A 785028615 8VSB
A 791028615 8VSB
A 797028615 8VSB
A 803028615 8VSB
-
diff --git a/util/scan/atsc/us-NTSC-center-frequencies-8VSB b/util/scan/atsc/us-NTSC-center-frequencies-8VSB
index d21f9ae..6eb586c 100644
--- a/util/scan/atsc/us-NTSC-center-frequencies-8VSB
+++ b/util/scan/atsc/us-NTSC-center-frequencies-8VSB
@@ -68,4 +68,3 @@ A 785000000 8VSB
A 791000000 8VSB
A 797000000 8VSB
A 803000000 8VSB
-
diff --git a/util/scan/atsc/us-NY-TWC-NYC b/util/scan/atsc/us-NY-TWC-NYC
index 0ad6e48..932b377 100644
--- a/util/scan/atsc/us-NY-TWC-NYC
+++ b/util/scan/atsc/us-NY-TWC-NYC
@@ -1,53 +1,53 @@
-#initial tuning data for Time Warner Cable in New York City
-
-#80
-A 561000000 QAM256
-A 567000000 QAM256
-A 573000000 QAM256
-A 579000000 QAM256
-A 585000000 QAM256
-A 591000000 QAM256
-A 597000000 QAM256
-A 603000000 QAM256
-A 609000000 QAM256
-A 615000000 QAM256
-#90
-A 621000000 QAM256
-A 627000000 QAM256
-A 633000000 QAM256
-A 639000000 QAM256
-A 645000000 QAM256
-A 93000000 QAM256
-A 99000000 QAM256
-A 105000000 QAM256
-A 111025000 QAM256
-A 117025000 QAM256
-#100
-A 651000000 QAM256
-A 657000000 QAM256
-A 663000000 QAM256
-A 669000000 QAM256
-A 675000000 QAM256
-A 681000000 QAM256
-A 687000000 QAM256
-A 693000000 QAM256
-A 699000000 QAM256
-A 705000000 QAM256
-#110
-A 711000000 QAM256
-A 717000000 QAM256
-A 723000000 QAM256
-A 729000000 QAM256
-A 735000000 QAM256
-A 741000000 QAM256
-A 747000000 QAM256
-A 753000000 QAM256
-A 759000000 QAM256
-A 765000000 QAM256
-#120
-A 771000000 QAM256
-A 777000000 QAM256
-A 783000000 QAM256
-A 789000000 QAM256
-A 795000000 QAM256
-A 801000000 QAM256
+#initial tuning data for Time Warner Cable in New York City
+
+#80
+A 561000000 QAM256
+A 567000000 QAM256
+A 573000000 QAM256
+A 579000000 QAM256
+A 585000000 QAM256
+A 591000000 QAM256
+A 597000000 QAM256
+A 603000000 QAM256
+A 609000000 QAM256
+A 615000000 QAM256
+#90
+A 621000000 QAM256
+A 627000000 QAM256
+A 633000000 QAM256
+A 639000000 QAM256
+A 645000000 QAM256
+A 93000000 QAM256
+A 99000000 QAM256
+A 105000000 QAM256
+A 111025000 QAM256
+A 117025000 QAM256
+#100
+A 651000000 QAM256
+A 657000000 QAM256
+A 663000000 QAM256
+A 669000000 QAM256
+A 675000000 QAM256
+A 681000000 QAM256
+A 687000000 QAM256
+A 693000000 QAM256
+A 699000000 QAM256
+A 705000000 QAM256
+#110
+A 711000000 QAM256
+A 717000000 QAM256
+A 723000000 QAM256
+A 729000000 QAM256
+A 735000000 QAM256
+A 741000000 QAM256
+A 747000000 QAM256
+A 753000000 QAM256
+A 759000000 QAM256
+A 765000000 QAM256
+#120
+A 771000000 QAM256
+A 777000000 QAM256
+A 783000000 QAM256
+A 789000000 QAM256
+A 795000000 QAM256
+A 801000000 QAM256
diff --git a/util/scan/atsc_psip_section.c b/util/scan/atsc_psip_section.c
deleted file mode 100644
index 0c50014..0000000
--- a/util/scan/atsc_psip_section.c
+++ /dev/null
@@ -1,62 +0,0 @@
-#include "atsc_psip_section.h"
-
-struct ATSC_extended_channel_name_descriptor read_ATSC_extended_channel_name_descriptor(const u8 *b)
-{
- struct ATSC_extended_channel_name_descriptor v;
- v.descriptor_tag = getBits(b, 0, 8);
- v.descriptor_length = getBits(b, 8, 8);
- v.TODO = getBits(b, 16, 1);
- return v;
-}
-
-struct ATSC_service_location_descriptor read_ATSC_service_location_descriptor(const u8 *b)
-{
- struct ATSC_service_location_descriptor v;
- v.descriptor_tag = getBits(b, 0, 8);
- v.descriptor_length = getBits(b, 8, 8);
- v.reserved = getBits(b, 16, 3);
- v.PCR_PID = getBits(b, 19,13);
- v.number_elements = getBits(b, 32, 8);
- return v;
-}
-
-struct ATSC_service_location_element read_ATSC_service_location_element(const u8 *b)
-{
- struct ATSC_service_location_element v;
- v.stream_type = getBits(b, 0, 8);
- v.reserved = getBits(b, 8, 3);
- v.elementary_PID = getBits(b, 11,13);
- v.ISO_639_language_code = getBits(b, 24,24);
- return v;
-}
-
-struct tvct_channel read_tvct_channel(const u8 *b)
-{
- struct tvct_channel v;
- v.short_name0 = getBits(b, 0,16);
- v.short_name1 = getBits(b, 16,16);
- v.short_name2 = getBits(b, 32,16);
- v.short_name3 = getBits(b, 48,16);
- v.short_name4 = getBits(b, 64,16);
- v.short_name5 = getBits(b, 80,16);
- v.short_name6 = getBits(b, 96,16);
- v.reserved0 = getBits(b,112, 4);
- v.major_channel_number = getBits(b,116,10);
- v.minor_channel_number = getBits(b,126,10);
- v.modulation_mode = getBits(b,136, 8);
- v.carrier_frequency = getBits(b,144,32);
- v.channel_TSID = getBits(b,176,16);
- v.program_number = getBits(b,192,16);
- v.ETM_location = getBits(b,208, 2);
- v.access_controlled = getBits(b,210, 1);
- v.hidden = getBits(b,211, 1);
- v.reserved1 = getBits(b,212, 2);
- v.hide_guide = getBits(b,214, 1);
- v.reserved2 = getBits(b,215, 3);
- v.service_type = getBits(b,218, 6);
- v.source_id = getBits(b,224,16);
- v.reserved3 = getBits(b,240, 6);
- v.descriptors_length = getBits(b,246,10);
- return v;
-}
-
diff --git a/util/scan/atsc_psip_section.h b/util/scan/atsc_psip_section.h
deleted file mode 100644
index c76bce7..0000000
--- a/util/scan/atsc_psip_section.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#ifndef __ATSC_PSIP_SECTION_H_
-#define __ATSC_PSIP_SECTION_H_
-
-#include "section.h"
-
-#define ATSC_EXTENDED_CHANNEL_NAME_DESCRIPTOR_ID 0xA0
-struct ATSC_extended_channel_name_descriptor {
- u8 descriptor_tag : 8;
- u8 descriptor_length : 8;
- u8 TODO : 1;
-} PACKED;
-struct ATSC_extended_channel_name_descriptor read_ATSC_extended_channel_name_descriptor(const u8 *);
-
-#define ATSC_SERVICE_LOCATION_DESCRIPTOR_ID 0xA1
-struct ATSC_service_location_descriptor {
- u8 descriptor_tag : 8;
- u8 descriptor_length : 8;
- u8 reserved : 3;
- u16 PCR_PID :13;
- u8 number_elements : 8;
-} PACKED;
-struct ATSC_service_location_descriptor read_ATSC_service_location_descriptor(const u8 *);
-
-struct ATSC_service_location_element {
- u8 stream_type : 8;
- u8 reserved : 3;
- u16 elementary_PID :13;
- u32 ISO_639_language_code :24;
-} PACKED;
-struct ATSC_service_location_element read_ATSC_service_location_element(const u8 *);
-
-struct tvct_channel {
- u16 short_name0 :16;
- u16 short_name1 :16;
- u16 short_name2 :16;
- u16 short_name3 :16;
- u16 short_name4 :16;
- u16 short_name5 :16;
- u16 short_name6 :16;
- u8 reserved0 : 4;
- u16 major_channel_number :10;
- u16 minor_channel_number :10;
- u8 modulation_mode : 8;
- u32 carrier_frequency :32;
- u16 channel_TSID :16;
- u16 program_number :16;
- u8 ETM_location : 2;
- u8 access_controlled : 1;
- u8 hidden : 1;
- u8 reserved1 : 2;
- u8 hide_guide : 1;
- u8 reserved2 : 3;
- u8 service_type : 6;
- u16 source_id :16;
- u8 reserved3 : 6;
- u16 descriptors_length :10;
-} PACKED;
-struct tvct_channel read_tvct_channel(const u8 *);
-
-#endif
diff --git a/util/scan/atsc_psip_section.pl b/util/scan/atsc_psip_section.pl
new file mode 100644
index 0000000..50548c6
--- /dev/null
+++ b/util/scan/atsc_psip_section.pl
@@ -0,0 +1,76 @@
+use strict;
+
+return {
+#{ 0x80, 0x80, "ATSC stuffing descriptor" },
+#{ 0x81, 0x81, "ATSC AC-3 audio descriptor" },
+#{ 0x82, 0x85, "ATSC TODO" },
+#{ 0x86, 0x86, "ATSC caption service descriptor" },
+#{ 0x87, 0x87, "ATSC content advisory descriptor" },
+#{ 0x88, 0x8F, "ATSC TODO" },
+#{ 0xA0, 0xA0, "ATSC extended channel name descriptor" },
+#{ 0xA1, 0xA1, "ATSC service location descriptor" },
+#{ 0xA2, 0xA2, "ATSC time-shifted service descriptor" },
+#{ 0xA3, 0xA3, "ATSC component name descriptor" },
+#{ 0xA4, 0xA7, "ATSC TODO" },
+#{ 0xA8, 0xA8, "ATSC DCC departing request descriptor" },
+#{ 0xA9, 0xA9, "ATSC DCC arriving request descriptor" },
+#{ 0xAA, 0xAA, "ATSC redistribution control descriptor" },
+ descriptors => [
+ { id => 0xa0,
+ name => "ATSC_extended_channel_name_descriptor",
+ elements => [
+ descriptor_tag => 8,
+ descriptor_length => 8,
+ TODO => 1,
+ ],
+ },
+ { id => 0xa1,
+ name => "ATSC_service_location_descriptor",
+ elements => [
+ descriptor_tag => 8,
+ descriptor_length => 8,
+ reserved => 3,
+ PCR_PID => 13,
+ number_elements => 8,
+ ],
+ }
+ ],
+ misc => [
+ { name => "ATSC_service_location_element",
+ elements => [
+ stream_type => 8,
+ reserved => 3,
+ elementary_PID => 13,
+ ISO_639_language_code => 24,
+ ],
+ },
+ { name => "tvct_channel",
+ elements => [
+ short_name0 => 16,
+ short_name1 => 16,
+ short_name2 => 16,
+ short_name3 => 16,
+ short_name4 => 16,
+ short_name5 => 16,
+ short_name6 => 16,
+ reserved0 => 4,
+ major_channel_number => 10,
+ minor_channel_number => 10,
+ modulation_mode => 8,
+ carrier_frequency => 32,
+ channel_TSID => 16,
+ program_number => 16,
+ ETM_location => 2,
+ access_controlled => 1,
+ hidden => 1,
+ reserved1 => 2,
+ hide_guide => 1,
+ reserved2 => 3,
+ service_type => 6,
+ source_id => 16,
+ reserved3 => 6,
+ descriptors_length => 10,
+ ],
+ },
+ ]
+};