mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-05-24 14:36:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: drop DefaultVideo extension check from \$has_hls refs #4757

Browse Source 
The str_ends_with(\$Event->DefaultVideo(), '.m3u8') clause overrode the
user's codec choice for in-progress events: DefaultVideo is set to
'index.m3u8' by Event's constructor, so picking MP4 from the dropdown
still routed through HLS. Base \$has_hls solely on on-disk manifest
presence + codec being MP4HLS or auto. MJPEG already short-circuits
earlier via \$video_tag.

Reported by Copilot on PR #4835.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Isaac Connor
2026-05-16 18:15:19 -04:00
parent 2e83b8b074
commit 5c0532fe3b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
web/skins/classic/views/event.php
View File

@@ -355,13 +355,13 @@ if (file_exists($Event->Path().'/objdetect.jpg')) {
<?php
if ($video_tag) {
// Prefer HLS byte-range playback when the manifest exists on disk and the
// user picked MP4HLS / auto. Explicit MP4 means "play the mp4 file directly"
// and must stay non-HLS even when a manifest is available. Closed events
// recorded before DefaultVideo was preserved as 'index.m3u8' still need to
// fall through here on auto.
// user picked MP4HLS / auto. Explicit MP4 must stay native ("play the mp4
// file directly"); explicit MJPEG never reaches here because $video_tag is
// false for it. DefaultVideo's extension is deliberately not consulted —
// in-progress events have DefaultVideo='index.m3u8' from the constructor,
// and using that as a signal would override the explicit MP4 choice.
$has_hls = file_exists($Event->Path() . '/index.m3u8')
&& (($codec == 'MP4HLS') || ($codec == 'auto')
|| str_ends_with($Event->DefaultVideo(), '.m3u8'));
&& (($codec == 'MP4HLS') || ($codec == 'auto'));
if ($has_hls) {
$Server = $Event->Server();
$hlsSrc = $Server->PathToIndex() . '?view=view_hls&amp;eid=' . $Event->Id();