neoris/restreamer-ui-v2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cosmetics

Browse Source
This commit is contained in:
Ingo Oppermann 2022-06-30 09:48:44 +02:00
parent 2a8ec7b348
commit 7239bf4d66
No known key found for this signature in database
GPG Key ID: 2AB32426E9DD229E
3 changed files with 79 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/misc/coders/Encoders/audio/Copy.js
View File

@ -2,11 +2,10 @@ import React from 'react';
function createMapping(settings, stream) {
const local = ['-codec:a', 'copy'];
/*
if(stream.codec === 'aac') {
local.push('-bsf:a', 'aac_adtstoasc');
}
*/
//if (stream.codec === 'aac') {
// local.push('-bsf:a', 'aac_adtstoasc');
//}
const mapping = {
global: [],

10
src/misc/controls/HLS.js
View File

@ -61,11 +61,15 @@ export default function Control(props) {
<Grid item xs={12}>
<Select label={<Trans>EXT-X-VERSION</Trans>} value={settings.version} onChange={handleChange('version')}>
<MenuItem value={3}>3</MenuItem>
<MenuItem value={6}><Trans>6 (+ guaranteed to start with a Key frame)</Trans></MenuItem>
<MenuItem value={7}><Trans>7 (+ fragmented MP4 format)</Trans></MenuItem>
<MenuItem value={6}>
<Trans>6 (+ guaranteed to start with a Key frame)</Trans>
</MenuItem>
<MenuItem value={7}>
<Trans>7 (+ fragmented MP4 format)</Trans>
</MenuItem>
</Select>
<Typography variant="caption">
<Trans>M3U8 manifest version. Version 3 has the longest browser/client compatibility.</Trans>
<Trans>M3U8 manifest version. Version 3 has the best browser/client compatibility.</Trans>
</Typography>
</Grid>
<Grid item xs={12} md={6}>

104
src/utils/restreamer.js
View File

@ -1484,54 +1484,86 @@ class Restreamer {
// manifest versions
// https://developer.apple.com/documentation/http_live_streaming/about_the_ext-x-version_tag
// https://ffmpeg.org/ffmpeg-all.html#Options-53
console.log(control.hls.version)
console.log(control.hls.version);
if (control.hls.lhls === false) {
// ordinary HLS
if (control.hls.version >= 6 && control.hls.version < 7) {
if (control.hls.version === 6) {
output.options.push(
'-f', 'hls',
'-start_number', '0',
'-hls_time', '' + parseInt(control.hls.segmentDuration),
'-hls_list_size', '' + parseInt(control.hls.listSize),
'-hls_flags', 'append_list+delete_segments+program_date_time+independent_segments',
'-hls_delete_threshold', '4',
'-hls_segment_filename', `{memfs}/${channel.channelid}_%04d.ts`,
'-segment_format_options', 'mpegts_flags=mpegts_copyts=1',
'-max_muxing_queue_size', '400',
'-f',
'hls',
'-start_number',
'0',
'-hls_time',
'' + parseInt(control.hls.segmentDuration),
'-hls_list_size',
'' + parseInt(control.hls.listSize),
'-hls_flags',
'append_list+delete_segments+program_date_time+independent_segments',
'-hls_delete_threshold',
'4',
'-hls_segment_filename',
`{memfs}/${channel.channelid}_%04d.ts`,
'-segment_format_options',
'mpegts_flags=mpegts_copyts=1',
'-max_muxing_queue_size',
'400',
'-y',
'-method', 'PUT'
'-method',
'PUT'
);
} else if (control.hls.version >= 7) {
} else if (control.hls.version === 7) {
output.options.push(
'-f', 'hls',
'-start_number', '0',
'-hls_time', '' + parseInt(control.hls.segmentDuration),
'-hls_list_size', '' + parseInt(control.hls.listSize),
'-hls_flags', 'append_list+delete_segments+program_date_time+independent_segments',
'-hls_delete_threshold', '4',
'-hls_segment_type', 'fmp4',
'-hls_fmp4_init_filename', `${channel.channelid}_init.mp4`,
'-hls_segment_filename', `{memfs}/${channel.channelid}_%04d.mp4`,
'-segment_format_options', 'mpegts_flags=mpegts_copyts=1',
'-max_muxing_queue_size', '400',
'-f',
'hls',
'-start_number',
'0',
'-hls_time',
'' + parseInt(control.hls.segmentDuration),
'-hls_list_size',
'' + parseInt(control.hls.listSize),
'-hls_flags',
'append_list+delete_segments+program_date_time+independent_segments',
'-hls_delete_threshold',
'4',
'-hls_segment_type',
'fmp4',
'-hls_fmp4_init_filename',
`${channel.channelid}_init.mp4`,
'-hls_segment_filename',
`{memfs}/${channel.channelid}_%04d.mp4`,
'-segment_format_options',
'mpegts_flags=mpegts_copyts=1',
'-max_muxing_queue_size',
'400',
'-y',
'-method', 'PUT'
'-method',
'PUT'
);
} else {
output.options.push(
'-f', 'hls',
'-start_number', '0',
'-hls_time', '' + parseInt(control.hls.segmentDuration),
'-hls_list_size', '' + parseInt(control.hls.listSize),
'-hls_flags', 'append_list+delete_segments+program_date_time',
'-hls_delete_threshold', '4',
'-hls_segment_filename', `{memfs}/${channel.channelid}_%04d.ts`,
'-segment_format_options', 'mpegts_flags=mpegts_copyts=1',
'-max_muxing_queue_size', '400',
'-f',
'hls',
'-start_number',
'0',
'-hls_time',
'' + parseInt(control.hls.segmentDuration),
'-hls_list_size',
'' + parseInt(control.hls.listSize),
'-hls_flags',
'append_list+delete_segments+program_date_time',
'-hls_delete_threshold',
'4',
'-hls_segment_filename',
`{memfs}/${channel.channelid}_%04d.ts`,
'-segment_format_options',
'mpegts_flags=mpegts_copyts=1',
'-max_muxing_queue_size',
'400',
'-y',
'-method', 'PUT'
'-method',
'PUT'
);
};
}
} else {
// Low Latency HLS
output.address = `{memfs}/${channel.channelid}.mpd`;