neoris/dizquetv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change GAP.

Browse Source
This commit is contained in:
vexorian 2023-11-12 12:47:22 -04:00
parent 4b80c6f0e5
commit c8a9c9ea53
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/constants.js
View File

@ -5,6 +5,11 @@ module.exports = {
TVGUIDE_MAXIMUM_FLEX_DURATION : 6 * 60 * 60 * 1000, TVGUIDE_MAXIMUM_FLEX_DURATION : 6 * 60 * 60 * 1000,
TOO_FREQUENT: 1000, TOO_FREQUENT: 1000,
// Duration of things like the loading screen and the interlude (the black
// frame that appears between videos). The theory is that we don't need
// it to last longer than one frame, but I am not so sure.
GAP_DURATION: 83,
//when a channel is forcibly stopped due to an update, let's mark it as active //when a channel is forcibly stopped due to an update, let's mark it as active
// for a while during the transaction just in case. // for a while during the transaction just in case.
CHANNEL_STOP_SHIELD : 5000, CHANNEL_STOP_SHIELD : 5000,

9
src/ffmpeg.js
View File

@ -198,8 +198,9 @@ class FFMPEG extends events.EventEmitter {
iW = this.wantedW; iW = this.wantedW;
iH = this.wantedH; iH = this.wantedH;
let durstr = `duration=${streamStats.duration}ms`;
if (this.audioOnly !== true) { if (this.audioOnly !== true) {
ffmpegArgs.push("-r" , "24");
let pic = null; let pic = null;
//does an image to play exist? //does an image to play exist?
@ -216,6 +217,7 @@ class FFMPEG extends events.EventEmitter {
} }
if (pic != null) { if (pic != null) {
ffmpegArgs.push("-r" , "24");
ffmpegArgs.push( ffmpegArgs.push(
'-i', pic, '-i', pic,
); );
@ -235,6 +237,8 @@ class FFMPEG extends events.EventEmitter {
//this tune apparently makes the video compress better //this tune apparently makes the video compress better
// when it is the same image // when it is the same image
stillImage = true; stillImage = true;
this.volumePercent = Math.min(70, this.volumePercent);
} else if (this.opts.errorScreen == 'static') { } else if (this.opts.errorScreen == 'static') {
ffmpegArgs.push( ffmpegArgs.push(
'-f', 'lavfi', '-f', 'lavfi',
@ -269,7 +273,7 @@ class FFMPEG extends events.EventEmitter {
videoComplex = `;realtime[videox]`; videoComplex = `;realtime[videox]`;
} }
} }
let durstr = `duration=${streamStats.duration}ms`;
if (typeof(streamUrl.errorTitle) !== 'undefined') { if (typeof(streamUrl.errorTitle) !== 'undefined') {
//silent //silent
audioComplex = `;aevalsrc=0:${durstr}[audioy]`; audioComplex = `;aevalsrc=0:${durstr}[audioy]`;
@ -549,6 +553,7 @@ class FFMPEG extends events.EventEmitter {
if (this.hasBeenKilled) { if (this.hasBeenKilled) {
return ; return ;
} }
//console.log(this.ffmpegPath + " " + ffmpegArgs.join(" ") );
this.ffmpeg = spawn(this.ffmpegPath, ffmpegArgs, { stdio: ['ignore', 'pipe', (doLogs?process.stderr:"ignore") ] } ); this.ffmpeg = spawn(this.ffmpegPath, ffmpegArgs, { stdio: ['ignore', 'pipe', (doLogs?process.stderr:"ignore") ] } );
if (this.hasBeenKilled) { if (this.hasBeenKilled) {
console.log("Send SIGKILL to ffmpeg"); console.log("Send SIGKILL to ffmpeg");

2
src/video.js
View File

@ -188,7 +188,7 @@ function video( channelService, fillerDB, db, programmingService, activeChannelS
let redirectChannels = []; let redirectChannels = [];
let upperBounds = []; let upperBounds = [];
const GAP_DURATION = 750; const GAP_DURATION = constants.GAP_DURATION;
if (isLoading) { if (isLoading) {
lineupItem = { lineupItem = {
type: 'loading', type: 'loading',