knotteye
/
satyr
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 5 Wiki Activity

Merge branch 'develop' into 'master' 

Fix for not transcoding streams which aren't already mp4 encoded.

See merge request knotteye/satyr!9
merge-requests/10/merge
knotteye 2020-06-30 06:28:39 +00:00
parent 94822cafb2 65894b6f2e
commit cd70d5d4ab
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/server.ts
View File

@ -41,7 +41,7 @@ function init () {
while(true){ while(true){
if(session.audioCodec !== 0 && session.videoCodec !== 0){ if(session.audioCodec !== 0 && session.videoCodec !== 0){
transCommand(results[0].username, key).then((r) => { transCommand(results[0].username, key).then((r) => {
execFile(config['media']['ffmpeg'], r, {maxBuffer: Infinity}); execFile(config['media']['ffmpeg'], r, {maxBuffer: Infinity}, (err, stdout, stderr) => {});
}); });
break; break;
} }
@ -112,12 +112,12 @@ function init () {
} }
async function transCommand(user: string, key: string): Promise<string[]>{ async function transCommand(user: string, key: string): Promise<string[]>{
let args: string[] = ['-loglevel', 'fatal', '-y', '-i', 'rtmp://127.0.0.1:'+config['rtmp']['port']+'/'+config['media']['privateEndpoint']+'/'+key]; let args: string[] = [/*'-loglevel', 'fatal',*/ '-y', '-i', 'rtmp://127.0.0.1:'+config['rtmp']['port']+'/'+config['media']['privateEndpoint']+'/'+key];
if(config['transcode']['adaptive']===true && config['transcode']['variants'] > 1) { if(config['transcode']['adaptive']===true && config['transcode']['variants'] > 1) {
for(let i=0;i<config['transcode']['variants'];i++){ for(let i=0;i<config['transcode']['variants'];i++){
args = args.concat(['-map', '0:2']); args = args.concat(['-map', '0:2']);
} }
args = args.concat(['-map', '0:1', '-c:a', 'copy', '-c:v:0', 'copy']); args = args.concat(['-map', '0:1', '-c:a', 'aac', '-c:v:0', 'libx264']);
for(let i=1;i<config['transcode']['variants'];i++){ for(let i=1;i<config['transcode']['variants'];i++){
args = args.concat(['-c:v:'+i, 'libx264',]); args = args.concat(['-c:v:'+i, 'libx264',]);
} }
@ -131,7 +131,7 @@ async function transCommand(user: string, key: string): Promise<string[]>{
} }
} }
else { else {
args = args.concat(['-c:a', 'copy', '-c:v', 'copy']); args = args.concat(['-c:a', 'aac', '-c:v', 'libx264']);
} }
//if(config['transcode']['format'] === 'dash') //if(config['transcode']['format'] === 'dash')
args = args.concat(['-remove_at_exit', '1', '-seg_duration', '1', '-window_size', '30', '-f', 'dash', config['http']['directory']+'/'+config['media']['publicEndpoint']+'/'+user+'/index.mpd']); args = args.concat(['-remove_at_exit', '1', '-seg_duration', '1', '-window_size', '30', '-f', 'dash', config['http']['directory']+'/'+config['media']['publicEndpoint']+'/'+user+'/index.mpd']);
@ -139,4 +139,4 @@ async function transCommand(user: string, key: string): Promise<string[]>{
//args = args.concat(['-remove_at_exit', '1', '-hls_time', '1', '-hls_list_size', '30', '-f', 'hls', config['http']['directory']+'/'+config['media']['publicEndpoint']+'/'+user+'/index.m3u8']); //args = args.concat(['-remove_at_exit', '1', '-hls_time', '1', '-hls_list_size', '30', '-f', 'hls', config['http']['directory']+'/'+config['media']['publicEndpoint']+'/'+user+'/index.m3u8']);
return args; return args;
} }
export { init }; export { init };