rebroadcast: simplify prebuffer sync frame search, remove dead code...

koush · Jul 22, 2023 · 2f3529b · 2f3529b
1 parent 2501d14
commit 2f3529b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 22 deletions.
diff --git a/common/src/rtsp-server.ts b/common/src/rtsp-server.ts
@@ -195,35 +195,17 @@ export function createRtspParser(options?: StreamParserOptions): RtspStreamParse
             '-f', 'rtsp',
         ],
         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) || findH264NaluType(streamChunk, H264_NAL_TYPE_IDR)) {
-                    foundIndex = prebufferIndex;
-                    break;
+                    return streamChunks.slice(prebufferIndex);
                 }
             }
 
-            if (foundIndex !== undefined)
-                return createSyncFrame();
-
             // oh well!
         },
         sdp: new Promise<string>(r => resolve = r),

diff --git a/plugins/prebuffer-mixin/package-lock.json b/plugins/prebuffer-mixin/package-lock.json
diff --git a/plugins/prebuffer-mixin/package.json b/plugins/prebuffer-mixin/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/prebuffer-mixin",
-   "version": "0.9.96",
+   "version": "0.9.97",
    "description": "Video Stream Rebroadcast, Prebuffer, and Management Plugin for Scrypted.",
    "author": "Scrypted",
    "license": "Apache-2.0",