Formatting: Remove a lot of trailing whitespace.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1307 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 102 insertions, 102 deletions

diff --git a/libhb/deblock.c b/libhb/deblock.c
index 2d8b16658..dbf39c606 100644
--- a/libhb/deblock.c
+++ b/libhb/deblock.c
@@ -1,16 +1,16 @@
 /*
  Copyright (C) 2005 Michael Niedermayer <[email protected]>
- 
+
  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
  the Free Software Foundation; either version 2 of the License, or
  (at your option) any later version.
- 
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
- 
+
  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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
@@ -41,39 +41,39 @@ static const uint8_t  __attribute__((aligned(8))) pp7_dither[8][8] =
     { 42,  26,  38,  22,  41,  25,  37,  21, },
 };
 
-struct hb_filter_private_s 
+struct hb_filter_private_s
 {
     int           pix_fmt;
     int           width[3];
     int           height[3];
-    
+
     int           pp7_qp;
     int           pp7_mode;
     int           pp7_mpeg2;
     int           pp7_temp_stride;
     uint8_t     * pp7_src;
-    
+
     AVPicture     pic_in;
-    AVPicture     pic_out;            
+    AVPicture     pic_out;
     hb_buffer_t * buf_out;
 };
 
-hb_filter_private_t * hb_deblock_init( int pix_fmt, 
-                                       int width, 
+hb_filter_private_t * hb_deblock_init( int pix_fmt,
+                                       int width,
                                        int height,
                                        char * settings );
 
 int hb_deblock_work( const hb_buffer_t * buf_in,
                      hb_buffer_t ** buf_out,
                      int pix_fmt,
-                     int width, 
+                     int width,
                      int height,
                      hb_filter_private_t * pv );
 
 void hb_deblock_close( hb_filter_private_t * pv );
 
 hb_filter_object_t hb_filter_deblock =
-{   
+{
     FILTER_DEBLOCK,
     "Deblock (pp7)",
     NULL,
@@ -85,25 +85,25 @@ hb_filter_object_t hb_filter_deblock =
 static inline void pp7_dct_a( DCTELEM * dst, uint8_t * src, int stride )
 {
     int i;
-    
+
     for( i = 0; i < 4; i++ )
     {
         int s0 =  src[0*stride] + src[6*stride];
         int s1 =  src[1*stride] + src[5*stride];
         int s2 =  src[2*stride] + src[4*stride];
-        int s3 =  src[3*stride];                
-        int s  =  s3+s3;   
-        
+        int s3 =  src[3*stride];
+        int s  =  s3+s3;
+
         s3 = s  - s0;
         s0 = s  + s0;
         s  = s2 + s1;
         s2 = s2 - s1;
-        
+
         dst[0] =   s0 + s;
         dst[2] =   s0 - s;
         dst[1] = 2*s3 + s2;
         dst[3] =   s3 - s2*2;
-        
+
         src++;
         dst += 4;
     }
@@ -112,25 +112,25 @@ static inline void pp7_dct_a( DCTELEM * dst, uint8_t * src, int stride )
 static void pp7_dct_b( DCTELEM * dst, DCTELEM * src )
 {
     int i;
-    
+
     for( i = 0; i < 4; i++ )
     {
         int s0 = src[0*4] + src[6*4];
         int s1 = src[1*4] + src[5*4];
         int s2 = src[2*4] + src[4*4];
-        int s3 = src[3*4];        
+        int s3 = src[3*4];
         int s  = s3+s3;
-        
+
         s3 = s  - s0;
         s0 = s  + s0;
         s  = s2 + s1;
         s2 = s2 - s1;
-        
+
         dst[0*4] =   s0 + s;
         dst[2*4] =   s0 - s;
         dst[1*4] = 2*s3 + s2;
         dst[3*4] =   s3 - s2*2;
-        
+
         src++;
         dst++;
     }
@@ -158,13 +158,13 @@ static void pp7_init_threshold( void )
 {
     int qp, i;
     int bias = 0;
-    
+
     for( qp = 0; qp < 99; qp++ )
     {
         for( i = 0; i < 16; i++ )
         {
-            pp7_threshold[qp][i] = 
-                ((i&1)?SN2:SN0) * ((i&4)?SN2:SN0) * 
+            pp7_threshold[qp][i] =
+                ((i&1)?SN2:SN0) * ((i&4)?SN2:SN0) *
                  XMAX(1,qp) * (1<<2) - 1 - bias;
         }
     }
@@ -172,9 +172,9 @@ static void pp7_init_threshold( void )
 
 static int pp7_hard_threshold( DCTELEM * src, int qp )
 {
-    int i; 
+    int i;
     int a;
-    
+
     a = src[0] * pp7_factor[0];
     for( i = 1; i < 16; i++ )
     {
@@ -191,9 +191,9 @@ static int pp7_hard_threshold( DCTELEM * src, int qp )
 
 static int pp7_medium_threshold( DCTELEM * src, int qp )
 {
-    int i; 
+    int i;
     int a;
-    
+
     a = src[0] * pp7_factor[0];
     for( i = 1; i < 16; i++ )
     {
@@ -208,7 +208,7 @@ static int pp7_medium_threshold( DCTELEM * src, int qp )
             }
             else
             {
-                if( level>0 ) 
+                if( level>0 )
                 {
                     a += 2*(level - (int)threshold1) * pp7_factor[i];
                 }
@@ -224,9 +224,9 @@ static int pp7_medium_threshold( DCTELEM * src, int qp )
 
 static int pp7_soft_threshold( DCTELEM * src, int qp )
 {
-    int i; 
+    int i;
     int a;
-    
+
     a = src[0] * pp7_factor[0];
     for( i = 1; i < 16; i++ )
     {
@@ -235,7 +235,7 @@ static int pp7_soft_threshold( DCTELEM * src, int qp )
         int level= src[i];
         if( ((unsigned)(level+threshold1))>threshold2 )
         {
-            if( level>0 ) 
+            if( level>0 )
             {
                 a += (level - (int)threshold1) * pp7_factor[i];
             }
@@ -250,47 +250,47 @@ static int pp7_soft_threshold( DCTELEM * src, int qp )
 
 static int ( * pp7_requantize )( DCTELEM * src, int qp ) = pp7_hard_threshold;
 
-static void pp7_filter( hb_filter_private_t * pv, 
-                        uint8_t * dst, 
-                        uint8_t * src, 
-                        int width, 
-                        int height, 
-                        uint8_t * qp_store, 
-                        int qp_stride, 
+static void pp7_filter( hb_filter_private_t * pv,
+                        uint8_t * dst,
+                        uint8_t * src,
+                        int width,
+                        int height,
+                        uint8_t * qp_store,
+                        int qp_stride,
                         int is_luma)
 {
     int x, y;
-    
+
     const int  stride = is_luma ? pv->pp7_temp_stride : ((width+16+15)&(~15));
     uint8_t  * p_src  = pv->pp7_src + 8*stride;
     DCTELEM  * block  = (DCTELEM *)(pv->pp7_src);
     DCTELEM  * temp   = (DCTELEM *)(pv->pp7_src + 32);
-    
-    if( !src || !dst ) 
+
+    if( !src || !dst )
     {
         return;
     }
-    
+
     for( y = 0; y < height; y++ )
     {
         int index = 8 + 8*stride + y*stride;
         memcpy( p_src + index, src + y*width, width );
-        
+
         for( x = 0; x < 8; x++ )
-        { 
+        {
             p_src[index         - x - 1] = p_src[index +         x    ];
             p_src[index + width + x    ] = p_src[index + width - x - 1];
         }
     }
-    
+
     for( y = 0; y < 8; y++ )
     {
-        memcpy( p_src + (     7-y)*stride, 
+        memcpy( p_src + (     7-y)*stride,
                 p_src + (     y+8)*stride, stride );
-        memcpy( p_src + (height+8+y)*stride, 
+        memcpy( p_src + (height+8+y)*stride,
                 p_src + (height-y+7)*stride, stride );
     }
-    
+
     for( y = 0; y < height; y++ )
     {
         for( x = -8; x < 0; x += 4 )
@@ -298,15 +298,15 @@ static void pp7_filter( hb_filter_private_t * pv,
             const int index = x + y*stride + (8-3)*(1+stride) + 8;
             uint8_t * src   = p_src + index;
             DCTELEM * tp    = temp+4*x;
-            
+
             pp7_dct_a( tp+4*8, src, stride );
-        }        
-        
+        }
+
         for( x = 0; x < width; )
         {
             const int qps = 3 + is_luma;
             int end = XMIN(x+8, width);
-            
+
             int qp;
             if( pv->pp7_qp )
             {
@@ -314,29 +314,29 @@ static void pp7_filter( hb_filter_private_t * pv,
             }
             else
             {
-                qp = qp_store[ (XMIN(x, width-1)>>qps) + 
+                qp = qp_store[ (XMIN(x, width-1)>>qps) +
                                (XMIN(y, height-1)>>qps) * qp_stride ];
-                
-                if( pv->pp7_mpeg2 ) 
+
+                if( pv->pp7_mpeg2 )
                 {
                     qp >>= 1;
                 }
             }
-            
+
             for( ; x < end; x++ )
             {
                 const int index = x + y*stride + (8-3)*(1+stride) + 8;
                 uint8_t * src   = p_src + index;
                 DCTELEM * tp    = temp+4*x;
                 int v;
-                
+
                 if( (x&3) == 0 )
                 {
                     pp7_dct_a( tp+4*8, src, stride );
                 }
-                
+
                 pp7_dct_b( block, tp );
-                
+
                 v = pp7_requantize( block, qp );
                 v = (v + pp7_dither[y&7][x&7]) >> 6;
                 if( (unsigned)v > 255 )
@@ -349,8 +349,8 @@ static void pp7_filter( hb_filter_private_t * pv,
     }
 }
 
-hb_filter_private_t * hb_deblock_init( int pix_fmt, 
-                                       int width, 
+hb_filter_private_t * hb_deblock_init( int pix_fmt,
+                                       int width,
                                        int height,
                                        char * settings )
 {
@@ -358,17 +358,17 @@ hb_filter_private_t * hb_deblock_init( int pix_fmt,
     {
         return 0;
     }
-    
+
     hb_filter_private_t * pv = malloc( sizeof(struct hb_filter_private_s) );
-    
+
     pv->pix_fmt = pix_fmt;
 
     pv->width[0] = width;
     pv->height[0] = height;
-    
+
     pv->width[1] = pv->width[2] = width >> 1;
     pv->height[1] = pv->height[2] = height >> 1;
-    
+
 
     pv->pp7_qp    = PP7_QP_DEFAULT;
     pv->pp7_mode  = PP7_MODE_DEFAULT;
@@ -378,14 +378,14 @@ hb_filter_private_t * hb_deblock_init( int pix_fmt,
     {
         sscanf( settings, "%d:%d", &pv->pp7_qp, &pv->pp7_mode );
     }
-    
+
     if( pv->pp7_qp < 0 )
     {
         pv->pp7_qp = 0;
     }
-    
+
     pp7_init_threshold();
-    
+
     switch( pv->pp7_mode )
     {
         case 0:
@@ -398,93 +398,93 @@ hb_filter_private_t * hb_deblock_init( int pix_fmt,
             pp7_requantize = pp7_medium_threshold;
             break;
     }
-    
+
     int h = (height+16+15)&(~15);
-    
+
     pv->pp7_temp_stride = (width+16+15)&(~15);
 
     pv->pp7_src = (uint8_t*)malloc( pv->pp7_temp_stride*(h+8)*sizeof(uint8_t) );
-    
-    int buf_size = 3 * width * height / 2;    
+
+    int buf_size = 3 * width * height / 2;
     pv->buf_out = hb_buffer_init( buf_size );
-    
+
     return pv;
 }
 
 void hb_deblock_close( hb_filter_private_t * pv )
 {
-    if( !pv ) 
+    if( !pv )
     {
         return;
-    }    
-    
+    }
+
     if( pv->buf_out )
     {
         hb_buffer_close( &pv->buf_out );
     }
-    
+
     free( pv );
 }
 
 int hb_deblock_work( const hb_buffer_t * buf_in,
                      hb_buffer_t ** buf_out,
                      int pix_fmt,
-                     int width, 
+                     int width,
                      int height,
                      hb_filter_private_t * pv )
-{   
-    if( !pv || 
+{
+    if( !pv ||
         pix_fmt != pv->pix_fmt ||
         width != pv->width[0] ||
         height != pv->height[0] )
     {
         return FILTER_FAILED;
     }
-    
-    avpicture_fill( &pv->pic_in, buf_in->data, 
+
+    avpicture_fill( &pv->pic_in, buf_in->data,
                     pix_fmt, width, height );
 
-    avpicture_fill( &pv->pic_out, pv->buf_out->data, 
+    avpicture_fill( &pv->pic_out, pv->buf_out->data,
                     pix_fmt, width, height );
 
     if( /*TODO: mpi->qscale ||*/ pv->pp7_qp )
     {
-        pp7_filter( pv, 
-                pv->pic_out.data[0], 
-                pv->pic_in.data[0], 
-                pv->width[0], 
+        pp7_filter( pv,
+                pv->pic_out.data[0],
+                pv->pic_in.data[0],
+                pv->width[0],
                 pv->height[0],
                 NULL, /* TODO: mpi->qscale*/
                 0,    /* TODO: mpi->qstride*/
                 1 );
 
-        pp7_filter( pv, 
-                pv->pic_out.data[1], 
-                pv->pic_in.data[1], 
-                pv->width[1], 
+        pp7_filter( pv,
+                pv->pic_out.data[1],
+                pv->pic_in.data[1],
+                pv->width[1],
                 pv->height[1],
                 NULL, /* TODO: mpi->qscale*/
                 0,    /* TODO: mpi->qstride*/
                 0 );
 
-        pp7_filter( pv, 
-                pv->pic_out.data[2], 
-                pv->pic_in.data[2], 
-                pv->width[2], 
+        pp7_filter( pv,
+                pv->pic_out.data[2],
+                pv->pic_in.data[2],
+                pv->width[2],
                 pv->height[2],
                 NULL, /* TODO: mpi->qscale*/
                 0,    /* TODO: mpi->qstride*/
-                0 );        
+                0 );
     }
     else
     {
         memcpy( pv->buf_out->data, buf_in->data, buf_in->size );
-    } 
-    
+    }
+
     hb_buffer_copy_settings( pv->buf_out, buf_in );
-    
+
     *buf_out = pv->buf_out;
-    
+
     return FILTER_OK;
 }