[FFmpeg-soc] [soc]: r3800 - in dirac/libavcodec: dirac.c dirac_wavelet.c diracdec.c

[conrad]

Author: conrad
Date: Mon Nov 10 04:12:15 2008
New Revision: 3800

Log:
Remove START_TIMER/STOP_TIMER


Modified:
   dirac/libavcodec/dirac.c
   dirac/libavcodec/dirac_wavelet.c
   dirac/libavcodec/diracdec.c

Modified: dirac/libavcodec/dirac.c
==============================================================================
--- dirac/libavcodec/dirac.c	(original)
+++ dirac/libavcodec/dirac.c	Mon Nov 10 04:12:15 2008
@@ -529,8 +529,6 @@ static void interpolate_frame_halfpel(AV
     const int t[4] = { 21, -7, 3, -1 };
     int8_t *pixelsdata = pixels + ypad * doutwidth + 2 * xpad;
 
-START_TIMER
-
     refdata    = refframe->data[comp];
 
     lineinref  = refdata;
@@ -653,8 +651,6 @@ START_TIMER
         memcpy(lineout, linein, outwidth);
         lineout += outwidth;
     }
-
-STOP_TIMER("halfpel");
 }
 
 /**
@@ -721,9 +717,6 @@ static void motion_comp_block2refs(Dirac
     const uint8_t *w2 = NULL;
     int xfix1 = 0, xfix2 = 0;
 
-
-START_TIMER
-
     vect1[0] = currblock->vect[0][0];
     vect1[1] = currblock->vect[0][1];
     vect2[0] = currblock->vect[1][0];
@@ -872,8 +865,6 @@ START_TIMER
         line += s->width;
         spatialwt += s->xblen;
     }
-
-STOP_TIMER("two_refframes");
 }
 
 /**
@@ -911,8 +902,6 @@ static void motion_comp_block1ref(DiracC
     const uint8_t *w = NULL;
     int xfix = 0;
 
-START_TIMER
-
     vect[0] = currblock->vect[ref][0];
     vect[1] = currblock->vect[ref][1];
 
@@ -1021,8 +1010,6 @@ START_TIMER
         refline += s->refwidth << 1;
         spatialwt += s->xblen;
     }
-
-STOP_TIMER("single_refframe");
 }
 
 /**
@@ -1186,8 +1173,6 @@ int dirac_motion_compensation(DiracConte
     memset(s->mcpic, 0, s->width * s->height * sizeof(int16_t));
 
     {
-        START_TIMER;
-
         s->current_blwidth  = (s->width  - s->xoffset) / s->xbsep + 1;
         s->current_blheight = (s->height - s->yoffset) / s->ybsep + 1;
 
@@ -1239,8 +1224,6 @@ int dirac_motion_compensation(DiracConte
             }
             currblock += s->blwidth;
         }
-
-        STOP_TIMER("motioncomp");
     }
 
     av_freep(&s->spatialwt);

Modified: dirac/libavcodec/dirac_wavelet.c
==============================================================================
--- dirac/libavcodec/dirac_wavelet.c	(original)
+++ dirac/libavcodec/dirac_wavelet.c	Mon Nov 10 04:12:15 2008
@@ -111,8 +111,6 @@ int dirac_subband_idwt_53(AVCodecContext
     int synth_width = width  << 1;
     int synth_height = height << 1;
 
-START_TIMER
-
     dirac_subband_idwt_interleave(data, width, height,
                                   padded_width, synth, level);
 
@@ -210,8 +208,6 @@ START_TIMER
         data      += padded_width;
     }
 
-STOP_TIMER("idwt53")
-
     return 0;
 }
 
@@ -230,8 +226,6 @@ int dirac_subband_dwt_53(AVCodecContext 
     int synth_width = width  << 1;
     int synth_height = height << 1;
 
-START_TIMER
-
     if (avcodec_check_dimensions(avctx, synth_width, synth_height)) {
         av_log(avctx, AV_LOG_ERROR, "avcodec_check_dimensions() failed\n");
         return -1;
@@ -332,8 +326,6 @@ START_TIMER
     dirac_subband_dwt_deinterleave(data, width, height,
                                    padded_width, synth, level);
 
-STOP_TIMER("dwt53")
-
     av_free(synth);
 
     return 0;
@@ -356,8 +348,6 @@ int dirac_subband_idwt_97(AVCodecContext
     int synth_width = width  << 1;
     int synth_height = height << 1;
 
-START_TIMER
-
     dirac_subband_idwt_interleave(data, width, height, padded_width, synth, level);
 
     /* Vertical synthesis: Lifting stage 1.  */
@@ -465,8 +455,6 @@ START_TIMER
         data      += padded_width;
     }
 
-STOP_TIMER("idwt95")
-
     return 0;
 }
 
@@ -486,8 +474,6 @@ int dirac_subband_dwt_97(AVCodecContext 
     int synth_width = width  << 1;
     int synth_height = height << 1;
 
-START_TIMER
-
     if (avcodec_check_dimensions(avctx, synth_width, synth_height)) {
         av_log(avctx, AV_LOG_ERROR, "avcodec_check_dimensions() failed\n");
         return -1;
@@ -609,8 +595,6 @@ START_TIMER
     dirac_subband_dwt_deinterleave(data, width, height,
                                    padded_width, synth, level);
 
-STOP_TIMER("dwt95")
-
     av_free(synth);
 
     return 0;

Modified: dirac/libavcodec/diracdec.c
==============================================================================
--- dirac/libavcodec/diracdec.c	(original)
+++ dirac/libavcodec/diracdec.c	Mon Nov 10 04:12:15 2008
@@ -644,8 +644,6 @@ static int dirac_decode_frame_internal(D
     int x,y;
     int16_t *synth;
 
-START_TIMER
-
     if (avcodec_check_dimensions(s->avctx, s->padded_luma_width,
                                  s->padded_luma_height)) {
         av_log(s->avctx, AV_LOG_ERROR, "avcodec_check_dimensions() failed\n");
@@ -738,8 +736,6 @@ START_TIMER
     av_free(coeffs);
     av_free(synth);
 
-STOP_TIMER("dirac_frame_decode");
-
     return 0;
 }