remove sad_pde. it's been unused ever since successive elimination replaced it.

git-svn-id: svn://svn.videolan.org/x264/trunk@689 df754926-b1dd-0310-bc7b-ec298dee348c

diff --git a/common/amd64/pixel-a.asm b/common/amd64/pixel-a.asm
index eb2b0fc67fd328d411db52785439b2006973679c..3b07a9890b76c6eb8984577c1d33aac7e35e3dea 100644 (file)
--- a/common/amd64/pixel-a.asm
+++ b/common/amd64/pixel-a.asm
@@ -499,44 +499,6 @@ SAD_X 4,  4,  8
 SAD_X 4,  4,  4
 
 
-%macro PDE_CHECK 0
-    movd eax, mm0
-    cmp  eax, parm5d ; prev_score
-    jl   .continue
-    ret
-ALIGN 4
-.continue:
-%endmacro
-
-;-----------------------------------------------------------------------------
-;   int x264_pixel_sad_pde_16x16_mmxext (uint8_t *, int, uint8_t *, int, int )
-;-----------------------------------------------------------------------------
-%macro SAD_PDE 2    
-cglobal x264_pixel_sad_pde_%1x%2_mmxext
-    SAD_START
-%rep %2/4
-    SAD_INC_2x%1P
-%endrep
-
-    movd eax, mm0
-    cmp  eax, parm5d ; prev_score
-    jl   .continue
-    ret
-ALIGN 4
-.continue:
-
-%rep %2/4
-    SAD_INC_2x%1P
-%endrep  
-    SAD_END
-%endmacro
-
-SAD_PDE 16, 16
-SAD_PDE 16 , 8
-SAD_PDE  8, 16
-
-
-
 %macro SSD_START 0
     pxor    mm7,    mm7         ; zero
     pxor    mm0,    mm0         ; mm0 holds the sum

diff --git a/common/i386/pixel-a.asm b/common/i386/pixel-a.asm
index a003f3adc63f8971fd4069d416c088b6f081ce23..2422532e2da4e0b6cb10f8331302fd6f99524cdb 100644 (file)
--- a/common/i386/pixel-a.asm
+++ b/common/i386/pixel-a.asm
@@ -549,38 +549,6 @@ SAD_X 4,  4,  8
 SAD_X 4,  4,  4
 
 
-;-----------------------------------------------------------------------------
-;   int __cdecl x264_pixel_sad_pde_16x16_mmxext (uint8_t *, int, uint8_t *, int, int )
-;-----------------------------------------------------------------------------
-%macro SAD_PDE 2
-cglobal x264_pixel_sad_pde_%1x%2_mmxext
-    SAD_START
-%rep %2/4
-    SAD_INC_2x%1P
-%endrep
-
-    movd ebx, mm0
-    cmp  ebx, [esp+24] ; prev_score
-    jl   .continue
-    pop  ebx
-    mov  eax, 0xffff
-    ret
-ALIGN 4
-.continue:
-    mov  ebx, [esp+12]
-
-%rep %2/4
-    SAD_INC_2x%1P
-%endrep
-    SAD_END
-%endmacro
-
-SAD_PDE 16, 16
-SAD_PDE 16 , 8
-SAD_PDE  8, 16
-
-
-
 %macro SSD_START 0
     push    ebx
 

diff --git a/common/i386/pixel.h b/common/i386/pixel.h
index c15459d9a6b29bdd57aaf3687327f15bf83cb6e0..735120c2a8f91449efb62d1f5db0ba05b5d2d8a2 100644 (file)
--- a/common/i386/pixel.h
+++ b/common/i386/pixel.h
@@ -47,10 +47,6 @@ void x264_pixel_sad_x4_8x4_mmxext( uint8_t *, uint8_t *, uint8_t *, uint8_t *, u
 void x264_pixel_sad_x4_4x8_mmxext( uint8_t *, uint8_t *, uint8_t *, uint8_t *, uint8_t *, int, int * );
 void x264_pixel_sad_x4_4x4_mmxext( uint8_t *, uint8_t *, uint8_t *, uint8_t *, uint8_t *, int, int * );
 
-int x264_pixel_sad_pde_16x16_mmxext( uint8_t *, int, uint8_t *, int, int );
-int x264_pixel_sad_pde_16x8_mmxext( uint8_t *, int, uint8_t *, int, int );
-int x264_pixel_sad_pde_8x16_mmxext( uint8_t *, int, uint8_t *, int, int );
-
 int x264_pixel_ssd_16x16_mmx( uint8_t *, int, uint8_t *, int );
 int x264_pixel_ssd_16x8_mmx( uint8_t *, int, uint8_t *, int );
 int x264_pixel_ssd_8x16_mmx( uint8_t *, int, uint8_t *, int );

diff --git a/common/pixel.c b/common/pixel.c
index 26dca08d410f45c65355be9356226a83262c8273..4dbc5be803dfd42b43f15ef50d55d71258582f57 100644 (file)
--- a/common/pixel.c
+++ b/common/pixel.c
@@ -483,10 +483,6 @@ void x264_pixel_init( int cpu, x264_pixel_function_t *pixf )
         INIT( sad_x4, _mmxext );
         INIT( satd, _mmxext );
 
-        pixf->sad_pde[PIXEL_16x16] = x264_pixel_sad_pde_16x16_mmxext;
-        pixf->sad_pde[PIXEL_16x8 ] = x264_pixel_sad_pde_16x8_mmxext;
-        pixf->sad_pde[PIXEL_8x16 ] = x264_pixel_sad_pde_8x16_mmxext;
-
         pixf->ads[PIXEL_16x16] = x264_pixel_ads4_mmxext;
         pixf->ads[PIXEL_16x8 ] = x264_pixel_ads2_mmxext;
         pixf->ads[PIXEL_8x8  ] = x264_pixel_ads1_mmxext;

diff --git a/common/pixel.h b/common/pixel.h
index c1d4fca124c4ae6986526e6a4ace8c1c1bc8304c..9366b697c046bcbb65a4953d6f085b4b0cfba632 100644 (file)
--- a/common/pixel.h
+++ b/common/pixel.h
@@ -25,7 +25,6 @@
 #define _PIXEL_H 1
 
 typedef int  (*x264_pixel_cmp_t) ( uint8_t *, int, uint8_t *, int );
-typedef int  (*x264_pixel_cmp_pde_t) ( uint8_t *, int, uint8_t *, int, int );
 typedef void (*x264_pixel_cmp_x3_t) ( uint8_t *, uint8_t *, uint8_t *, uint8_t *, int, int[3] );
 typedef void (*x264_pixel_cmp_x4_t) ( uint8_t *, uint8_t *, uint8_t *, uint8_t *, uint8_t *, int, int[4] );
 
@@ -76,11 +75,6 @@ typedef struct
                              const uint8_t *pix2, int stride2, int sums[2][4] );
     float (*ssim_end4)( int sum0[5][4], int sum1[5][4], int width );
 
-    /* partial distortion elimination:
-     * terminate early if partial score is worse than a threshold.
-     * may be NULL, in which case just use sad instead. */
-    x264_pixel_cmp_pde_t sad_pde[7];
-
     /* multiple parallel calls to sad. */
     x264_pixel_cmp_x3_t sad_x3[7];
     x264_pixel_cmp_x4_t sad_x4[7];