[x265] [PATCH 04 of 29] scale1D_128to64: cleanup depricated primitive

[dnyaneshwar at multicorewareinc.com]

# HG changeset patch
# User Praveen Tiwari
# Date 1421045417 -19800
#      Mon Jan 12 12:20:17 2015 +0530
# Node ID 3caab705cfdf1d1d5549f0986bd9496d5fc606e1
# Parent  f3fd0d075bba2320ed8cc93df055b144b5a1b88e
scale1D_128to64: cleanup depricated primitive

diff -r f3fd0d075bba -r 3caab705cfdf source/common/pixel.cpp
--- a/source/common/pixel.cpp	Mon Jan 12 12:03:33 2015 +0530
+++ b/source/common/pixel.cpp	Mon Jan 12 12:20:17 2015 +0530
@@ -629,20 +629,6 @@
     }
 }
 
-void scale1D_128to64(pixel* dst, const pixel* src, intptr_t /*stride*/)
-{
-    int x;
-
-    for (x = 0; x < 128; x += 2)
-    {
-        pixel pix0 = src[(x + 0)];
-        pixel pix1 = src[(x + 1)];
-        int sum = pix0 + pix1;
-
-        dst[x >> 1] = (pixel)((sum + 1) >> 1);
-    }
-}
-
 void scale1D_128to64_new(pixel *dst, const pixel *src, intptr_t /*stride*/)
 {
     int x;
@@ -1391,7 +1377,6 @@
     p.weight_pp = weight_pp_c;
     p.weight_sp = weight_sp_c;
 
-    p.scale1D_128to64 = scale1D_128to64;
     p.scale1D_128to64_new = scale1D_128to64_new;
     p.scale2D_64to32 = scale2D_64to32;
     p.frameInitLowres = frame_init_lowres_core;
diff -r f3fd0d075bba -r 3caab705cfdf source/common/primitives.h
--- a/source/common/primitives.h	Mon Jan 12 12:03:33 2015 +0530
+++ b/source/common/primitives.h	Mon Jan 12 12:20:17 2015 +0530
@@ -255,7 +255,6 @@
     intra_pred_new_t      intra_pred_new[NUM_INTRA_MODE][NUM_TR_SIZE];
     intra_allangs_t       intra_pred_allangs[NUM_TR_SIZE];         /* todo: move to CU */
     intra_allangs_new_t   intra_pred_allangs_new[NUM_TR_SIZE];
-    scale_t               scale1D_128to64;
     scale_t               scale1D_128to64_new;
     scale_t               scale2D_64to32;
 
diff -r f3fd0d075bba -r 3caab705cfdf source/common/x86/asm-primitives.cpp
--- a/source/common/x86/asm-primitives.cpp	Mon Jan 12 12:03:33 2015 +0530
+++ b/source/common/x86/asm-primitives.cpp	Mon Jan 12 12:20:17 2015 +0530
@@ -1384,7 +1384,6 @@
     }
     if (cpuMask & X265_CPU_SSSE3)
     {
-        p.scale1D_128to64 = x265_scale1D_128to64_ssse3;
         p.scale1D_128to64_new = x265_scale1D_128to64_new_ssse3;
         p.scale2D_64to32 = x265_scale2D_64to32_ssse3;
 
@@ -1446,7 +1445,6 @@
         p.quant = x265_quant_avx2;
         p.nquant = x265_nquant_avx2;
         p.dequant_normal  = x265_dequant_normal_avx2;
-        p.scale1D_128to64 = x265_scale1D_128to64_avx2;
         p.scale1D_128to64_new = x265_scale1D_128to64_new_avx2;
         p.cu[BLOCK_4x4].cpy1Dto2D_shl = x265_cpy1Dto2D_shl_4_avx2;
         p.cu[BLOCK_8x8].cpy1Dto2D_shl = x265_cpy1Dto2D_shl_8_avx2;
@@ -1604,7 +1602,6 @@
 
         INTRA_ANG_SSSE3(ssse3);
 
-        p.scale1D_128to64 = x265_scale1D_128to64_ssse3;
         p.scale1D_128to64_new = x265_scale1D_128to64_new_ssse3;
         p.scale2D_64to32 = x265_scale2D_64to32_ssse3;
         SAD_X3(ssse3);
@@ -1815,7 +1812,6 @@
         p.chroma[X265_CSP_I422].pu[CHROMA422_16x24].copy_ss = x265_blockcopy_ss_16x24_avx;
         p.chroma[X265_CSP_I422].pu[CHROMA422_16x32].copy_ss = x265_blockcopy_ss_16x32_avx;
         p.chroma[X265_CSP_I422].pu[CHROMA422_16x64].copy_ss = x265_blockcopy_ss_16x64_avx;
-        p.scale1D_128to64 = x265_scale1D_128to64_avx2;
         p.scale1D_128to64_new = x265_scale1D_128to64_new_avx2;
 
         p.weight_pp = x265_weight_pp_avx2;
diff -r f3fd0d075bba -r 3caab705cfdf source/test/pixelharness.cpp
--- a/source/test/pixelharness.cpp	Mon Jan 12 12:03:33 2015 +0530
+++ b/source/test/pixelharness.cpp	Mon Jan 12 12:20:17 2015 +0530
@@ -1557,15 +1557,6 @@
         }
     }
 
-    if (opt.scale1D_128to64)
-    {
-        if (!check_scale_pp(ref.scale1D_128to64, opt.scale1D_128to64))
-        {
-            printf("scale1D_128to64 failed!\n");
-            return false;
-        }
-    }
-
     if (opt.scale1D_128to64_new)
     {
         if (!check_scale_pp_new(ref.scale1D_128to64_new, opt.scale1D_128to64_new))
@@ -1955,12 +1946,6 @@
         REPORT_SPEEDUP(opt.frameInitLowres, ref.frameInitLowres, pbuf2, pbuf1, pbuf2, pbuf3, pbuf4, 64, 64, 64, 64);
     }
 
-    if (opt.scale1D_128to64)
-    {
-        HEADER0("scale1D_128to64");
-        REPORT_SPEEDUP(opt.scale1D_128to64, ref.scale1D_128to64, pbuf2, pbuf1, 64);
-    }
-
     if (opt.scale1D_128to64_new)
     {
         HEADER0("scale1D_128to64_new");