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

Add ffmpeg6 support

Browse Source
This commit is contained in:
Ingo Oppermann 2024-02-05 11:08:06 +01:00
parent 92ce3b5ba7
commit 2c88c4dbde
No known key found for this signature in database
GPG Key ID: 2AB32426E9DD229E
3 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/version.js
View File

@ -1,7 +1,7 @@
import pkg from '../package.json';
const Core = '^16.11.0';
const FFmpeg = '^5.1.0';
const FFmpeg = '^5.1.0 || ^6.1.0';
const UI = pkg.bundle ? pkg.bundle : pkg.name + ' v' + pkg.version;
const Version = pkg.version;

34
src/views/Edit/Sources/Network.js
View File

@ -258,6 +258,23 @@ const createInputs = (settings, config, skills) => {
if (settings.general.analyzeduration_rtmp !== 5000000) {
input.options.push('-analyzeduration', settings.general.analyzeduration_rtmp);
}
if (ffmpeg_version === 6) {
const codecs = [];
if (skills.codecs.video.hevc?.length > 0) {
codecs.push('hvc1');
}
if (skills.codecs.video.av1?.length > 0) {
codecs.push('av01');
}
if (skills.codecs.video.vp9?.length > 0) {
codecs.push('vp09');
}
if (codecs.length !== 0) {
input.options.push('-rtmp_enhanced_codecs', codecs.join(','));
}
}
} else if (settings.push.type === 'srt') {
if (settings.general.analyzeduration !== 5000000) {
input.options.push('-analyzeduration', settings.general.analyzeduration);
@ -272,6 +289,23 @@ const createInputs = (settings, config, skills) => {
if (settings.general.analyzeduration_rtmp !== 5000000) {
input.options.push('-analyzeduration', settings.general.analyzeduration_rtmp);
}
if (ffmpeg_version === 6) {
const codecs = [];
if (skills.codecs.video.hevc?.length > 0) {
codecs.push('hvc1');
}
if (skills.codecs.video.av1?.length > 0) {
codecs.push('av01');
}
if (skills.codecs.video.vp9?.length > 0) {
codecs.push('vp09');
}
if (codecs.length !== 0) {
input.options.push('-rtmp_enhanced_codecs', codecs.join(','));
}
}
} else {
if (settings.general.analyzeduration !== 5000000) {
input.options.push('-analyzeduration', settings.general.analyzeduration);

12
src/views/Edit/Sources/Network.test.js
View File

@ -14,6 +14,14 @@ const $skills_ffmpeg6 = {
protocols: {
input: ['http', 'https', 'rtmp', 'rtmps', 'srt'],
},
codecs: {
audio: {},
video: {
av1: ['librav1e'],
hevc: ['hevc'],
vp9: ['libvpx-vp9'],
},
},
};
const $skills_ffmpeg5 = {
@ -241,7 +249,7 @@ pullmatrix.tests = [
skills: $skills_ffmpeg6,
input: {
address: 'rtmp://admin:foobar@127.0.0.1/live/stream',
options: ['-fflags', '+genpts', '-thread_queue_size', 512, '-analyzeduration', 3000000],
options: ['-fflags', '+genpts', '-thread_queue_size', 512, '-analyzeduration', 3000000, '-rtmp_enhanced_codecs', 'hvc1,av01,vp09'],
},
},
{
@ -438,7 +446,7 @@ pushmatrix.tests = [
config: $config,
input: {
address: '{rtmp,name=external.stream}',
options: ['-fflags', '+genpts', '-thread_queue_size', 512, '-analyzeduration', 3000000],
options: ['-fflags', '+genpts', '-thread_queue_size', 512, '-analyzeduration', 3000000, '-rtmp_enhanced_codecs', 'hvc1,av01,vp09'],
},
},
{