-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Fix: More correct switching of stream channels for RTSP2Web and Go2RTC with saving the selection in cookies on Watch page #4383
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
…RTC (monitor.js) Probably, in the future it is necessary to rename "RTSP2WebStream" for example to "StreamSource"
…ser string (watch.php) If this parameter is not found in session cookies or browser string, then the default from monitor settings is applied. streamQualitySelected is now processed via validHtmlStr()
…channel (watch.js) Switching the visibility of the StreamQuality and StreamChannel selectors has been moved to a separate function manageStreamQualityVisibility() taking into account the current player The selected streamChannel is saved in cookies
…hannel value and a string, including an empty one. (MonitorStream.js)
For Montage page everything is a bit more complicated... |
…tings, as it was before (MonitorStream.js) Added support for streamChannel = 'default' for Go2RTC
Now the Montage page uses the channel specified in the monitor, including for go2rtc |
…evious monitor that the current monitor does not have. (watch.js) And renamed manageRTSP2WebChannelStream() function to manageChannelStream()
I added a channel stream check when switching to another monitor. There is still a lot of work to do related to switching players and channels, but I think it is worth considering this PR and then systematically making other changes. |
I made the players switch when selecting the next/previous camera, as you wanted. |
Now I have definitely completed this PR :) |
…h player is used in the "Auto" mode (MonitorStream.js)
It seems like all switching now works correctly. |
… uses translation 'PlayerDisabledInMonitorSettings' => 'The player is disabled in the monitor settings.',
…ed before starting (watch.js)
Now the selected channel is saved in cookies.
But the saved channel is applied to any monitor, not to a specific one. Let it be like this for now. It's better than what's happening now with the collapse....
Later, a new solution will need to be developed.
You can also pass the channel in the browser line via
streamChannel=0 или streamChannel=secondary
The "RTSP2WebStream" setting is now visible for both RTSP2Web and Go2RTC
Probably, in the future it is necessary to rename "RTSP2WebStream" for example to "StreamSource"
Closed #4373 #4381