mirror of
https://github.com/koush/scrypted.git
synced 2026-02-03 06:03:27 +00:00
rebroadcast: revert risky querystring change
This commit is contained in:
@@ -373,20 +373,10 @@ export class RtspClient extends RtspBase {
|
||||
fullUrl = path;
|
||||
}
|
||||
else {
|
||||
const u = new URL(fullUrl);
|
||||
u.pathname += (u.pathname.endsWith('/') ? '' : '/') + path;
|
||||
fullUrl = u.toString();
|
||||
|
||||
// 9/27-2022
|
||||
// this seems wrong actually. even though ffmpeg does deliver
|
||||
// query strings after paths, that does not seem to be behavior that is accepted
|
||||
// on all cameras. rather, amcrest cameras seem to support this quirk.
|
||||
|
||||
// early 2021
|
||||
// strangely, relative RTSP urls do not behave like expected from an HTTP-ish server.
|
||||
// ffmpeg will happily suffix path segments after query strings:
|
||||
// SETUP rtsp://localhost:5554/cam/realmonitor?channel=1&subtype=0/trackID=0 RTSP/1.0
|
||||
// fullUrl += (fullUrl.endsWith('/') ? '' : '/') + path;
|
||||
fullUrl += (fullUrl.endsWith('/') ? '' : '/') + path;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,10 @@
|
||||
.DS_Store
|
||||
out/
|
||||
node_modules/
|
||||
dist/*.map
|
||||
*.map
|
||||
fs
|
||||
src
|
||||
.vscode
|
||||
dist/*.js
|
||||
.venv
|
||||
tsconfig.json
|
||||
|
||||
4
plugins/prebuffer-mixin/package-lock.json
generated
4
plugins/prebuffer-mixin/package-lock.json
generated
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "@scrypted/prebuffer-mixin",
|
||||
"version": "0.9.42",
|
||||
"version": "0.9.43",
|
||||
"lockfileVersion": 2,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "@scrypted/prebuffer-mixin",
|
||||
"version": "0.9.42",
|
||||
"version": "0.9.43",
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@scrypted/common": "file:../../common",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@scrypted/prebuffer-mixin",
|
||||
"version": "0.9.42",
|
||||
"version": "0.9.43",
|
||||
"description": "Video Stream Rebroadcast, Prebuffer, and Management Plugin for Scrypted.",
|
||||
"author": "Scrypted",
|
||||
"license": "Apache-2.0",
|
||||
|
||||
Reference in New Issue
Block a user