[FFmpeg-cvslog] r15886 - in trunk/libavcodec/sh4: dsputil_sh4.c idct_sh4.c qpel.c

[mru]

Author: mru
Date: Thu Nov 20 10:21:46 2008
New Revision: 15886

Log:
SH4: remove some commented out blocks of code

Modified:
   trunk/libavcodec/sh4/dsputil_sh4.c
   trunk/libavcodec/sh4/idct_sh4.c
   trunk/libavcodec/sh4/qpel.c

Modified: trunk/libavcodec/sh4/dsputil_sh4.c
==============================================================================
--- trunk/libavcodec/sh4/dsputil_sh4.c	(original)
+++ trunk/libavcodec/sh4/dsputil_sh4.c	Thu Nov 20 10:21:46 2008
@@ -25,7 +25,6 @@
 
 static void memzero_align8(void *dst,size_t size)
 {
-#if defined(__SH4__) || defined(__SH4_SINGLE__) || defined(__SH4_SINGLE_ONLY__)
         __asm__(
 #if defined(__SH4__)
         " fschg\n"  //single float mode
@@ -44,22 +43,10 @@ static void memzero_align8(void *dst,siz
         " fschg" //back to single
 #endif
         : : "r"((char*)dst+size),"r"(size/32): "memory" );
-#else
-        double *d = dst;
-        size/=8*4;
-        do {
-                d[0] = 0.0;
-                d[1] = 0.0;
-                d[2] = 0.0;
-                d[3] = 0.0;
-                d+=4;
-        } while(--size);
-#endif
 }
 
 static void clear_blocks_sh4(DCTELEM *blocks)
 {
-//        if (((int)blocks&7)==0)
         memzero_align8(blocks,sizeof(DCTELEM)*6*64);
 }
 
@@ -113,6 +100,6 @@ void dsputil_init_sh4(DSPContext* c, AVC
                 c->idct_put = idct_put;
                 c->idct_add = idct_add;
                c->idct     = idct_sh4;
-                c->idct_permutation_type= FF_NO_IDCT_PERM; //FF_SIMPLE_IDCT_PERM; //FF_LIBMPEG2_IDCT_PERM;
+                c->idct_permutation_type= FF_NO_IDCT_PERM;
         }
 }

Modified: trunk/libavcodec/sh4/idct_sh4.c
==============================================================================
--- trunk/libavcodec/sh4/idct_sh4.c	(original)
+++ trunk/libavcodec/sh4/idct_sh4.c	Thu Nov 20 10:21:46 2008
@@ -168,10 +168,6 @@ void idct_sh4(DCTELEM *block)
 
         i = 8;
 
-//        ofs1 = sizeof(float)*1;
-//        ofs2 = sizeof(float)*2;
-//        ofs3 = sizeof(float)*3;
-
         do {
                 float t0,t1,t2,t3;
                 fr0 = block[1];

Modified: trunk/libavcodec/sh4/qpel.c
==============================================================================
--- trunk/libavcodec/sh4/qpel.c	(original)
+++ trunk/libavcodec/sh4/qpel.c	Thu Nov 20 10:21:46 2008
@@ -22,63 +22,6 @@
  */
 
 #define PIXOP2(OPNAME, OP) \
-/*static inline void OPNAME ## _no_rnd_pixels8_l2(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, int src_stride1, int src_stride2, int h) \
-{\
-        do {\
-                OP(LP(dst  ),no_rnd_avg32(AV_RN32(src1  ),AV_RN32(src2  )) ); \
-                OP(LP(dst+4),no_rnd_avg32(AV_RN32(src1+4),AV_RN32(src2+4)) ); \
-                src1+=src_stride1; \
-                src2+=src_stride2; \
-                dst+=dst_stride; \
-        } while(--h); \
-}\
-\
-static inline void OPNAME ## _pixels8_l2(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, int src_stride1, int src_stride2, int h) \
-{\
-        do {\
-                OP(LP(dst  ),rnd_avg32(AV_RN32(src1  ),AV_RN32(src2  )) ); \
-                OP(LP(dst+4),rnd_avg32(AV_RN32(src1+4),AV_RN32(src2+4)) ); \
-                src1+=src_stride1; \
-                src2+=src_stride2; \
-                dst+=dst_stride; \
-        } while(--h); \
-}\
-\
-static inline void OPNAME ## _pixels4_l2(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, int src_stride1, int src_stride2, int h) \
-{\
-        do {\
-                OP(LP(dst  ),rnd_avg32(AV_RN32(src1  ),AV_RN32(src2  )) ); \
-                src1+=src_stride1; \
-                src2+=src_stride2; \
-                dst+=dst_stride; \
-        } while(--h); \
-}\
-\
-static inline void OPNAME ## _no_rnd_pixels16_l2(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, int src_stride1, int src_stride2, int h) \
-{\
-        do {\
-                OP(LP(dst  ),no_rnd_avg32(AV_RN32(src1  ),AV_RN32(src2  )) ); \
-                OP(LP(dst+4),no_rnd_avg32(AV_RN32(src1+4),AV_RN32(src2+4)) ); \
-                OP(LP(dst+8),no_rnd_avg32(AV_RN32(src1+8),AV_RN32(src2+8)) ); \
-                OP(LP(dst+12),no_rnd_avg32(AV_RN32(src1+12),AV_RN32(src2+12)) ); \
-                src1+=src_stride1; \
-                src2+=src_stride2; \
-                dst+=dst_stride; \
-        } while(--h); \
-}\
-\
-static inline void OPNAME ## _pixels16_l2(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, int src_stride1, int src_stride2, int h) \
-{\
-        do {\
-                OP(LP(dst  ),rnd_avg32(AV_RN32(src1  ),AV_RN32(src2  )) ); \
-                OP(LP(dst+4),rnd_avg32(AV_RN32(src1+4),AV_RN32(src2+4)) ); \
-                OP(LP(dst+8),rnd_avg32(AV_RN32(src1+8),AV_RN32(src2+8)) ); \
-                OP(LP(dst+12),rnd_avg32(AV_RN32(src1+12),AV_RN32(src2+12)) ); \
-                src1+=src_stride1; \
-                src2+=src_stride2; \
-                dst+=dst_stride; \
-        } while(--h); \
-}*/\
 \
 static inline void OPNAME ## _pixels4_l2_aligned(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, int src_stride1, int src_stride2, int h) \
 {\