Fix: Removed extra <source> line when using HLS (event.php)#4801
Open
IgorA100 wants to merge 2 commits intoZoneMinder:masterfrom
Open
Fix: Removed extra <source> line when using HLS (event.php)#4801IgorA100 wants to merge 2 commits intoZoneMinder:masterfrom
IgorA100 wants to merge 2 commits intoZoneMinder:masterfrom
Conversation
…lication/vnd.apple.mpegurl" (event.php) Отправить отзыв Боковые панели История Сохраненные Нажмите на вкладку Now there is no error when playing Possibly a partial fix for issue ZoneMinder#4757
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the classic skin’s event playback markup to use the proper HLS playlist MIME type and removes an additional <source> element when HLS is detected, aiming to clean up/standardize HLS playback in event.php.
Changes:
- Switch HLS
<source>MIME type fromapplication/x-mpegURLtoapplication/vnd.apple.mpegurl. - Remove the MP4
<source>element from the$has_hlsbranch (leaving only the HLS source when HLS is available).
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
378
to
381
| <?php if ($has_hls): ?> | ||
| <source src="<?php echo $hlsSrc; ?>" type="application/x-mpegURL"> | ||
| <source src="<?php echo $Event->getStreamSrc(array('mode'=>'mp4','format'=>'h264'),'&'); ?>" type="video/mp4"> | ||
| <source src="<?php echo $hlsSrc; ?>" type="application/vnd.apple.mpegurl"> | ||
| <?php else: ?> | ||
| <source src="<?php echo $Event->getStreamSrc(array('mode'=>'mp4','format'=>'h264'),'&'); ?>" type="video/mp4"> |
Contributor
Author
There was a problem hiding this comment.
@copilot
If $has_hls is true and we don't remove the extra line
<source src="<?php echo $Event->getStreamSrc(array('mode'=>'mp4','format'=>'h264'),'&'); ?>" type="video/mp4">
then view_video.php will also try to play the video, which will result in an error.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Also for the m3u8 playlist, I changed the context type to the correct "application/vnd.apple.mpegurl"