src/recordmydesktop.h: Move away the [yuv]blocks globals.

src/yuv_utils.h: Move out the DBUF- and the MARK_BACK_BUFFER_C() macros.

src/block_utils.[ch]: New files hosting the [yuv]blocks globals and DBUF-macros.

src/get_frame.c: Put MARK_BACK_BUFFER_C() locally here.

src/Makefile.am
src/rmd_rescue.c
src/cache_frame.c
src/initialize_data.c: Adapt to changes.


git-svn-id: https://recordmydesktop.svn.sourceforge.net/svnroot/recordmydesktop/trunk@540 f606c939-3180-4ac9-a4b8-4b8779d57d0a

1 files changed, 4 insertions, 150 deletions

diff --git a/recordmydesktop/src/yuv_utils.h b/recordmydesktop/src/yuv_utils.h
index 6890a23..7b417b6 100644
--- a/recordmydesktop/src/yuv_utils.h
+++ b/recordmydesktop/src/yuv_utils.h
@@ -27,6 +27,10 @@
 #ifndef YUV_UTILS_H
 #define YUV_UTILS_H 1
 
+#include "rmdtypes.h"
+#include "block_utils.h"
+#include "rmdmacro.h"
+
 
 // The macros work directly on this data (for performance reasons I
 // suppose) so we keep this global
@@ -72,10 +76,6 @@ extern unsigned char Yr[256], Yg[256], Yb[256],
             (t3&0x000000ff)+(t4&0x000000ff))/4)&0x000000ff);\
 }
 
-#define POINT_IN_BLOCK(xv,yv,widthv,blocksize) ((yv/blocksize)*\
-                                                (widthv/blocksize)+\
-                                                (xv/blocksize))
-
 #define UPDATE_Y_PLANE(data,\
                        x_tm,\
                        y_tm,\
@@ -101,37 +101,6 @@ extern unsigned char Yr[256], Yg[256], Yb[256],
     }\
 }
 
-#define UPDATE_Y_PLANE_DBUF(data,\
-                            data_back,\
-                            x_tm,\
-                            y_tm,\
-                            height_tm,\
-                            width_tm,\
-                            yuv,\
-                            __bit_depth__){ \
-    int k,i;\
-    register u_int##__bit_depth__##_t t_val;\
-    register unsigned char  *yuv_y=yuv->y+x_tm+y_tm*yuv->y_width,\
-                            *_yr=Yr,*_yg=Yg,*_yb=Yb;\
-    register u_int##__bit_depth__##_t *datapi=(u_int##__bit_depth__##_t *)data,\
-                            *datapi_back=(u_int##__bit_depth__##_t *)data_back;\
-    for(k=0;k<height_tm;k++){\
-        for(i=0;i<width_tm;i++){\
-            if(*datapi!=*datapi_back){\
-                t_val=*datapi;\
-                *yuv_y=_yr[__RVALUE_##__bit_depth__(t_val)] +\
-                    _yg[__GVALUE_##__bit_depth__(t_val)] +\
-                    _yb[__BVALUE_##__bit_depth__(t_val)] ;\
-                yblocks[POINT_IN_BLOCK(i,k,width_tm,Y_UNIT_WIDTH)]=1;\
-            }\
-            datapi++;\
-            datapi_back++;\
-            yuv_y++;\
-        }\
-        yuv_y+=yuv->y_width-width_tm;\
-    }\
-}
-
 #define UPDATE_A_UV_PIXEL(yuv_u,\
                           yuv_v,\
                           t_val,\
@@ -198,100 +167,6 @@ extern unsigned char Yr[256], Yg[256], Yb[256],
     }\
 }
 
-#define UPDATE_UV_PLANES_DBUF(  data,\
-                                data_back,\
-                                x_tm,\
-                                y_tm,\
-                                height_tm,\
-                                width_tm,\
-                                yuv,\
-                                __sampling_type,\
-                                __bit_depth__){  \
-    int k,i;\
-    register u_int##__bit_depth__##_t t_val;\
-    register unsigned char  *yuv_u=yuv->u+x_tm/2+(y_tm*yuv->uv_width)/2,\
-                            *yuv_v=yuv->v+x_tm/2+(y_tm*yuv->uv_width)/2,\
-                            *_ur=Ur,*_ug=Ug,*_ubvr=UbVr,\
-                            *_vg=Vg,*_vb=Vb;\
-    register u_int##__bit_depth__##_t *datapi=(u_int##__bit_depth__##_t *)data,\
-                                      *datapi_next=NULL,\
-                            *datapi_back=(u_int##__bit_depth__##_t *)data_back,\
-                            *datapi_back_next=NULL;\
-    if(__sampling_type==__PXL_AVERAGE){\
-        datapi_next=datapi+width_tm;\
-        datapi_back_next=datapi_back+width_tm;\
-        for(k=0;k<height_tm;k+=2){\
-            for(i=0;i<width_tm;i+=2){\
-                if(( (*datapi!=*datapi_back) ||\
-                    (*(datapi+1)!=*(datapi_back+1)) ||\
-                    (*datapi_next!=*datapi_back_next) ||\
-                    (*(datapi_next+1)!=*(datapi_back_next+1)))){\
-                    UPDATE_A_UV_PIXEL(  yuv_u,\
-                                        yuv_v,\
-                                        t_val,\
-                                        datapi,\
-                                        datapi_next,\
-                                        _ur,_ug,_ubvr,_vg,_vb,\
-                                        __sampling_type,\
-                                        __bit_depth__)\
-                    ublocks[POINT_IN_BLOCK(i,k,width_tm,Y_UNIT_WIDTH)]=1;\
-                    vblocks[POINT_IN_BLOCK(i,k,width_tm,Y_UNIT_WIDTH)]=1;\
-                }\
-                datapi+=2;\
-                datapi_back+=2;\
-                if(__sampling_type==__PXL_AVERAGE){\
-                    datapi_next+=2;\
-                    datapi_back_next+=2;\
-                }\
-                yuv_u++;\
-                yuv_v++;\
-            }\
-            yuv_u+=(yuv->y_width-width_tm)/2;\
-            yuv_v+=(yuv->y_width-width_tm)/2;\
-            datapi+=width_tm;\
-            datapi_back+=width_tm;\
-            if(__sampling_type==__PXL_AVERAGE){\
-                datapi_next+=width_tm;\
-                datapi_back_next+=width_tm;\
-            }\
-        }\
-    }\
-    else{\
-        for(k=0;k<height_tm;k+=2){\
-            for(i=0;i<width_tm;i+=2){\
-                if ((*datapi!=*datapi_back)){\
-                    UPDATE_A_UV_PIXEL(  yuv_u,\
-                                        yuv_v,\
-                                        t_val,\
-                                        datapi,\
-                                        datapi_next,\
-                                        _ur,_ug,_ubvr,_vg,_vb,\
-                                        __sampling_type,\
-                                        __bit_depth__)\
-                    ublocks[POINT_IN_BLOCK(i,k,width_tm,Y_UNIT_WIDTH)]=1;\
-                    vblocks[POINT_IN_BLOCK(i,k,width_tm,Y_UNIT_WIDTH)]=1;\
-                }\
-                datapi+=2;\
-                datapi_back+=2;\
-                if(__sampling_type==__PXL_AVERAGE){\
-                    datapi_next+=2;\
-                    datapi_back_next+=2;\
-                }\
-                yuv_u++;\
-                yuv_v++;\
-            }\
-            yuv_u+=(yuv->y_width-width_tm)/2;\
-            yuv_v+=(yuv->y_width-width_tm)/2;\
-            datapi+=width_tm;\
-            datapi_back+=width_tm;\
-            if(__sampling_type==__PXL_AVERAGE){\
-                datapi_next+=width_tm;\
-                datapi_back_next+=width_tm;\
-            }\
-        }\
-    }\
-}
-
 #define UPDATE_YUV_BUFFER(yuv,\
                           data,\
                           data_back,\
@@ -363,27 +238,6 @@ extern unsigned char Yr[256], Yg[256], Yb[256],
     }\
 }
 
-#define MARK_BACK_BUFFER_C( data,\
-                            x_tm,\
-                            y_tm,\
-                            width_tm,\
-                            height_tm,\
-                            buffer_width,\
-                            __bit_depth__){\
-    int k,i;\
-    register u_int##__bit_depth__##_t\
-        *datapi=\
-            ((u_int##__bit_depth__##_t *)data)+y_tm*buffer_width+x_tm;\
-    for(k=0;k<height_tm;k++){\
-        for(i=0;i<width_tm;i++){\
-            *datapi+=1;\
-            datapi++;\
-        }\
-        datapi+=buffer_width-width_tm;\
-    }\
-}
-
-
 /**
 * Fill Yr,Yg,Yb,Ur,Ug.Ub,Vr,Vg,Vb arrays(globals) with values.
 */