From 181fb52f08b803de19af6e6c8569fff03ca74249 Mon Sep 17 00:00:00 2001
From: Arthur Moore <Arthur.Moore.git@cd-net.net>
Date: Tue, 10 Mar 2015 23:21:06 -0400
Subject: [PATCH] Simplified IFB filter loops

---
 src/filters/new_interframe.cpp | 64 +++++++++++++++-------------------
 1 file changed, 29 insertions(+), 35 deletions(-)

diff --git a/src/filters/new_interframe.cpp b/src/filters/new_interframe.cpp
index d8ee856f..7c8444ca 100644
--- a/src/filters/new_interframe.cpp
+++ b/src/filters/new_interframe.cpp
@@ -49,33 +49,30 @@ void SmartIB::run(u8 *srcPtr, int starty, int height)
     //Actual width needs to take into account the +1 border
     unsigned int width = getWidth() +1;
 
-  u32 *src0 = (u32 *)srcPtr + starty * width;
-  u32 *src1 = (u32 *)frm1 + starty * width;
-  u32 *src2 = (u32 *)frm2 + starty * width;
-  u32 *src3 = (u32 *)frm3 + starty * width;
+    u32 *src0 = (u32 *)srcPtr + starty * width;
+    u32 *src1 = (u32 *)frm1 + starty * width;
+    u32 *src2 = (u32 *)frm2 + starty * width;
+    u32 *src3 = (u32 *)frm3 + starty * width;
 
-  u32 colorMask = 0xfefefe;
+    u32 colorMask = 0xfefefe;
 
-  int pos = 0;
-
-  for (int j = 0; j < height;  j++)
-    for (int i = 0; i < width; i++) {
-      u32 color = src0[pos];
-      src0[pos] =
-        (src1[pos] != src2[pos]) &&
-        (src3[pos] != color) &&
-        ((color == src2[pos]) || (src1[pos] == src3[pos]))
-        ? (((color & colorMask) >> 1) + ((src1[pos] & colorMask) >> 1)) :
-        color;
-      src3[pos] = color; /* oldest buffer now holds newest frame */
-      pos++;
+    for (int i = 0; i < width*height;  i++)
+    {
+        u32 color = src0[i];
+        src0[i] =
+            (src1[i] != src2[i]) &&
+            (src3[i] != color) &&
+            ((color == src2[i]) || (src1[i] == src3[i]))
+                ? (((color & colorMask) >> 1) + ((src1[i] & colorMask) >> 1)) :
+                color;
+        src3[i] = color; /* oldest buffer now holds newest frame */
     }
 
-  /* Swap buffers around */
-  u8 *temp = frm1;
-  frm1 = frm3;
-  frm3 = frm2;
-  frm2 = temp;
+    /* Swap buffers around */
+    u8 *temp = frm1;
+    frm1 = frm3;
+    frm3 = frm2;
+    frm2 = temp;
 }
 
 
@@ -107,19 +104,16 @@ void MotionBlurIB::run(u8 *srcPtr, int starty, int height)
     //Actual width needs to take into account the +1 border
     unsigned int width = getWidth() +1;
 
-  u32 *src0 = (u32 *)srcPtr + starty * width;
-  u32 *src1 = (u32 *)frm1 + starty * width;
+    u32 *src0 = (u32 *)srcPtr + starty * width;
+    u32 *src1 = (u32 *)frm1 + starty * width;
 
-  u32 colorMask = 0xfefefe;
+    u32 colorMask = 0xfefefe;
 
-  int pos = 0;
-
-  for (int j = 0; j < height;  j++)
-    for (int i = 0; i < width; i++) {
-      u32 color = src0[pos];
-      src0[pos] = (((color & colorMask) >> 1) +
-                   ((src1[pos] & colorMask) >> 1));
-      src1[pos] = color;
-      pos++;
+    for (int i = 0; i < width*height;  i++)
+    {
+        u32 color = src0[i];
+        src0[i] = (((color & colorMask) >> 1) +
+                  ((src1[i] & colorMask) >> 1));
+        src1[i] = color;
     }
 }