diff options
| author | TheTroll <trolldev@gmail.com> | 2010-04-01 19:35:55 +0200 |
|---|---|---|
| committer | TheTroll <trolldev@gmail.com> | 2010-04-01 19:35:55 +0200 |
| commit | 06bac9f1e1e3d6dd9da332822f7f08357dd6a316 (patch) | |
| tree | 2ea76f9b8cbf38a06e92198559db975695711e96 /bin/session.php | |
| parent | 7bb40c3e21fa067dee9997bcd580113e63d1ff08 (diff) | |
| download | istreamdev-06bac9f1e1e3d6dd9da332822f7f08357dd6a316.tar.gz istreamdev-06bac9f1e1e3d6dd9da332822f7f08357dd6a316.tar.bz2 | |
Improved encoding start
Recordings are still failing
Diffstat (limited to 'bin/session.php')
| -rw-r--r-- | bin/session.php | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/bin/session.php b/bin/session.php index 37aade9..81582ee 100644 --- a/bin/session.php +++ b/bin/session.php @@ -82,13 +82,13 @@ function sessioncreate($type, $url, $mode) switch ($type) { case 'tv': - $cmd = "./istream.sh \"" .$url ."\" " .$qparams ." " .$httppath ." 2 " .$ffmpegpath ." " .$segmenterpath ." " .$session ." \"" .$ffdbg ."\" >/dev/null &"; + $cmd = "./istream.sh \"" .$url ."\" " .$qparams ." " .$httppath ." 2 " .$ffmpegpath ." " .$segmenterpath ." " .$session ." \"" .$ffdbg ."\" \"\" >/dev/null &"; break; case 'rec': - $cmd = "cat \"" .$url ."\"/0* | ./istream.sh - " .$qparams ." " .$httppath ." 1260 " .$ffmpegpath ." " .$segmenterpath ." " .$session ." \"" .$ffdbg ."\" >/dev/null &"; + $cmd = "./istream.sh - " .$qparams ." " .$httppath ." 1260 " .$ffmpegpath ." " .$segmenterpath ." " .$session ." \"" .$ffdbg ."\" \"cat \\\"" .$url ."/\\\"/0* |\" >/dev/null &"; break; case 'vid': - $cmd = "./istream.sh \"" .$url ."\" " .$qparams ." " .$httppath ." 1260 " .$ffmpegpath ." " .$segmenterpath ." " .$session ." \"" .$ffdbg ."\" >/dev/null &"; + $cmd = "./istream.sh \"" .$url ."\" " .$qparams ." " .$httppath ." 1260 " .$ffmpegpath ." " .$segmenterpath ." " .$session ." \"" .$ffdbg ."\" \"\" >/dev/null &"; break; default: $cmd = ""; @@ -259,13 +259,20 @@ function getstreamingstatus($session) $status['message'] .= "<br>"; + + $status['message'] .= "<br> * FFmpeg: "; + if (file_exists($path .'/ffmpeg.pid')) + $status['message'] .= "<i>running</i>"; + else + $status['message'] .= "<i>stopped</i>"; $status['message'] .= "<br> * Segmenter: "; if (file_exists($path .'/segmenter.pid')) - $status['message'] .= "<i>running</i>"; + { + $status['message'] .= "<i>running</i> ("; + $status['message'] .= count(glob($path . '/*.ts')) ."/2)</i>"; + } else $status['message'] .= "<i>stopped</i>"; - $status['message'] .= "<br> * Segments: <i>"; - $status['message'] .= count(glob($path . '/*.ts')) ."/2</i>"; } } |