Add object detection, tracking, mobile notifications, and search to any security camera.
load multiple segments ahead
roryclearcd8553da30d6
diff --git a/clearcam/ViewController.m b/clearcam/ViewController.mindex 21ef2f2..aeecb0e 100644--- a/clearcam/ViewController.m+++ b/clearcam/ViewController.m@@ -476,7 +476,7 @@ NSMutableDictionary *classColorMap;if (!success) [self finishRecording];}NSTimeInterval elapsedTime = CMTimeGetSeconds(self.currentTime);- if (elapsedTime >= 10.0) { // todo, takes a little time to change+ if (elapsedTime >= 1.0) { // todo, takes a little time to change[self finishRecording];}}diff --git a/clearcam/player.html b/clearcam/player.htmlindex 4c336f5..d15a24a 100644--- a/clearcam/player.html+++ b/clearcam/player.html@@ -113,8 +113,15 @@<body><div id="videoContainer"><div class="video-wrapper">- <video id="videoPlayer1" playsinline webkit-playsinline muted></video>- <video id="videoPlayer2" playsinline webkit-playsinline muted style="display: none;"></video>+ <video class="videoPlayer" playsinline webkit-playsinline muted></video>+ <video class="videoPlayer" playsinline webkit-playsinline muted style="display: none;"></video>+ <video class="videoPlayer" playsinline webkit-playsinline muted style="display: none;"></video>+ <video class="videoPlayer" playsinline webkit-playsinline muted style="display: none;"></video>+ <video class="videoPlayer" playsinline webkit-playsinline muted style="display: none;"></video>+ <video class="videoPlayer" playsinline webkit-playsinline muted style="display: none;"></video>+ <video class="videoPlayer" playsinline webkit-playsinline muted style="display: none;"></video>+ <video class="videoPlayer" playsinline webkit-playsinline muted style="display: none;"></video>+ <video class="videoPlayer" playsinline webkit-playsinline muted style="display: none;"></video><div id="controls"><div class="top-controls"><button id="playPauseBtn">@@ -141,6 +148,7 @@</div></div></div>+<script>const yolo_classes = [["person", "red"], ["bicycle", "green"], ["car", "blue"],@@ -188,17 +196,17 @@let totalDuration = 0;let retryTimeout = 2000;- const videoPlayer1 = document.getElementById('videoPlayer1');- const videoPlayer2 = document.getElementById('videoPlayer2');++ const videoPlayers = document.querySelectorAll(".videoPlayer");+ let is_prepared = new Array(videoPlayers.length).fill(false); //todo, store in one objconst playPauseBtn = document.getElementById('playPauseBtn');const playIcon = document.getElementById('playIcon');const pauseIcon = document.getElementById('pauseIcon');const progressBar = document.getElementById('progress-bar');const progress = document.getElementById('progress');const timeDisplay = document.getElementById('timeDisplay');-- let currentVideo = videoPlayer1;- let nextVideo = videoPlayer2;++ let video_index = 0;let currentSegment = 0;let isPlaying = false;let isScrubbing = false;@@ -251,11 +259,10 @@adjustedStartTimestamp = startTimestamp;}- const currentTime = adjustedStartTimestamp + currentVideo.currentTime + segments[currentSegment].cumulativeStart;+ const currentTime = adjustedStartTimestamp + videoPlayers[video_index].currentTime + segments[currentSegment].cumulativeStart;let frames = segments[currentSegment].frames;let show_new = false;- //alert(`${currentTime} ${frames[shape_idx+1].timeStamp}`);while((shape_idx+1 < frames.length) && (currentTime > frames[shape_idx+1].timeStamp)) {shape_idx += 1;show_new = true;@@ -289,26 +296,24 @@function togglePlayPause() {if (isPlaying) {- currentVideo.pause();+ videoPlayers[video_index].pause();playIcon.style.display = 'block';pauseIcon.style.display = 'none';isPlaying = false;} else {- currentVideo.play();+ videoPlayers[video_index].play();playIcon.style.display = 'none';pauseIcon.style.display = 'block';isPlaying = true;}}- currentVideo.addEventListener('click', togglePlayPause);- nextVideo.addEventListener('click', togglePlayPause);playPauseBtn.addEventListener('click', togglePlayPause);videoContainer.addEventListener('dblclick', (e) => {const containerWidth = videoContainer.clientWidth;const x = e.clientX;- const currentTime = currentVideo.currentTime + segments[currentSegment].cumulativeStart;+ const currentTime = videoPlayers[video_index].currentTime + segments[currentSegment].cumulativeStart;if (x > containerWidth / 2) {// Double-tap/click on the right side to skip forward 10s@@ -324,17 +329,18 @@});function seekToTime(time) {+ is_prepared = new Array(videoPlayers.length).fill(false);let targetSegment = segments.findIndex(segment => time < segment.cumulativeStart + segment.duration);targetSegment = targetSegment === -1 ? segments.length - 1 : targetSegment;currentSegment = targetSegment;- currentVideo.src = segments[currentSegment].url;- currentVideo.currentTime = time - segments[currentSegment].cumulativeStart;+ videoPlayers[video_index].src = segments[currentSegment].url;+ videoPlayers[video_index].currentTime = time - segments[currentSegment].cumulativeStart;shape_idx = 0;clearBoundingBoxes();if (isPlaying) {- currentVideo.play();+ videoPlayers[video_index].play();}}@@ -383,7 +389,7 @@updateTimeline();preloadNextSegments();- if (currentVideo.currentTime + segments[currentSegment].cumulativeStart === 0 ||+ if (videoPlayers[video_index].currentTime + segments[currentSegment].cumulativeStart === 0 ||(isPlaying && isWaitingForNextSegment && segments.length < currentSegment + 1)) {playSegment();}@@ -419,10 +425,10 @@if (targetSegment >= 0 && targetSegment < segments.length) {currentSegment = targetSegment;- currentVideo.src = segments[currentSegment].url;- currentVideo.currentTime = targetTime;+ videoPlayers[video_index].src = segments[currentSegment].url;+ videoPlayers[video_index].currentTime = targetTime;if (wasPlayingBeforeScrub) {- currentVideo.play();+ videoPlayers[video_index].play();}preloadNextSegments();}@@ -431,7 +437,7 @@}function startScrubbing(e) {- wasPlayingBeforeScrub = !currentVideo.paused;+ wasPlayingBeforeScrub = !videoPlayers[video_index].paused;isScrubbing = true;scrub(e);document.addEventListener("mousemove", scrubWhileDragging);@@ -449,38 +455,46 @@function stopScrubbing() {isScrubbing = false;if (!wasPlayingBeforeScrub) {- currentVideo.pause();+ videoPlayers[video_index].pause();}document.removeEventListener("mousemove", scrubWhileDragging);document.removeEventListener("mouseup", stopScrubbing);document.removeEventListener("touchmove", scrubWhileDragging);document.removeEventListener("touchend", stopScrubbing);}-+function preloadNextSegments() {- if (currentSegment + 1 < segments.length) {- nextVideo.src = segments[currentSegment + 1].url;- nextVideo.load(); // Force load for mobile- nextVideo.preload = 'auto';- nextVideo.play().then(() => {- nextVideo.pause();- nextVideo.currentTime = 0; // Ensure it's ready to start instantly- }).catch(err => console.warn("Preload error:", err));+ let x = 1;+ while(x < videoPlayers.length){+ let current_x = x;+ if (currentSegment + x < segments.length) {+ if(is_prepared[(video_index + x) % videoPlayers.length] === false){+ videoPlayers[(video_index + x) % videoPlayers.length].src = segments[currentSegment + x].url;+ videoPlayers[(video_index + x) % videoPlayers.length].load(); // Force load for mobile+ videoPlayers[(video_index + x) % videoPlayers.length].preload = 'auto';+ videoPlayers[(video_index + x) % videoPlayers.length].play().then(() => {+ videoPlayers[(video_index + current_x) % videoPlayers.length].pause();+ videoPlayers[(video_index + current_x) % videoPlayers.length].currentTime = 0;+ is_prepared[(video_index + x) % videoPlayers.length] = true;+ }).catch(err => console.warn("Preload error:", err));+ }+ }+ x++;}}-+function playSegment() {if (segments.length > 0) {- currentVideo.src = segments[currentSegment].url;- currentVideo.currentTime = 0;- currentVideo.style.display = "block";- nextVideo.style.display = "none";-- currentVideo.play();+ videoPlayers[video_index].src = segments[currentSegment].url;+ videoPlayers[video_index].currentTime = 0;+ videoPlayers[video_index].style.display = "block";+ for(let i = 1; i < videoPlayers.length; i++){+ videoPlayers[(video_index + i) % videoPlayers.length].style.display = "none";+ }+ videoPlayers[video_index].play();isPlaying = true;playIcon.style.display = "none";pauseIcon.style.display = "block";-preloadNextSegments();}}@@ -488,17 +502,15 @@function switchToNextSegment() {if (currentSegment + 1 < segments.length) {currentSegment++;- let temp = currentVideo;- currentVideo = nextVideo;- nextVideo = temp;-- nextVideo.style.display = "none";- currentVideo.style.display = "block";-- currentVideo.play().catch(() => {- retrySegment(currentVideo);+ is_prepared[video_index] = false;+ video_index = (video_index + 1) % videoPlayers.length;+ for(let i = 1; i < videoPlayers.length; i++){+ videoPlayers[(video_index + i) % videoPlayers.length].style.display = "none";+ }+ videoPlayers[video_index].style.display = "block";+ videoPlayers[video_index].play().catch(() => {+ retrySegment(videoPlayers[video_index]);});-setTimeout(() => preloadNextSegments(), 500); // Slightly earlier preloading for mobile} else {isWaitingForNextSegment = true;@@ -508,26 +520,26 @@function handleTimeUpdate() {updateTimeline();- if (!preloading && currentVideo.currentTime > currentVideo.duration - 5) {+ if (!preloading && videoPlayers[video_index].currentTime > videoPlayers[video_index].duration - 5) {preloading = true;preloadNextSegments();}}- currentVideo.addEventListener("timeupdate", handleTimeUpdate);setInterval(handleTimeUpdate, 50);- nextVideo.addEventListener("timeupdate", handleTimeUpdate);++ for(let i = 0; i < videoPlayers.length; i++) {+ videoPlayers[i].addEventListener("timeupdate", handleTimeUpdate);+ videoPlayers[i].addEventListener("ended", switchToNextSegment);+ videoPlayers[i].addEventListener("ended", switchToNextSegment);+ videoPlayers[i].addEventListener("error", () => retrySegment(videoPlayers[i]));+ videoPlayers[i].addEventListener('click', togglePlayPause);+ }progress.addEventListener("mousedown", startScrubbing);progress.addEventListener("touchstart", startScrubbing);- setInterval(fetchSegments, 1000);-- currentVideo.addEventListener("ended", switchToNextSegment);- nextVideo.addEventListener("ended", switchToNextSegment);-- currentVideo.addEventListener("error", () => retrySegment(currentVideo));- nextVideo.addEventListener("error", () => retrySegment(nextVideo));+ setInterval(fetchSegments, 500);const fullscreenBtn = document.getElementById('fullscreenBtn');@@ -572,9 +584,9 @@function handleVisibilityAndLoad() {if (isPlaying && segments.length > 0) {currentSegment = segments.length - 1;- currentVideo.src = segments[currentSegment].url;- currentVideo.currentTime = segments[currentSegment].duration;- currentVideo.play().catch(() => {});+ videoPlayers[video_index].src = segments[currentSegment].url;+ videoPlayers[video_index].currentTime = segments[currentSegment].duration;+ videoPlayers[video_index].play().catch(() => {});}}