Skip to content

Commit

Permalink
minor improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
@mifi
mifi committed Mar 4, 2014
1 parent 2fc9f35 commit 479bc05
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions hls-vod.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ var processCleanupTimeout = 6 * 60 * 60 * 1000;
var debug = true;


var videoExtensions = ['.mp4', '.avi', '.mkv', '.wmv', '.asf', '.m4v', '.flv', '.mpg', '.mpeg', '.mov', '.vob'];
var videoExtensions = ['.mp4', '.avi', '.mkv', '.wmv', '.asf', '.m4v', '.flv', '.mpg', '.mpeg', '.mov', '.vob', '.ts'];
var audioExtensions = ['.mp3', '.aac', '.m4a'];

var mimeTypes = {
Expand Down Expand Up @@ -60,7 +60,7 @@ var spawnNewProcess = function(file, playlistPath) {

if (transcoderType === 'ffmpeg') {
//var args = ['-i', file, '-async', '1', '-b:a', 64 + 'k', '-vf', 'scale=min(' + targetWidth + '\\, iw):-1', '-b:v', videoBitrate + 'k', '-ar', '44100', '-ac', '2', '-vcodec', 'libx264', '-x264opts', 'level=3.0', '-profile:v', 'baseline', '-preset:v' ,'superfast', '-acodec', 'libaacplus', '-threads', '0', '-flags', '-global_header', '-map', '0', '-f', 'segment', '-segment_time', '10', '-segment_list', 'stream.m3u8', '-segment_format', 'mpegts', '-segment_list_flags', 'live', 'stream%05d.ts'];
var args = ['-i', file, '-async', '1', '-acodec', 'libmp3lame', '-b:a', 128 + 'k', '-vf', 'scale=min(' + targetWidth + '\\, iw):-1', '-b:v', videoBitrate + 'k', '-ar', '44100', '-ac', '2', '-vcodec', 'libx264', '-x264opts', 'level=3.0', '-profile:v', 'baseline', '-preset:v' ,'superfast', '-threads', '0', '-flags', '-global_header', '-map', '0', '-f', 'segment', '-segment_time', '10', '-segment_list', 'stream.m3u8', '-segment_format', 'mpegts', '-segment_list_flags', 'live', 'stream%05d.ts'];
var args = ['-i', file, '-sn', '-async', '1', '-acodec', 'libmp3lame', '-b:a', 128 + 'k', '-vf', 'scale=min(' + targetWidth + '\\, iw):-1', '-b:v', videoBitrate + 'k', '-ar', '44100', '-ac', '2', '-vcodec', 'libx264', '-x264opts', 'level=3.0', '-profile:v', 'baseline', '-preset:v' ,'superfast', '-threads', '0', '-flags', '-global_header', '-map', '0', '-f', 'segment', '-segment_time', '10', '-segment_list', 'stream.m3u8', '-segment_format', 'mpegts', '-segment_list_flags', 'live', 'stream%05d.ts'];
}
else {
var playlistPath = 'stream.m3u8';
Expand Down
6 changes: 3 additions & 3 deletions static/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
}
#file-list li {
cursor: pointer;
background: linear-gradient(top, #fff 0%, #eee 48%, #ddd 52%, #ccc 100%);
background: linear-gradient(to bottom, #fff 0%, #eee 48%, #ddd 52%, #ccc 100%);
border: 1px solid #ccc;
text-shadow: 1px 1px #ccc;
color: #000;
Expand All @@ -48,7 +48,7 @@
padding-right: .7em;
}
#dir-header {
background: linear-gradient(top, #fff 0%, #eee 48%, #ddd 52%, #ccc 100%);
background: linear-gradient(to bottom, #fff 0%, #eee 48%, #ddd 52%, #ccc 100%);
border: 1px solid #ccc;
text-shadow: 1px 1px #ccc;
color: #c00;
Expand Down Expand Up @@ -299,7 +299,7 @@

<div id="thumbnail-viewer">
<div class="x-button">X</div>
<img src="/thumbnail/videos/music_vids/Beyonce%20-%20Naughty%20Girl.flv" alt="" />
<img alt="" />
</div>
</body>
</html>

2 comments on commit 479bc05

@mysoogal
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hello cool project using it to stream to iphone 4 👍

is it possible for you to update table? like using bootstrap 3 UI its responsive.

@mifi
Copy link
Owner Author

@mifi mifi commented on 479bc05 May 5, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello and thanks.

Of course it's possible, but it takes time and motivation. Why do you want it to be responsive? What do you feel is missing? Maybe you can try implementing a bootstrap version of the GUI yourself and submitting a pull request.

Please sign in to comment.