✨ Add Motion Detection Functionality with ORB Algorithm

App.py

@@ -13,6 +13,7 @@ from rich.console import Console
 from rich.logging import RichHandler
 
 from Scripts.SAD import GetDifferenceRectangles
+from Scripts.ORB import DetectMotionWithOrb
 
 # ============================== #
 #          Core Settings         #
@@ -176,7 +177,7 @@ class Upscaler:
 		return OutputFrame, SimilarityPercentage, Rectangles, RegionLog, UseRegions
 
 	@spaces.GPU
-	def Process(self, InputVideo, InputModel, InputUseRegions, InputThreshold, InputMinPercentage, InputMaxRectangles, InputPadding, InputSegmentRows, InputSegmentColumns, InputFullFrameInterval, Progress=App.Progress()):
+	def Process(self, InputVideo, InputModel, InputUseRegions, InputThreshold, InputMinPercentage, InputMaxRectangles, InputPadding, InputSegmentRows, InputSegmentColumns, InputFullFrameInterval, InputMotionThreshold, Progress=App.Progress()):
 		if not InputVideo:
 			Logger.warning('❌ No Video Provided')
 			App.Warning('❌ No Video Provided')
@@ -214,6 +215,7 @@ class Upscaler:
 			CurrentFrameIndex += 1
 
 			ForceFull = False
+			CopyPrevUpscaled = False
 			if CurrentFrameIndex == 1 or not InputUseRegions:
 				ForceFull = True
 				PartialUpscaleCount = 0
@@ -221,6 +223,39 @@ class Upscaler:
 				ForceFull = True
 				PartialUpscaleCount = 0
 
+			if PrevFrame is not None:
+				IsMotion, TotalMagnitude, DirectionAngle = DetectMotionWithOrb(PrevFrame, Frame, InputMotionThreshold)
+				if IsMotion:
+					ForceFull = True
+					PartialUpscaleCount = 0
+					Logger.info(f'🟨 Frame {CurrentFrameIndex}: Motion Detected - Upscaling Full Frame')
+
+			if not ForceFull and PrevFrame is not None and UpscaledPrevFrame is not None:
+				DiffResult = GetDifferenceRectangles(
+					PrevFrame,
+					Frame,
+					Threshold=InputThreshold,
+					Rows=InputSegmentRows,
+					Columns=InputSegmentColumns,
+					Padding=InputPadding
+				)
+				SimilarityPercentage = DiffResult['SimilarPercentage']
+				if SimilarityPercentage == 100:
+					OutputFrame = UpscaledPrevFrame.copy()
+					RegionLog = '🟦'
+					UseRegions = False
+					Rectangles = []
+					Logger.info(f'{RegionLog} Frame {CurrentFrameIndex}: 100% Similar - Copied Previous Upscaled Frame')
+					FrameProgress += PerFrameProgress
+					Progress(FrameProgress, desc=f'📦 Processed Frame {CurrentFrameIndex}/{FrameCount}')
+					cv2.imwrite(f'{TempDir}/Upscaled_Frame_{CurrentFrameIndex:05d}.png', OutputFrame)
+					PrevFrame = Frame.copy()
+					UpscaledPrevFrame = OutputFrame.copy()
+					DeltaTime = time.time() - StartTime
+					Times.append(DeltaTime)
+					StartTime = time.time()
+					continue
+
 			if ForceFull:
 				OutputFrame = self.UpscaleFullFrame(Model, Frame)
 				SimilarityPercentage = 0
@@ -333,7 +368,9 @@ with App.Blocks(
 							- **Padding:** Adds extra pixels around detected regions to include out of bounds pixels.
 							- **Min Percentage:** If the similarity between frames is above this value, only regions are upscaled; otherwise, the full frame is upscaled.
 							- **Max Rectangles:** Limits the number of regions to process per frame for performance.
-							- **Segment Rows/Columns:** Controls the grid size for region detection. More segments allow finer detection but may increase processing time.
+							- **Segment Rows/Columns:** Controls the grid size for region detection. More segments allow finer detection but may increase processing time. Uses less Vram when used.
+				   			- **Full Frame Interval:** Forces a full-frame upscale every N frames. Set to 1 to always upscale the full frame. This is to prevent regions from glitching out.
+				   			- **Motion Threshold:** Controls how sensitive the motion detection is. Upscaling motion frames increases faulty regions. Lower = More strict
 						''')
 					with App.Group():
 						InputUseRegions = App.Checkbox(
@@ -406,6 +443,15 @@ with App.Blocks(
 							info='Force a full-frame upscale every N frames (set to 1 to always upscale full frame)',
 							interactive=False
 						)
+						InputMotionThreshold = App.Slider(
+							label='Motion Threshold',
+							value=1,
+							minimum=0,
+							maximum=10,
+							step=0.5,
+							info='Threshold for the motion detection algorithm to consider a frame as different',
+							interactive=False
+						)
 			SubmitButton = App.Button('🚀 Upscale Video')
 
 		with App.Column(show_progress=True):
@@ -425,13 +471,14 @@ with App.Blocks(
 			App.update(interactive=UseRegions),
 			App.update(interactive=UseRegions),
 			App.update(interactive=UseRegions),
+			App.update(interactive=UseRegions),
 			App.update(interactive=UseRegions)
 		)
 
 	InputUseRegions.change(
 		fn=ToggleRegionInputs,
 		inputs=[InputUseRegions],
-		outputs=[InputThreshold, InputMinPercentage, InputMaxRectangles, InputPadding, InputSegmentRows, InputSegmentColumns, InputFullFrameInterval],
+		outputs=[InputThreshold, InputMinPercentage, InputMaxRectangles, InputPadding, InputSegmentRows, InputSegmentColumns, InputFullFrameInterval, InputMotionThreshold],
 	)
 
 	SubmitButton.click(
@@ -446,7 +493,8 @@ with App.Blocks(
 			InputPadding,
 			InputSegmentRows,
 			InputSegmentColumns,
-			InputFullFrameInterval
+			InputFullFrameInterval,
+			InputMotionThreshold
 		],
 		outputs=[OutputVideo, OutputDownload],
 	)

Scripts/ORB.py

@@ -0,0 +1,28 @@
+import cv2
+import numpy as np
+
+def DetectMotionWithOrb(FrameOne, FrameTwo, MotionThreshold=1.0):
+    FrameOneGray = cv2.cvtColor(FrameOne, cv2.COLOR_BGR2GRAY)
+    FrameTwoGray = cv2.cvtColor(FrameTwo, cv2.COLOR_BGR2GRAY)
+    OrbDetector = cv2.ORB_create() #type: ignore
+    Keypoints1, Descriptors1 = OrbDetector.detectAndCompute(FrameOneGray, None)
+    Keypoints2, Descriptors2 = OrbDetector.detectAndCompute(FrameTwoGray, None)
+    if Descriptors1 is None or Descriptors2 is None:
+        return False, 0, 0
+    BfMatcher = cv2.BFMatcher(cv2.NORM_HAMMING, crossCheck=True)
+    Matches = BfMatcher.match(Descriptors1, Descriptors2)
+    Vectors = []
+    for Match in Matches:
+        Pt1 = Keypoints1[Match.queryIdx].pt
+        Pt2 = Keypoints2[Match.trainIdx].pt
+        Vector = (Pt2[0] - Pt1[0], Pt2[1] - Pt1[1])
+        Vectors.append(Vector)
+    if not Vectors:
+        return False, 0, 0
+    Vectors = np.array(Vectors)
+    AvgVector = np.mean(Vectors, axis=0)
+    AvgX, AvgY = AvgVector
+    TotalMagnitude = np.hypot(AvgX, AvgY)
+    DirectionAngle = np.degrees(np.arctan2(AvgY, AvgX))
+    IsMotion = TotalMagnitude >= MotionThreshold
+    return IsMotion, TotalMagnitude, DirectionAngle