[x265-commits] [x265] Fixed the --me 4 cli option error

[sairam at multicorewareinc.com]

details:   http://hg.videolan.org/x265/rev/cb83e2f93592
branches:  
changeset: 4454:cb83e2f93592
user:      sairam at multicorewareinc.com
date:      Tue Oct 15 11:51:00 2013 +0530
description:
Fixed the --me 4 cli option error
Subject: [x265] pixel: fix 16bpp build

details:   http://hg.videolan.org/x265/rev/bbe95ece093f
branches:  
changeset: 4455:bbe95ece093f
user:      Steve Borho <steve at borho.org>
date:      Tue Oct 15 02:09:58 2013 -0500
description:
pixel: fix 16bpp build
Subject: [x265] ipfilter: Fix for 16bpp build

details:   http://hg.videolan.org/x265/rev/1a85d8814346
branches:  
changeset: 4456:1a85d8814346
user:      Deepthi Nandakumar <deepthi at multicorewareinc.com>
date:      Tue Oct 15 12:45:58 2013 +0530
description:
ipfilter: Fix for 16bpp build

diffstat:

 source/common/vec/ipfilter-sse41.cpp |  4 +++-
 source/common/vec/pixel-sse41.cpp    |  3 ---
 source/encoder/motion.cpp            |  4 +++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diffs (56 lines):

diff -r 8c8d5700d22b -r 1a85d8814346 source/common/vec/ipfilter-sse41.cpp
--- a/source/common/vec/ipfilter-sse41.cpp	Tue Oct 15 11:19:44 2013 +0530
+++ b/source/common/vec/ipfilter-sse41.cpp	Tue Oct 15 12:45:58 2013 +0530
@@ -34,6 +34,7 @@
 #include <assert.h>
 #include <string.h>
 
+#if !HIGH_BIT_DEPTH
 namespace {
 ALIGN_VAR_32(const uint16_t, c_512[16]) =
 {
@@ -670,7 +671,8 @@ void filterHorizontal_p_p(pixel *src, in
 }
 }
 
-#if HIGH_BIT_DEPTH
+#else
+
 #define INSTRSET 5
 #include "vectorclass.h"
 namespace {
diff -r 8c8d5700d22b -r 1a85d8814346 source/common/vec/pixel-sse41.cpp
--- a/source/common/vec/pixel-sse41.cpp	Tue Oct 15 11:19:44 2013 +0530
+++ b/source/common/vec/pixel-sse41.cpp	Tue Oct 15 12:45:58 2013 +0530
@@ -5545,9 +5545,6 @@ extern void Setup_Vec_Pixel16Primitives_
 
 #if HIGH_BIT_DEPTH
 #define SETUP_PARTITION(W, H) \
-    p.sad[PARTITION_##W##x##H] = sad_##W<H>; \
-    p.sad_x3[PARTITION_##W##x##H] = sad_x3_##W<H>; \
-    p.sad_x4[PARTITION_##W##x##H] = sad_x4_##W<H>; \
     p.sse_sp[PARTITION_##W##x##H] = (pixelcmp_sp_t)sse_ss##W<H>; \
     p.sse_ss[PARTITION_##W##x##H] = sse_ss##W<H>
 #define SETUP_NONSAD(W, H) \
diff -r 8c8d5700d22b -r 1a85d8814346 source/encoder/motion.cpp
--- a/source/encoder/motion.cpp	Tue Oct 15 11:19:44 2013 +0530
+++ b/source/encoder/motion.cpp	Tue Oct 15 12:45:58 2013 +0530
@@ -732,8 +732,9 @@ me_hex2:
                 break;
             }
         }
+        break;
     }
-    break;
+
     case X265_FULL_SEARCH:
     {
         // dead slow exhaustive search, but at least it uses sad_x4()
@@ -767,6 +768,7 @@ me_hex2:
                     COST_MV(tmv.x, tmv.y);
             }
         }
+        break;
     }
 
     default: