From 9b4870ed3581b5469ae06e4900bd1de0b96353d0 Mon Sep 17 00:00:00 2001
From: TheTroll <trolldev@gmail.com>
Date: Mon, 29 Mar 2010 13:13:13 +0200
Subject: Forcing to 2 the number of audio channels
---
bin/files.php | 8 ++++++--
bin/istream.sh | 17 ++++++++---------
config_default.php | 8 ++++----
3 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/bin/files.php b/bin/files.php
index 5224096..0674ff1 100755
--- a/bin/files.php
+++ b/bin/files.php
@@ -152,14 +152,18 @@ function generatelogo($type, $name, $dest)
$logopath = "../logos/" .$channoslash .".png";
if (!file_exists($logopath))
$logopath = "../logos/nologoTV.png";
- exec("cp \"" .$logopath ."\" " .$dest);
+ $cmd = "cp \"" .$logopath ."\" " .$dest;
+ addlog("Executing generation cmd: " .$cmd);
+ exec($cmd);
break;
case 'rec':
$channoslash = preg_replace("$/$", " ", $name);
$logopath = "../logos/" .$channoslash .".png";
if (!file_exists($logopath))
$logopath = "../logos/nologoREC.png";
- exec("cp \"" .$logopath ."\" " .$dest);
+ $cmd = "cp \"" .$logopath ."\" " .$dest;
+ addlog("Executing generation cmd: " .$cmd);
+ exec($cmd);
break;
case 'vid':
// Generate TB
diff --git a/bin/istream.sh b/bin/istream.sh
index b54417a..3476cc0 100755
--- a/bin/istream.sh
+++ b/bin/istream.sh
@@ -3,16 +3,15 @@
STREAM=$1
VRATE=$2
ARATE=$3
-ACHANNELS=$4
-XY=$5
-HTTP_PATH="$6ram/"
+XY=$4
+HTTP_PATH="$5ram/"
SEGDUR=10 # Length of Segments produced (between 10 and 30)
-SEGWIN=$7 # Amount of Segments to produce
-FFPATH=$8
-SEGMENTERPATH=$9
-SESSION=${10}
-FFMPEGLOG=${11}
+SEGWIN=$6 # Amount of Segments to produce
+FFPATH=$7
+SEGMENTERPATH=$8
+SESSION=${9}
+FFMPEGLOG=${10}
if [ $# -eq 0 ]
then
@@ -36,7 +35,7 @@ cd ../ram/$SESSION
2> /dev/null rm stream*.ts
-$FFPATH -i "$STREAM" -deinterlace -f mpegts -acodec libmp3lame -ab $ARATE -ac $ACHANNELS -s $XY -vcodec libx264 -b $VRATE -flags +loop \
+$FFPATH -i "$STREAM" -deinterlace -f mpegts -acodec libmp3lame -ab $ARATE -ac 2 -s $XY -vcodec libx264 -b $VRATE -flags +loop \
-cmp \+chroma -partitions +parti4x4+partp8x8+partb8x8 -subq 5 -trellis 1 -refs 1 -coder 0 -me_range 16 -keyint_min 25 \
-sc_threshold 40 -i_qfactor 0.71 -bt $VRATE -maxrate $VRATE -bufsize $VRATE -rc_eq 'blurCplx^(1-qComp)' -qcomp 0.6 \
-qmin 10 -qmax 51 -qdiff 4 -level 30 -g 30 -async 2 -threads 4 - 2>$FFMPEGLOG | \
diff --git a/config_default.php b/config_default.php
index 26d57ef..8eeb0c9 100755
--- a/config_default.php
+++ b/config_default.php
@@ -30,10 +30,10 @@
$audiosource='/mnt/media/music/'; // Audio files directory
// Encoding (The name cannot be changed)
- // Name Video Audio Audio channels Resolution
- $quality=array ( 'edge' => '128k 64k 1 240x160',
- '3g' => '350k 64k 1 408x272',
- 'wifi' => '512k 128k 2 480x320');
+ // Name Video Audio Resolution
+ $quality=array ( 'edge' => '128k 64k 240x160',
+ '3g' => '350k 64k 408x272',
+ 'wifi' => '512k 128k 480x320');
$maxencodingprocesses=3; // Max simultaneous encoding processes
// Misc
--
cgit v1.2.3