[SCM] w-scan packaging repository branch, upstream, updated. upstream/20111011
etobi
git at e-tobi.net
Sat Oct 29 11:51:36 UTC 2011
The following commit has been merged in the upstream branch:
commit b298d80c713ddbbf3329a9b0d1c58f27d7d0fa11
Author: etobi <git at e-tobi.net>
Date: Sat Oct 29 13:29:41 2011 +0200
Imported Upstream version 20111011
diff --git a/ChangeLog b/ChangeLog
index 7ce31a8..8b485cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,23 @@
ChangeLog:
--------------------
+
+2011-10-11
+ - add S152E0, S156E0, S166E0, update S160E0, thanks to ozvdr (Hans)
+ - no longer skip over the following audio formats in case of VDR output (now supported by vdr)
+ - 13818-7 audio w. ADTS transp syntax
+ - 14496-3 audio w. LATM transp syntax
+ - change xine output:
+ old: output standard audio only.
+ new: output AC3 audio. If not found, fall back to standard audio
+ - change mplayer output:
+ old: output '+' separated list of standard audio pids.
+ new: output '+' separated list of ac3 audio pids, followed by standard audio pids.
+ - change vlc xspf output:
+ - apply stray newlines patch for vlc dvb-s format,
+ as reported by Juergen Lock (cosmetics)
+ - convert to UTF-8 using glibc
+ - remove unneeded duplicated char recoding
+
2011-07-02
- add requested format 'Gstreamer Plugin dvbsrc'
- fix counting services
diff --git a/config.h b/config.h
index 0703c40..0031270 100644
--- a/config.h
+++ b/config.h
@@ -60,13 +60,13 @@
#define PACKAGE_NAME "w_scan"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "w_scan 20110702"
+#define PACKAGE_STRING "w_scan 20111011"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "w_scan"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "20110702"
+#define PACKAGE_VERSION "20111011"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
@@ -94,7 +94,7 @@
/* Version number of package */
-#define VERSION "20110702"
+#define VERSION "20111011"
/* Define to 1 if on MINIX. */
/* #undef _MINIX */
diff --git a/configure b/configure
index 93d5a5b..039aa5f 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for w_scan 20110702.
+# Generated by GNU Autoconf 2.63 for w_scan 20111011.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -594,8 +594,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='w_scan'
PACKAGE_TARNAME='w_scan'
-PACKAGE_VERSION='20110702'
-PACKAGE_STRING='w_scan 20110702'
+PACKAGE_VERSION='20111011'
+PACKAGE_STRING='w_scan 20111011'
PACKAGE_BUGREPORT=''
ac_unique_file="scan.c"
@@ -1283,7 +1283,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures w_scan 20110702 to adapt to many kinds of systems.
+\`configure' configures w_scan 20111011 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1349,7 +1349,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of w_scan 20110702:";;
+ short | recursive ) echo "Configuration of w_scan 20111011:";;
esac
cat <<\_ACEOF
@@ -1435,7 +1435,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-w_scan configure 20110702
+w_scan configure 20111011
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1449,7 +1449,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by w_scan $as_me 20110702, which was
+It was created by w_scan $as_me 20111011, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2301,7 +2301,7 @@ fi
# Define the identity of the package.
PACKAGE='w_scan'
- VERSION='20110702'
+ VERSION='20111011'
cat >>confdefs.h <<_ACEOF
@@ -5951,7 +5951,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by w_scan $as_me 20110702, which was
+This file was extended by w_scan $as_me 20111011, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6014,7 +6014,7 @@ Report bugs to <bug-autoconf at gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-w_scan config.status 20110702
+w_scan config.status 20111011
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.in b/configure.in
index 318ce30..33fc5d7 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.63])
-AC_INIT([w_scan], [20110702])
+AC_INIT([w_scan], [20111011])
AC_CONFIG_SRCDIR([scan.c])
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE
diff --git a/doc/w_scan.1 b/doc/w_scan.1
old mode 100644
new mode 100755
diff --git a/dump-mplayer.c b/dump-mplayer.c
index 2626c99..a3c4c1a 100644
--- a/dump-mplayer.c
+++ b/dump-mplayer.c
@@ -42,11 +42,33 @@ void mplayer_dump_service_parameter_set (FILE * f,
fprintf (f, "%s:", s->service_name);
xine_dump_dvb_parameters (f, &t->param, flags);
- fprintf (f, ":%i:%i", s->video_pid, s->audio_pid[0]);
- for (i = 1; i < s->audio_num; i++) {
- fprintf (f, "+%i", s->audio_pid[i]);
- }
- /* what about AC3 audio here? */
+ fprintf (f, ":%i:", s->video_pid);
+
+ // build '+' separated list of mpeg audio and ac3 audio pids
+ if (s->audio_pid[0] || s->ac3_pid[0]) {
+
+ // prefer ac3 audio.
+ if (s->ac3_pid[0]) {
+ fprintf(f, "%i", s->ac3_pid[0]);
+ for (i = 1; i < s->ac3_num; i++) {
+ fprintf (f, "+%i", s->ac3_pid[i]);
+ }
+ if (s->audio_pid[0])
+ fprintf (f, "%s", "+");
+ }
+ // standard audio pids follow.
+ if (s->audio_pid[0]) {
+ fprintf(f, "%i", s->audio_pid[0]);
+ for (i = 1; i < s->audio_num; i++) {
+ fprintf (f, "+%i", s->audio_pid[i]);
+ }
+ }
+ }
+
+ else
+ // no audio or ac3 audio pids found.
+ fprintf(f, "%i", 0);
+
fprintf (f, ":%i\n", s->service_id);
}
diff --git a/dump-vlc-m3u.c b/dump-vlc-m3u.c
index 2e0be6a..4d6e0f3 100644
--- a/dump-vlc-m3u.c
+++ b/dump-vlc-m3u.c
@@ -34,125 +34,6 @@
#include "lnb.h"
-struct cChrReplacement {
- char chr;
- const char * newStr;
- uint8_t len;
-};
-
-
-// http://de.selfhtml.org/html/referenz/zeichen.htm
-// http://www.gemeinde-michendorf.de/homepage/8sonstiges/entity.php
-struct cChrReplacement chrs[] = {
- {'"', """ , 5},
- {'&', "&" , 5},
- {'<', "<" , 5},
- {'>', ">" , 5},
- {'¡', "¡", 6},
- {'¢', "¢", 6},
- {'£', "£", 6},
- {'¤', "¤", 6},
- {'¥', "¥", 6},
- {'¦', "¦", 6},
- {'§', "§", 6},
- {'¨', "¨", 6},
- {'©', "©", 6},
- {'ª', "ª", 6},
- {'«', "«", 6},
- {'¬', "¬", 6},
- {'', "", 6},
- {'®', "®", 6},
- {'¯', "¯", 6},
- {'°', "°", 6},
- {'±', "±", 6},
- {'²', "²", 6},
- {'³', "³", 6},
- {'´', "´", 6},
- {'µ', "µ", 6},
- {'¶', "¶", 6},
- {'·', "·", 6},
- {'¸', "¸", 6},
- {'¹', "¹", 6},
- {'º', "º", 6},
- {'»', "»", 6},
- {'¼', "¼", 6},
- {'½', "½", 6},
- {'¾', "¾", 6},
- {'¿', "¿", 6},
- {'À', "À", 6},
- {'Á', "Á", 6},
- {'Â', "Â", 6},
- {'Ã', "Ã", 6},
- {'Ä', "Ä", 6},
- {'Å', "Å", 6},
- {'Æ', "Æ", 6},
- {'Ç', "Ç", 6},
- {'È', "È", 6},
- {'É', "É", 6},
- {'Ê', "Ê", 6},
- {'Ë', "Ë", 6},
- {'Ì', "Ì", 6},
- {'Í', "Í", 6},
- {'Î', "Î", 6},
- {'Ï', "Ï", 6},
- {'Ð', "Ð", 6},
- {'Ñ', "Ñ", 6},
- {'Ò', "Ò", 6},
- {'Ó', "Ó", 6},
- {'Ô', "Ô", 6},
- {'Õ', "Õ", 6},
- {'Ö', "Ö", 6},
- {'×', "×", 6},
- {'Ø', "Ø", 6},
- {'Ù', "Ù", 6},
- {'Ú', "Ú", 6},
- {'Û', "Û", 6},
- {'Ü', "Ü", 6},
- {'Ý', "Ý", 6},
- {'Þ', "Þ", 6},
- {'ß', "ß", 6},
- {'à', "à", 6},
- {'á', "á", 6},
- {'â', "â", 6},
- {'ã', "ã", 6},
- {'ä', "ä", 6},
- {'å', "å", 6},
- {'æ', "æ", 6},
- {'ç', "ç", 6},
- {'è', "è", 6},
- {'é', "é", 6},
- {'ê', "ê", 6},
- {'ë', "ë", 6},
- {'ì', "ì", 6},
- {'í', "í", 6},
- {'î', "î", 6},
- {'ï', "ï", 6},
- {'ð', "ð", 6},
- {'ñ', "ñ", 6},
- {'ò', "ò", 6},
- {'ó', "ó", 6},
- {'ô', "ô", 6},
- {'õ', "õ", 6},
- {'ö', "ö", 6},
- {'÷', "÷", 6},
- {'ø', "ø", 6},
- {'ù', "ù", 6},
- {'ú', "ú", 6},
- {'û', "û", 6},
- {'ü', "ü", 6},
- {'ý', "ý", 6},
- {'þ', "þ", 6},
- {'ÿ', "ÿ", 6},
- {'ß', "β", 6},
- {'µ', "μ", 6},
- {'‘', "‘",7},
- {'/', "⁄",7},
-};
-
-#define R_COUNT(x) (sizeof(x)/sizeof(struct cChrReplacement))
-
-
-
static int idx = 1;
#define T1 "\t"
@@ -391,30 +272,6 @@ void vlc_dump_service_parameter_set (FILE *f,
}
}
-const char * convert_str(const char * serviceName)
-{
- static char buf[512];
- memset(&buf[0], 0, 512);
- int len = strlen(serviceName);
- int pi, po = 0;
- unsigned i;
-
- for (pi=0; pi<len; pi++) {
- int found = 0;
- for (i=0; i<R_COUNT(chrs); i++) {
- if (serviceName[pi] == chrs[i].chr) {
- found++;
- strcpy(&buf[po], chrs[i].newStr);
- po += chrs[i].len;
- break;
- }
- }
- if (! found)
- strcpy(&buf[po++], &serviceName[pi]);
- }
- return &buf[0];
-}
-
void vlc_xspf_prolog(FILE * f, uint16_t adapter, uint16_t frontend, struct w_scan_flags * flags, struct lnb_types_st * lnbp)
{
fprintf_tab0("<?");
@@ -488,10 +345,10 @@ void vlc_dump_dvb_parameters_as_xspf (FILE * f, struct extended_dvb_frontend_par
switch (p->u.qpsk.polarization) {
case POLARIZATION_HORIZONTAL:
case POLARIZATION_CIRCULAR_LEFT:
- fprintf (f, "voltage=18,\n");
+ fprintf (f, "voltage=18,");
break;
default:
- fprintf (f, "voltage=13,\n");
+ fprintf (f, "voltage=13,");
break;
}
fprintf (f, "tone=%i", p->frequency >= lnbp->switch_val);
@@ -512,7 +369,7 @@ void vlc_dump_service_parameter_set_as_xspf (FILE * f,
struct lnb_types_st *lnbp)
{
fprintf_tab3("<track>\n");
- fprintf (f, "%s%s%.4d. %s%s\n", T4, "<title>", idx++, convert_str(s->service_name), "</title>");
+ fprintf (f, "%s%s%.4d. %s%s\n", T4, "<title>", idx++, s->service_name, "</title>");
fprintf (f, "%s%s", T4, "<location>");
vlc_dump_dvb_parameters_as_xspf(f, &t->param, flags, lnbp);
diff --git a/dump-xine.c b/dump-xine.c
index 3cc8035..163e426 100644
--- a/dump-xine.c
+++ b/dump-xine.c
@@ -188,7 +188,7 @@ void xine_dump_service_parameter_set (FILE * f,
else
fprintf (f, "%s:", s->service_name);
xine_dump_dvb_parameters (f, &t->param, flags);
- fprintf (f, ":%i:%i:%i", s->video_pid, s->audio_pid[0], s->service_id);
+ fprintf (f, ":%i:%i:%i", s->video_pid, s->ac3_pid[0]?s->ac3_pid[0]:s->audio_pid[0], s->service_id);
/* what about AC3 audio here && multiple audio pids? see also: dump_mplayer.c/h */
fprintf (f, "\n");
}
diff --git a/satellites.c b/satellites.c
index cdba21a..75c80ad 100644
--- a/satellites.c
+++ b/satellites.c
@@ -95,12 +95,15 @@ enum __satellite {
S105EX,
S108EX,
S140EX,
+ S152E0,
+ S156E0,
S160E0,
- S0W8,
- S4W0,
- S5WX,
- S7W0,
- S8W0,
+ S166E0,
+ S0W8,
+ S4W0,
+ S5WX,
+ S7W0,
+ S8W0,
S11WX,
S12W5,
S14W0,
@@ -1679,11 +1682,60 @@ static const struct __sat_transponder EXPRESS140_XE[] = { // Express AM3, *** TO
{SYS_DVBS , 4180, POLARIZATION_VERTICAL , 4340, FEC_3_4, ROLLOFF_35, QPSK},
{SYS_DVBS , 4184, POLARIZATION_VERTICAL , 4340, FEC_3_4, ROLLOFF_35, QPSK}};
-static const struct __sat_transponder OPTUS_160_0E[] = { // Optus D1, 2009-05-23
+static const struct __sat_transponder OPTUS_152_0E[] = { // Optus D2, 2011-09-09
+{SYS_DVBS ,12394, POLARIZATION_HORIZONTAL,22500, FEC_3_4, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12407, POLARIZATION_VERTICAL ,30000, FEC_2_3, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12425, POLARIZATION_HORIZONTAL,22500, FEC_3_4, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12519, POLARIZATION_VERTICAL ,22500, FEC_3_4, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12546, POLARIZATION_VERTICAL ,22500, FEC_3_4, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12581, POLARIZATION_HORIZONTAL,22500, FEC_3_4, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12608, POLARIZATION_HORIZONTAL,22500, FEC_3_4, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12644, POLARIZATION_VERTICAL ,22500, FEC_3_4, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12644, POLARIZATION_HORIZONTAL,22500, FEC_3_4, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12671, POLARIZATION_HORIZONTAL,22500, FEC_3_4, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12706, POLARIZATION_VERTICAL ,22500, FEC_3_4, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12734, POLARIZATION_VERTICAL ,22500, FEC_3_4, ROLLOFF_35, QPSK}};
+
+static const struct __sat_transponder OPTUS_156_0E[] = { // Optus C1/D3, 2011-09-09
+{SYS_DVBS ,12305, POLARIZATION_HORIZONTAL,30000, FEC_3_4, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12358, POLARIZATION_HORIZONTAL,27800, FEC_3_4, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12369, POLARIZATION_VERTICAL ,30000, FEC_3_5, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12398, POLARIZATION_HORIZONTAL,27800, FEC_3_4, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12407, POLARIZATION_VERTICAL ,30000, FEC_2_3, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12438, POLARIZATION_HORIZONTAL,27800, FEC_3_4, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12447, POLARIZATION_VERTICAL ,30000, FEC_3_5, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12478, POLARIZATION_HORIZONTAL,27800, FEC_3_4, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12487, POLARIZATION_VERTICAL ,30000, FEC_3_5, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12518, POLARIZATION_HORIZONTAL,27800, FEC_3_4, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12527, POLARIZATION_VERTICAL ,30000, FEC_3_4, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12558, POLARIZATION_HORIZONTAL,27800, FEC_3_4, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12567, POLARIZATION_VERTICAL ,30000, FEC_3_5, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12598, POLARIZATION_HORIZONTAL,27800, FEC_3_4, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12607, POLARIZATION_VERTICAL ,30000, FEC_3_5, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12638, POLARIZATION_HORIZONTAL,27800, FEC_3_4, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12647, POLARIZATION_VERTICAL ,30000, FEC_3_5, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12689, POLARIZATION_HORIZONTAL,27800, FEC_3_4, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12728, POLARIZATION_VERTICAL ,24450, FEC_1_2, ROLLOFF_35, QPSK},
+{SYS_DVBS2,11720, POLARIZATION_HORIZONTAL,29455, FEC_3_5, ROLLOFF_35,PSK_8},
+{SYS_DVBS ,11762, POLARIZATION_HORIZONTAL,27800, FEC_3_4, ROLLOFF_35, QPSK},
+{SYS_DVBS ,11886, POLARIZATION_HORIZONTAL,27800, FEC_3_4, ROLLOFF_35, QPSK},
+{SYS_DVBS ,11928, POLARIZATION_HORIZONTAL,27800, FEC_3_4, ROLLOFF_35, QPSK},
+{SYS_DVBS ,11962, POLARIZATION_HORIZONTAL,27800, FEC_3_4, ROLLOFF_35, QPSK},
+{SYS_DVBS2,12011, POLARIZATION_HORIZONTAL,29455, FEC_3_5, ROLLOFF_35,PSK_8},
+{SYS_DVBS2,12052, POLARIZATION_HORIZONTAL,29455, FEC_3_5, ROLLOFF_35,PSK_8},
+{SYS_DVBS ,12052, POLARIZATION_VERTICAL ,27800, FEC_3_4, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12094, POLARIZATION_VERTICAL ,27800, FEC_3_4, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12136, POLARIZATION_HORIZONTAL,27800, FEC_3_4, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12136, POLARIZATION_VERTICAL ,27800, FEC_3_4, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12177, POLARIZATION_HORIZONTAL,27800, FEC_3_4, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12177, POLARIZATION_VERTICAL ,27800, FEC_3_4, ROLLOFF_35, QPSK}};
+
+static const struct __sat_transponder OPTUS_160_0E[] = { // Optus D1, 2011-08-09
{SYS_DVBS2,12331, POLARIZATION_HORIZONTAL,22500, FEC_2_3, ROLLOFF_35,PSK_8},
{SYS_DVBS2,12358, POLARIZATION_HORIZONTAL,22500, FEC_2_3, ROLLOFF_35,PSK_8},
{SYS_DVBS ,12391, POLARIZATION_HORIZONTAL,12600, FEC_5_6, ROLLOFF_35, QPSK},
{SYS_DVBS ,12394, POLARIZATION_HORIZONTAL,22500, FEC_3_4, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12398, POLARIZATION_VERTICAL ,11909, FEC_2_3, ROLLOFF_35,PSK_8},
{SYS_DVBS ,12407, POLARIZATION_HORIZONTAL,12600, FEC_5_6, ROLLOFF_35, QPSK},
{SYS_DVBS ,12421, POLARIZATION_HORIZONTAL,22500, FEC_3_4, ROLLOFF_35, QPSK},
{SYS_DVBS ,12424, POLARIZATION_HORIZONTAL,14294, FEC_7_8, ROLLOFF_35, QPSK},
@@ -1704,10 +1756,26 @@ static const struct __sat_transponder OPTUS_160_0E[] = { // Optus D1, 2009-05-23
{SYS_DVBS ,12608, POLARIZATION_HORIZONTAL,22500, FEC_3_4, ROLLOFF_35, QPSK},
{SYS_DVBS ,12613, POLARIZATION_HORIZONTAL,14294, FEC_7_8, ROLLOFF_35, QPSK},
{SYS_DVBS ,12644, POLARIZATION_HORIZONTAL,22500, FEC_3_4, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12648, POLARIZATION_VERTICAL ,12600, FEC_5_6, ROLLOFF_35, QPSK},
{SYS_DVBS ,12658, POLARIZATION_HORIZONTAL,12600, FEC_5_6, ROLLOFF_35, QPSK},
{SYS_DVBS ,12671, POLARIZATION_HORIZONTAL,22500, FEC_3_4, ROLLOFF_35, QPSK},
{SYS_DVBS ,12707, POLARIZATION_HORIZONTAL,22500, FEC_3_4, ROLLOFF_35, QPSK},
{SYS_DVBS ,12734, POLARIZATION_HORIZONTAL,22500, FEC_3_4, ROLLOFF_35, QPSK}};
+
+static const struct __sat_transponder INTELSAT_8_166_0E[] = { // Intelsat 8 KU Band only, 2011-09-09
+{SYS_DVBS ,12286, POLARIZATION_HORIZONTAL,28800, FEC_3_4, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12459, POLARIZATION_HORIZONTAL, 2083, FEC_3_4, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12462, POLARIZATION_HORIZONTAL, 2222, FEC_1_2, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12491, POLARIZATION_VERTICAL , 4400, FEC_3_4, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12502, POLARIZATION_VERTICAL , 3074, FEC_3_4, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12557, POLARIZATION_HORIZONTAL,13845, FEC_2_3, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12575, POLARIZATION_HORIZONTAL,13845, FEC_2_3, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12596, POLARIZATION_HORIZONTAL, 2776, FEC_3_4, ROLLOFF_35, QPSK},
+{SYS_DVBS2,12599, POLARIZATION_HORIZONTAL, 4166, FEC_3_4, ROLLOFF_35,PSK_8},
+{SYS_DVBS ,12646, POLARIZATION_HORIZONTAL,28066, FEC_3_4, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12686, POLARIZATION_HORIZONTAL,28124, FEC_3_4, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12726, POLARIZATION_HORIZONTAL,28066, FEC_3_4, ROLLOFF_35, QPSK},
+{SYS_DVBS ,12596, POLARIZATION_HORIZONTAL, 2776, FEC_3_4, ROLLOFF_35, QPSK}};
static const struct __sat_transponder THOR00_8W[] = { // Thor 3/5 & Intelsat 10-02, 2008-07-10
{SYS_DVBS ,11093, POLARIZATION_VERTICAL ,19191, FEC_7_8, ROLLOFF_35, QPSK},
@@ -2143,7 +2211,10 @@ struct cSat sat_list[] = {
{"S105EX",S105EX,"105.X east AsiaSat 3S" , ASIASAT105_XE, SAT_TRANSPONDER_COUNT(ASIASAT105_XE), EAST_FLAG, 0x1050, -1, "S105.5E"},
{"S108EX",S108EX,"108.X east Telkom 1 & NSS 11" , NSS108_XE, SAT_TRANSPONDER_COUNT(NSS108_XE), EAST_FLAG, 0x1080, -1, "S108E" },
{"S140EX",S140EX,"140.X east Express AM3" , EXPRESS140_XE, SAT_TRANSPONDER_COUNT(EXPRESS140_XE), EAST_FLAG, 0x1400, -1, "S140E" },
+{"S152E0",S152E0,"152.0 east Optus D2" , OPTUS_152_0E, SAT_TRANSPONDER_COUNT(OPTUS_152_0E), EAST_FLAG, 0x1520, -1, "S152E" },
+{"S156E0",S156E0,"156.0 east Optus C1/D3" , OPTUS_156_0E, SAT_TRANSPONDER_COUNT(OPTUS_156_0E), EAST_FLAG, 0x1560, -1, "S156E" },
{"S160E0",S160E0,"160.0 east Optus D1" , OPTUS_160_0E, SAT_TRANSPONDER_COUNT(OPTUS_160_0E), EAST_FLAG, 0x1600, -1, "S160E" },
+{"S166E0",S166E0,"166.0 east Intelsat 8" , INTELSAT_8_166_0E, SAT_TRANSPONDER_COUNT(INTELSAT_8_166_0E), EAST_FLAG, 0x1660, -1, "S166E" },
{ "S0W8", S0W8, "0.8 west Thor 3/5 & Intelsat 10-02" , THOR00_8W, SAT_TRANSPONDER_COUNT(THOR00_8W), WEST_FLAG, 0x8, -1, "S1W" },
{ "S4W0", S4W0, "4.0 west Amos 1/2/3" , AMOS04_0W, SAT_TRANSPONDER_COUNT(AMOS04_0W), WEST_FLAG, 0x40, -1, "S4W" },
{ "S5WX", S5WX, "5.X west Atlantic Bird 3" , ATLANTICBIRD05_XW, SAT_TRANSPONDER_COUNT(ATLANTICBIRD05_XW), WEST_FLAG, 0x50, -1, "S5W" },
diff --git a/scan.c b/scan.c
index 79f6c1a..741bd8c 100644
--- a/scan.c
+++ b/scan.c
@@ -833,7 +833,8 @@ static void parse_pmt (const unsigned char *buf, int section_length, int service
break;
case iso_iec_13818_7_audio_w_ADTS_transp:
moreverbose(" ADTS Audio Stream (usually AAC) : PID 0x%04x\n", elementary_pid);
- if (output_format == OUTPUT_VDR) break; /* not supported by VDR up to now. */
+ if ((output_format == OUTPUT_VDR) && (flags.vdr_version < 7))
+ break; /* not supported by VDR-1.2..1.7.?? */
if (s->audio_num < AUDIO_CHAN_MAX) {
s->audio_pid[s->audio_num] = elementary_pid;
s->audio_num++;
@@ -847,7 +848,8 @@ static void parse_pmt (const unsigned char *buf, int section_length, int service
break;
case iso_iec_14496_3_audio_w_LATM_transp:
moreverbose(" ISO/IEC 14496-3 Audio with LATM transport syntax as def. in ISO/IEC 14496-3/AMD1 : PID 0x%04x\n", elementary_pid);
- if (output_format == OUTPUT_VDR) break; /* not supported by VDR up to now. */
+ if ((output_format == OUTPUT_VDR) && (flags.vdr_version < 7))
+ break; /* not supported by VDR-1.2..1.7.?? */
if (s->audio_num < AUDIO_CHAN_MAX) {
s->audio_pid[s->audio_num] = elementary_pid;
s->audio_num++;
@@ -2983,6 +2985,10 @@ int main (int argc, char **argv)
break;
case OUTPUT_VLC_M3U:
info("output format vlc xspf playlist\n");
+ // vlc format will be output always as utf-8.
+ if (codepage)
+ free(codepage);
+ codepage = strdup("UTF-8");
break;
default:
cleanup();
diff --git a/version.h b/version.h
index e6439ef..2971399 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
/* AUTOMATICALLY GENERATED - DO NOT EDIT MANUALLY */
#ifndef W_SCAN_VERSION_H
#define W_SCAN_VERSION_H
-uint version=20110702;
+uint version=20111011;
#endif
diff --git a/w_scan b/w_scan
new file mode 100755
index 0000000..c4e8b6c
Binary files /dev/null and b/w_scan differ
diff --git a/w_scan_start.sh b/w_scan_start.sh
index 11bd1f7..363eaba 100755
--- a/w_scan_start.sh
+++ b/w_scan_start.sh
@@ -38,7 +38,7 @@ export PATH="$(pwd):/bin:/usr/bin:/sbin:/usr/sbin"
DATE="$(date +%Y)$(date +%m)$(date +%d)" # $DATE == "YYYYMMDD", i.e. 20060710
W_SCAN=$(which w_scan 2>/dev/null)
UDEVSTART=$(which udevstart)
-SCRIPT_VERSION=20110702
+SCRIPT_VERSION=20111011
W_SCAN_VERSION=$($W_SCAN -V 2>&1)
--
w-scan packaging repository
More information about the pkg-vdr-dvb-changes
mailing list