]> git.sesse.net Git - x264/blobdiff - common/quant.c
Convert to a unified "dctcoeff" type for DCT data
[x264] / common / quant.c
index ad25824cad57b547dd966660dc6eb858645bdd7a..d3ba7e365855bfad74382857abd67878143089ea 100644 (file)
@@ -1,9 +1,10 @@
 /*****************************************************************************
  * quant.c: h264 encoder library
  *****************************************************************************
- * Copyright (C) 2005 x264 project
+ * Copyright (C) 2005-2008 x264 project
  *
- * Authors: Christian Heine <sennindemokrit@gmx.net>
+ * Authors: Loren Merritt <lorenm@u.washington.edu>
+ *          Christian Heine <sennindemokrit@gmx.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  *****************************************************************************/
 
 #include "common.h"
 
-#ifdef HAVE_MMXEXT
-#include "i386/quant.h"
+#ifdef HAVE_MMX
+#include "x86/quant.h"
 #endif
 #ifdef ARCH_PPC
 #   include "ppc/quant.h"
 #endif
+#ifdef ARCH_ARM
+#   include "arm/quant.h"
+#endif
 
-#define QUANT_ONE( coef, mf ) \
+#define QUANT_ONE( coef, mf, f ) \
 { \
     if( (coef) > 0 ) \
-        (coef) = ( f + (coef) * (mf) ) >> i_qbits; \
+        (coef) = (f + (coef)) * (mf) >> 16; \
     else \
-        (coef) = - ( ( f - (coef) * (mf) ) >> i_qbits ); \
+        (coef) = - ((f - (coef)) * (mf) >> 16); \
+    nz |= (coef); \
 }
 
-static void quant_8x8_core( int16_t dct[8][8], int quant_mf[8][8], int i_qbits, int f )
+static int quant_8x8( dctcoef dct[64], uint16_t mf[64], uint16_t bias[64] )
 {
-    int i;
-    for( i = 0; i < 64; i++ )
-        QUANT_ONE( dct[0][i], quant_mf[0][i] );
+    int nz = 0;
+    for( int i = 0; i < 64; i++ )
+        QUANT_ONE( dct[i], mf[i], bias[i] );
+    return !!nz;
 }
 
-static void quant_4x4_core( int16_t dct[4][4], int quant_mf[4][4], int i_qbits, int f )
+static int quant_4x4( dctcoef dct[16], uint16_t mf[16], uint16_t bias[16] )
 {
-    int i;
-    for( i = 0; i < 16; i++ )
-        QUANT_ONE( dct[0][i], quant_mf[0][i] );
+    int nz = 0;
+    for( int i = 0; i < 16; i++ )
+        QUANT_ONE( dct[i], mf[i], bias[i] );
+    return !!nz;
 }
 
-static void quant_4x4_dc_core( int16_t dct[4][4], int i_quant_mf, int i_qbits, int f )
+static int quant_4x4_dc( dctcoef dct[16], int mf, int bias )
 {
-    int i;
-    for( i = 0; i < 16; i++ )
-        QUANT_ONE( dct[0][i], i_quant_mf );
+    int nz = 0;
+    for( int i = 0; i < 16; i++ )
+        QUANT_ONE( dct[i], mf, bias );
+    return !!nz;
 }
 
-static void quant_2x2_dc_core( int16_t dct[2][2], int i_quant_mf, int i_qbits, int f )
+static int quant_2x2_dc( dctcoef dct[4], int mf, int bias )
 {
-    QUANT_ONE( dct[0][0], i_quant_mf );
-    QUANT_ONE( dct[0][1], i_quant_mf );
-    QUANT_ONE( dct[0][2], i_quant_mf );
-    QUANT_ONE( dct[0][3], i_quant_mf );
+    int nz = 0;
+    QUANT_ONE( dct[0], mf, bias );
+    QUANT_ONE( dct[1], mf, bias );
+    QUANT_ONE( dct[2], mf, bias );
+    QUANT_ONE( dct[3], mf, bias );
+    return !!nz;
 }
 
 #define DEQUANT_SHL( x ) \
-    dct[y][x] = ( dct[y][x] * dequant_mf[i_mf][y][x] ) << i_qbits
+    dct[x] = ( dct[x] * dequant_mf[i_mf][x] ) << i_qbits
 
 #define DEQUANT_SHR( x ) \
-    dct[y][x] = ( dct[y][x] * dequant_mf[i_mf][y][x] + f ) >> (-i_qbits)
+    dct[x] = ( dct[x] * dequant_mf[i_mf][x] + f ) >> (-i_qbits)
 
-static void dequant_4x4( int16_t dct[4][4], int dequant_mf[6][4][4], int i_qp )
+static void dequant_4x4( dctcoef dct[16], int dequant_mf[6][16], int i_qp )
 {
     const int i_mf = i_qp%6;
     const int i_qbits = i_qp/6 - 4;
-    int y;
 
     if( i_qbits >= 0 )
     {
-        for( y = 0; y < 4; y++ )
-        {
-            DEQUANT_SHL( 0 );
-            DEQUANT_SHL( 1 );
-            DEQUANT_SHL( 2 );
-            DEQUANT_SHL( 3 );
-        }
+        for( int i = 0; i < 16; i++ )
+            DEQUANT_SHL( i );
     }
     else
     {
         const int f = 1 << (-i_qbits-1);
-        for( y = 0; y < 4; y++ )
-        {
-            DEQUANT_SHR( 0 );
-            DEQUANT_SHR( 1 );
-            DEQUANT_SHR( 2 );
-            DEQUANT_SHR( 3 );
-        }
+        for( int i = 0; i < 16; i++ )
+            DEQUANT_SHR( i );
     }
 }
 
-static void dequant_8x8( int16_t dct[8][8], int dequant_mf[6][8][8], int i_qp )
+static void dequant_8x8( dctcoef dct[64], int dequant_mf[6][64], int i_qp )
 {
     const int i_mf = i_qp%6;
     const int i_qbits = i_qp/6 - 6;
-    int y;
 
     if( i_qbits >= 0 )
     {
-        for( y = 0; y < 8; y++ )
-        {
-            DEQUANT_SHL( 0 );
-            DEQUANT_SHL( 1 );
-            DEQUANT_SHL( 2 );
-            DEQUANT_SHL( 3 );
-            DEQUANT_SHL( 4 );
-            DEQUANT_SHL( 5 );
-            DEQUANT_SHL( 6 );
-            DEQUANT_SHL( 7 );
-        }
+        for( int i = 0; i < 64; i++ )
+            DEQUANT_SHL( i );
     }
     else
     {
         const int f = 1 << (-i_qbits-1);
-        for( y = 0; y < 8; y++ )
-        {
-            DEQUANT_SHR( 0 );
-            DEQUANT_SHR( 1 );
-            DEQUANT_SHR( 2 );
-            DEQUANT_SHR( 3 );
-            DEQUANT_SHR( 4 );
-            DEQUANT_SHR( 5 );
-            DEQUANT_SHR( 6 );
-            DEQUANT_SHR( 7 );
-        }
+        for( int i = 0; i < 64; i++ )
+            DEQUANT_SHR( i );
     }
 }
 
-void x264_mb_dequant_2x2_dc( int16_t dct[2][2], int dequant_mf[6][4][4], int i_qp )
+static void dequant_4x4_dc( dctcoef dct[16], int dequant_mf[6][16], int i_qp )
 {
-    const int i_qbits = i_qp/6 - 5;
+    const int i_qbits = i_qp/6 - 6;
 
     if( i_qbits >= 0 )
     {
-        const int i_dmf = dequant_mf[i_qp%6][0][0] << i_qbits;
-        dct[0][0] *= i_dmf;
-        dct[0][1] *= i_dmf;
-        dct[1][0] *= i_dmf;
-        dct[1][1] *= i_dmf;
+        const int i_dmf = dequant_mf[i_qp%6][0] << i_qbits;
+        for( int i = 0; i < 16; i++ )
+            dct[i] *= i_dmf;
     }
     else
     {
-        const int i_dmf = dequant_mf[i_qp%6][0][0];
-        // chroma DC is truncated, not rounded
-        dct[0][0] = ( dct[0][0] * i_dmf ) >> (-i_qbits);
-        dct[0][1] = ( dct[0][1] * i_dmf ) >> (-i_qbits);
-        dct[1][0] = ( dct[1][0] * i_dmf ) >> (-i_qbits);
-        dct[1][1] = ( dct[1][1] * i_dmf ) >> (-i_qbits);
+        const int i_dmf = dequant_mf[i_qp%6][0];
+        const int f = 1 << (-i_qbits-1);
+        for( int i = 0; i < 16; i++ )
+            dct[i] = ( dct[i] * i_dmf + f ) >> (-i_qbits);
     }
 }
 
-void x264_mb_dequant_4x4_dc( int16_t dct[4][4], int dequant_mf[6][4][4], int i_qp )
+static void x264_denoise_dct( dctcoef *dct, uint32_t *sum, uint16_t *offset, int size )
 {
-    const int i_qbits = i_qp/6 - 6;
-    int y;
-
-    if( i_qbits >= 0 )
+    for( int i = 1; i < size; i++ )
     {
-        const int i_dmf = dequant_mf[i_qp%6][0][0] << i_qbits;
-
-        for( y = 0; y < 4; y++ )
-        {
-            dct[y][0] *= i_dmf;
-            dct[y][1] *= i_dmf;
-            dct[y][2] *= i_dmf;
-            dct[y][3] *= i_dmf;
-        }
+        int level = dct[i];
+        int sign = level>>15;
+        level = (level+sign)^sign;
+        sum[i] += level;
+        level -= offset[i];
+        dct[i] = level<0 ? 0 : (level^sign)-sign;
     }
-    else
+}
+
+/* (ref: JVT-B118)
+ * x264_mb_decimate_score: given dct coeffs it returns a score to see if we could empty this dct coeffs
+ * to 0 (low score means set it to null)
+ * Used in inter macroblock (luma and chroma)
+ *  luma: for a 8x8 block: if score < 4 -> null
+ *        for the complete mb: if score < 6 -> null
+ *  chroma: for the complete mb: if score < 7 -> null
+ */
+
+const uint8_t x264_decimate_table4[16] =
+{
+    3,2,2,1,1,1,0,0,0,0,0,0,0,0,0,0
+};
+const uint8_t x264_decimate_table8[64] =
+{
+    3,3,3,3,2,2,2,2,2,2,2,2,1,1,1,1,
+    1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static int ALWAYS_INLINE x264_decimate_score_internal( dctcoef *dct, int i_max )
+{
+    const uint8_t *ds_table = (i_max == 64) ? x264_decimate_table8 : x264_decimate_table4;
+    int i_score = 0;
+    int idx = i_max - 1;
+
+    /* Yes, dct[idx-1] is guaranteed to be 32-bit aligned.  idx>=0 instead of 1 works correctly for the same reason */
+    while( idx >= 0 && MDCT_X2( &dct[idx-1] ) == 0 )
+        idx -= 2;
+    if( idx >= 0 && dct[idx] == 0 )
+        idx--;
+    while( idx >= 0 )
     {
-        const int i_dmf = dequant_mf[i_qp%6][0][0];
-        const int f = 1 << (-i_qbits-1);
+        int i_run;
 
-        for( y = 0; y < 4; y++ )
+        if( (unsigned)(dct[idx--] + 1) > 2 )
+            return 9;
+
+        i_run = 0;
+        while( idx >= 0 && dct[idx] == 0 )
         {
-            dct[y][0] = ( dct[y][0] * i_dmf + f ) >> (-i_qbits);
-            dct[y][1] = ( dct[y][1] * i_dmf + f ) >> (-i_qbits);
-            dct[y][2] = ( dct[y][2] * i_dmf + f ) >> (-i_qbits);
-            dct[y][3] = ( dct[y][3] * i_dmf + f ) >> (-i_qbits);
+            idx--;
+            i_run++;
         }
+        i_score += ds_table[i_run];
     }
+
+    return i_score;
 }
 
-void x264_quant_init( x264_t *h, int cpu, x264_quant_function_t *pf )
+static int x264_decimate_score15( dctcoef *dct )
+{
+    return x264_decimate_score_internal( dct+1, 15 );
+}
+static int x264_decimate_score16( dctcoef *dct )
+{
+    return x264_decimate_score_internal( dct, 16 );
+}
+static int x264_decimate_score64( dctcoef *dct )
 {
-    int i, j, maxQ8=0, maxQ4=0, maxQdc=0;
+    return x264_decimate_score_internal( dct, 64 );
+}
 
-    pf->quant_8x8_core = quant_8x8_core;
-    pf->quant_4x4_core = quant_4x4_core;
-    pf->quant_4x4_dc_core = quant_4x4_dc_core;
-    pf->quant_2x2_dc_core = quant_2x2_dc_core;
+static int ALWAYS_INLINE x264_coeff_last_internal( dctcoef *l, int i_count )
+{
+    int i_last;
+    for( i_last = i_count-1; i_last >= 3; i_last -= 4 )
+        if( M64( l+i_last-3 ) )
+            break;
+    while( i_last >= 0 && l[i_last] == 0 )
+        i_last--;
+    return i_last;
+}
+
+static int x264_coeff_last4( dctcoef *l )
+{
+    return x264_coeff_last_internal( l, 4 );
+}
+static int x264_coeff_last15( dctcoef *l )
+{
+    return x264_coeff_last_internal( l, 15 );
+}
+static int x264_coeff_last16( dctcoef *l )
+{
+    return x264_coeff_last_internal( l, 16 );
+}
+static int x264_coeff_last64( dctcoef *l )
+{
+    return x264_coeff_last_internal( l, 64 );
+}
+
+#define level_run(num)\
+static int x264_coeff_level_run##num( dctcoef *dct, x264_run_level_t *runlevel )\
+{\
+    int i_last = runlevel->last = x264_coeff_last##num(dct);\
+    int i_total = 0;\
+    do\
+    {\
+        int r = 0;\
+        runlevel->level[i_total] = dct[i_last];\
+        while( --i_last >= 0 && dct[i_last] == 0 )\
+            r++;\
+        runlevel->run[i_total++] = r;\
+    } while( i_last >= 0 );\
+    return i_total;\
+}
+
+level_run(4)
+level_run(15)
+level_run(16)
+
+
+void x264_quant_init( x264_t *h, int cpu, x264_quant_function_t *pf )
+{
+    pf->quant_8x8 = quant_8x8;
+    pf->quant_4x4 = quant_4x4;
+    pf->quant_4x4_dc = quant_4x4_dc;
+    pf->quant_2x2_dc = quant_2x2_dc;
 
     pf->dequant_4x4 = dequant_4x4;
+    pf->dequant_4x4_dc = dequant_4x4_dc;
     pf->dequant_8x8 = dequant_8x8;
 
-    /* determine the biggest coefficient in all quant8_mf tables */
-    for( j = 0; j < 2; j++ )
-        for( i = 0; i < 6*8*8; i++ )
-        {
-            int q = h->quant8_mf[j][0][0][i];
-            if( maxQ8 < q )
-                maxQ8 = q;
-        }
+    pf->denoise_dct = x264_denoise_dct;
+    pf->decimate_score15 = x264_decimate_score15;
+    pf->decimate_score16 = x264_decimate_score16;
+    pf->decimate_score64 = x264_decimate_score64;
+
+    pf->coeff_last[DCT_CHROMA_DC] = x264_coeff_last4;
+    pf->coeff_last[  DCT_LUMA_AC] = x264_coeff_last15;
+    pf->coeff_last[ DCT_LUMA_4x4] = x264_coeff_last16;
+    pf->coeff_last[ DCT_LUMA_8x8] = x264_coeff_last64;
+    pf->coeff_level_run[DCT_CHROMA_DC] = x264_coeff_level_run4;
+    pf->coeff_level_run[  DCT_LUMA_AC] = x264_coeff_level_run15;
+    pf->coeff_level_run[ DCT_LUMA_4x4] = x264_coeff_level_run16;
 
-    /* determine the biggest coefficient in all quant4_mf tables ( maxQ4 )
-       and the biggest DC coefficient if all quant4_mf tables ( maxQdc ) */
-    for( j = 0; j < 4; j++ )
-        for( i = 0; i < 6*4*4; i++ )
+#ifdef HAVE_MMX
+    if( cpu&X264_CPU_MMX )
+    {
+#ifdef ARCH_X86
+        pf->quant_4x4 = x264_quant_4x4_mmx;
+        pf->quant_8x8 = x264_quant_8x8_mmx;
+        pf->dequant_4x4 = x264_dequant_4x4_mmx;
+        pf->dequant_4x4_dc = x264_dequant_4x4dc_mmxext;
+        pf->dequant_8x8 = x264_dequant_8x8_mmx;
+        if( h->param.i_cqm_preset == X264_CQM_FLAT )
         {
-            int q = h->quant4_mf[j][0][0][i];
-            if( maxQ4 < q )
-                maxQ4 = q;
-            if( maxQdc < q && i%16 == 0 )
-                maxQdc = q;
+            pf->dequant_4x4 = x264_dequant_4x4_flat16_mmx;
+            pf->dequant_8x8 = x264_dequant_8x8_flat16_mmx;
         }
-
-#ifdef HAVE_MMXEXT
-
-    /* select quant_8x8 based on CPU and maxQ8 */
-#if defined(ARCH_X86_64) && defined(HAVE_SSE3)
-    if( maxQ8 < (1<<15) && cpu&X264_CPU_SSSE3 )
-        pf->quant_8x8_core = x264_quant_8x8_core15_ssse3;
-    else
+        pf->denoise_dct = x264_denoise_dct_mmx;
 #endif
-    if( maxQ8 < (1<<15) && cpu&X264_CPU_MMX )
-        pf->quant_8x8_core = x264_quant_8x8_core15_mmx;
-    else
-    if( maxQ8 < (1<<16) && cpu&X264_CPU_MMXEXT )
-        pf->quant_8x8_core = x264_quant_8x8_core16_mmxext;
-    else
-    if( cpu&X264_CPU_MMXEXT )
-        pf->quant_8x8_core = x264_quant_8x8_core32_mmxext;
+    }
 
-    /* select quant_4x4 based on CPU and maxQ4 */
-#if defined(ARCH_X86_64) && defined(HAVE_SSE3)
-    if( maxQ4 < (1<<15) && cpu&X264_CPU_SSSE3 )
-        pf->quant_4x4_core = x264_quant_4x4_core15_ssse3;
-    else
-#endif
-    if( maxQ4 < (1<<15) && cpu&X264_CPU_MMX )
-        pf->quant_4x4_core = x264_quant_4x4_core15_mmx;
-    else
-    if( maxQ4 < (1<<16) && cpu&X264_CPU_MMXEXT )
-        pf->quant_4x4_core = x264_quant_4x4_core16_mmxext;
-    else
     if( cpu&X264_CPU_MMXEXT )
-        pf->quant_4x4_core = x264_quant_4x4_core32_mmxext;
+    {
+        pf->quant_2x2_dc = x264_quant_2x2_dc_mmxext;
+#ifdef ARCH_X86
+        pf->quant_4x4_dc = x264_quant_4x4_dc_mmxext;
+        pf->decimate_score15 = x264_decimate_score15_mmxext;
+        pf->decimate_score16 = x264_decimate_score16_mmxext;
+        if( cpu&X264_CPU_SLOW_CTZ )
+        {
+            pf->decimate_score15 = x264_decimate_score15_mmxext_slowctz;
+            pf->decimate_score16 = x264_decimate_score16_mmxext_slowctz;
+        }
+        pf->decimate_score64 = x264_decimate_score64_mmxext;
+        pf->coeff_last[  DCT_LUMA_AC] = x264_coeff_last15_mmxext;
+        pf->coeff_last[ DCT_LUMA_4x4] = x264_coeff_last16_mmxext;
+        pf->coeff_last[ DCT_LUMA_8x8] = x264_coeff_last64_mmxext;
+        pf->coeff_level_run[  DCT_LUMA_AC] = x264_coeff_level_run15_mmxext;
+        pf->coeff_level_run[ DCT_LUMA_4x4] = x264_coeff_level_run16_mmxext;
+#endif
+        pf->coeff_last[DCT_CHROMA_DC] = x264_coeff_last4_mmxext;
+        pf->coeff_level_run[DCT_CHROMA_DC] = x264_coeff_level_run4_mmxext;
+        if( cpu&X264_CPU_LZCNT )
+        {
+            pf->coeff_last[DCT_CHROMA_DC] = x264_coeff_last4_mmxext_lzcnt;
+            pf->coeff_level_run[DCT_CHROMA_DC] = x264_coeff_level_run4_mmxext_lzcnt;
+        }
+    }
 
-    /* select quant_XxX_dc based on CPU and maxQdc */
-    if( maxQdc < (1<<16) && cpu&X264_CPU_MMXEXT )
+    if( cpu&X264_CPU_SSE2 )
     {
-        pf->quant_4x4_dc_core = x264_quant_4x4_dc_core16_mmxext;
-        pf->quant_2x2_dc_core = x264_quant_2x2_dc_core16_mmxext;
+        pf->quant_4x4_dc = x264_quant_4x4_dc_sse2;
+        pf->quant_4x4 = x264_quant_4x4_sse2;
+        pf->quant_8x8 = x264_quant_8x8_sse2;
+        pf->dequant_4x4 = x264_dequant_4x4_sse2;
+        pf->dequant_4x4_dc = x264_dequant_4x4dc_sse2;
+        pf->dequant_8x8 = x264_dequant_8x8_sse2;
+        if( h->param.i_cqm_preset == X264_CQM_FLAT )
+        {
+            pf->dequant_4x4 = x264_dequant_4x4_flat16_sse2;
+            pf->dequant_8x8 = x264_dequant_8x8_flat16_sse2;
+        }
+        pf->denoise_dct = x264_denoise_dct_sse2;
+        pf->decimate_score15 = x264_decimate_score15_sse2;
+        pf->decimate_score16 = x264_decimate_score16_sse2;
+        pf->decimate_score64 = x264_decimate_score64_sse2;
+        if( cpu&X264_CPU_SLOW_CTZ )
+        {
+            pf->decimate_score15 = x264_decimate_score15_sse2_slowctz;
+            pf->decimate_score16 = x264_decimate_score16_sse2_slowctz;
+        }
+        pf->coeff_last[ DCT_LUMA_AC] = x264_coeff_last15_sse2;
+        pf->coeff_last[DCT_LUMA_4x4] = x264_coeff_last16_sse2;
+        pf->coeff_last[DCT_LUMA_8x8] = x264_coeff_last64_sse2;
+        pf->coeff_level_run[ DCT_LUMA_AC] = x264_coeff_level_run15_sse2;
+        pf->coeff_level_run[DCT_LUMA_4x4] = x264_coeff_level_run16_sse2;
+        if( cpu&X264_CPU_LZCNT )
+        {
+            pf->coeff_last[ DCT_LUMA_AC] = x264_coeff_last15_sse2_lzcnt;
+            pf->coeff_last[DCT_LUMA_4x4] = x264_coeff_last16_sse2_lzcnt;
+            pf->coeff_last[DCT_LUMA_8x8] = x264_coeff_last64_sse2_lzcnt;
+            pf->coeff_level_run[ DCT_LUMA_AC] = x264_coeff_level_run15_sse2_lzcnt;
+            pf->coeff_level_run[DCT_LUMA_4x4] = x264_coeff_level_run16_sse2_lzcnt;
+        }
     }
-    else
-    if( maxQdc < (1<<15) && cpu&X264_CPU_MMX )
+
+    if( cpu&X264_CPU_SSSE3 )
     {
-        pf->quant_4x4_dc_core = x264_quant_4x4_dc_core15_mmx;
-        pf->quant_2x2_dc_core = x264_quant_2x2_dc_core15_mmx;
+        pf->quant_2x2_dc = x264_quant_2x2_dc_ssse3;
+        pf->quant_4x4_dc = x264_quant_4x4_dc_ssse3;
+        pf->quant_4x4 = x264_quant_4x4_ssse3;
+        pf->quant_8x8 = x264_quant_8x8_ssse3;
+        pf->denoise_dct = x264_denoise_dct_ssse3;
+        pf->decimate_score15 = x264_decimate_score15_ssse3;
+        pf->decimate_score16 = x264_decimate_score16_ssse3;
+        if( cpu&X264_CPU_SLOW_CTZ )
+        {
+            pf->decimate_score15 = x264_decimate_score15_ssse3_slowctz;
+            pf->decimate_score16 = x264_decimate_score16_ssse3_slowctz;
+        }
+        pf->decimate_score64 = x264_decimate_score64_ssse3;
     }
-    else
-    if( cpu&X264_CPU_MMXEXT )
+
+    if( cpu&X264_CPU_SSE4 )
     {
-        pf->quant_4x4_dc_core = x264_quant_4x4_dc_core32_mmxext;
-        pf->quant_2x2_dc_core = x264_quant_2x2_dc_core32_mmxext;
+        pf->quant_4x4_dc = x264_quant_4x4_dc_sse4;
+        pf->quant_4x4 = x264_quant_4x4_sse4;
+        pf->quant_8x8 = x264_quant_8x8_sse4;
     }
+#endif // HAVE_MMX
 
-#if defined(ARCH_X86_64) && defined(HAVE_SSE3)
-    if( maxQdc < (1<<15) && cpu&X264_CPU_SSSE3 )
-        pf->quant_4x4_dc_core = x264_quant_4x4_dc_core15_ssse3;
+#ifdef HAVE_ALTIVEC
+    if( cpu&X264_CPU_ALTIVEC ) {
+        pf->quant_2x2_dc = x264_quant_2x2_dc_altivec;
+        pf->quant_4x4_dc = x264_quant_4x4_dc_altivec;
+        pf->quant_4x4 = x264_quant_4x4_altivec;
+        pf->quant_8x8 = x264_quant_8x8_altivec;
+
+        pf->dequant_4x4 = x264_dequant_4x4_altivec;
+        pf->dequant_8x8 = x264_dequant_8x8_altivec;
+    }
 #endif
 
-    if( cpu&X264_CPU_MMX )
+#ifdef HAVE_ARMV6
+    if( cpu&X264_CPU_ARMV6 )
+        pf->coeff_last[DCT_CHROMA_DC] = x264_coeff_last4_arm;
+
+    if( cpu&X264_CPU_NEON )
     {
-        /* dequant is not subject to the above CQM-dependent overflow issues,
-         * as long as the inputs are in the range generable by dct+quant.
-         * that is not guaranteed by the standard, but is true within x264 */
-        pf->dequant_4x4 = x264_dequant_4x4_mmx;
-        pf->dequant_8x8 = x264_dequant_8x8_mmx;
+        pf->quant_2x2_dc   = x264_quant_2x2_dc_neon;
+        pf->quant_4x4      = x264_quant_4x4_neon;
+        pf->quant_4x4_dc   = x264_quant_4x4_dc_neon;
+        pf->quant_8x8      = x264_quant_8x8_neon;
+        pf->dequant_4x4    = x264_dequant_4x4_neon;
+        pf->dequant_4x4_dc = x264_dequant_4x4_dc_neon;
+        pf->dequant_8x8    = x264_dequant_8x8_neon;
+        pf->coeff_last[ DCT_LUMA_AC] = x264_coeff_last15_neon;
+        pf->coeff_last[DCT_LUMA_4x4] = x264_coeff_last16_neon;
+        pf->coeff_last[DCT_LUMA_8x8] = x264_coeff_last64_neon;
     }
-#endif  /* HAVE_MMXEXT */
-    
-#ifdef ARCH_PPC
-    if( cpu&X264_CPU_ALTIVEC ) {
-        if( maxQ8 < (1<<16) )
-        {
-            pf->quant_8x8_core = x264_quant_8x8_altivec;
-        }
-        if( maxQ4 < (1<<16) )
-        {
-            pf->quant_4x4_core = x264_quant_4x4_altivec;
-        }
-        if( maxQdc < (1<<16) )
-        {
-           pf->quant_4x4_dc_core = x264_quant_4x4_dc_altivec;
-        }
-    }
-#endif /* ARCH_PPC */
+#endif
+    pf->coeff_last[  DCT_LUMA_DC] = pf->coeff_last[DCT_LUMA_4x4];
+    pf->coeff_last[DCT_CHROMA_AC] = pf->coeff_last[ DCT_LUMA_AC];
+    pf->coeff_level_run[  DCT_LUMA_DC] = pf->coeff_level_run[DCT_LUMA_4x4];
+    pf->coeff_level_run[DCT_CHROMA_AC] = pf->coeff_level_run[ DCT_LUMA_AC];
 }