michael/scrypted
1
0
Fork 0
mirror of https://github.com/koush/scrypted.git synced 2026-02-12 10:02:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

common: rtsp server fixes

Browse Source
This commit is contained in:
Koushik Dutta
2022-05-08 22:01:07 -07:00
parent bb1ac01eb0
commit 27aff626ae
1 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
common/src/rtsp-server.ts
View File

@@ -91,25 +91,46 @@ export function createRtspParser(options?: StreamParserOptions): RtspStreamParse
],
findSyncFrame(streamChunks: StreamChunk[]) {
let foundIndex: number;
let nonVideo: {
[codec: string]: StreamChunk,
} = {};
const createSyncFrame = () => {
const ret = streamChunks.slice(foundIndex);
// for (const nv of Object.values(nonVideo)) {
// ret.unshift(nv);
// }
return ret;
}
for (let prebufferIndex = 0; prebufferIndex < streamChunks.length; prebufferIndex++) {
const streamChunk = streamChunks[prebufferIndex];
if (streamChunk.type !== 'h264') {
nonVideo[streamChunk.type] = streamChunk;
continue;
}
if (findH264NaluType(streamChunk, H264_NAL_TYPE_SPS))
foundIndex = prebufferIndex;
}
if (foundIndex !== undefined)
return streamChunks.slice(foundIndex);
return createSyncFrame();
nonVideo = {};
// some streams don't contain codec info, so find an idr frame instead.
for (let prebufferIndex = 0; prebufferIndex < streamChunks.length; prebufferIndex++) {
const streamChunk = streamChunks[prebufferIndex];
if (streamChunk.type !== 'h264') {
nonVideo[streamChunk.type] = streamChunk;
continue;
}
if (findH264NaluType(streamChunk, H264_NAL_TYPE_IDR))
foundIndex = prebufferIndex;
}
if (foundIndex !== undefined)
return streamChunks.slice(foundIndex);
return createSyncFrame();
// oh well!
},
@@ -596,7 +617,7 @@ export class RtspServer {
control: msection.control,
protocol: 'udp',
destination: parseInt(rtp),
codec: msection.codec,
codec: msection.codec || (msection.type === 'audio' ? 'pcm' : undefined),
}
}
else if (transport.includes('TCP')) {
@@ -608,7 +629,7 @@ export class RtspServer {
control: msection.control,
protocol: 'tcp',
destination: low,
codec: msection.codec,
codec: msection.codec || (msection.type === 'audio' ? 'pcm' : undefined),
}
}
}