diff --git a/hls-vod.js b/hls-vod.js index 132ec77..2dbb0b8 100644 --- a/hls-vod.js +++ b/hls-vod.js @@ -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 = { @@ -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'; diff --git a/static/index.html b/static/index.html index d49b679..c43a832 100644 --- a/static/index.html +++ b/static/index.html @@ -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; @@ -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; @@ -299,7 +299,7 @@