include/recordmydesktop.h: Get rid of YUV data variables (which were

insanely *defined* in this header (like the other globals)).

include/rmdmacro.h: Get rid of YUV utility macros.

src/initialize_data.c: Get rid of MakeMatrices() and include the new yuv_utils.h.

src/yuv_utils.[ch]: New files to host the YUV data variables and the
MakeMatrices() function. The globals are now properly defined in
the .c and exposed in the .h which also contains the YUV utility macros.

src/get_frame.c
src/update_image.c: Include the new yuv_utils.h

src/Makefile.am: Added yuv_utils.[ch].


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

2 files changed, 0 insertions, 315 deletions

diff --git a/recordmydesktop/include/recordmydesktop.h b/recordmydesktop/include/recordmydesktop.h
index 42965f8..b0d0063 100644
--- a/recordmydesktop/include/recordmydesktop.h
+++ b/recordmydesktop/include/recordmydesktop.h
@@ -50,9 +50,6 @@ u_int32_t   *yblocks,
 /**Globals*/
 //I've read somewhere that I'll go to hell for using globals...
 
-unsigned char   Yr[256],Yg[256],Yb[256],
-                Ur[256],Ug[256],UbVr[256],
-                Vg[256],Vb[256];
 //the following values are of no effect
 //but they might be usefull later for profiling
 unsigned int    frames_total,   //frames calculated by total time expirations
diff --git a/recordmydesktop/include/rmdmacro.h b/recordmydesktop/include/rmdmacro.h
index 90fbe2a..ee43cdf 100644
--- a/recordmydesktop/include/rmdmacro.h
+++ b/recordmydesktop/include/rmdmacro.h
@@ -189,318 +189,6 @@
              (t3&__B16_MASK)+(t4&__B16_MASK))/4)&__B16_MASK);\
 }
 
-#define POINT_IN_BLOCK(xv,yv,widthv,blocksize) ((yv/blocksize)*\
-                                                (widthv/blocksize)+\
-                                                (xv/blocksize))
-
-#define UPDATE_Y_PLANE(data,\
-                       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;\
-    for(k=0;k<height_tm;k++){\
-        for(i=0;i<width_tm;i++){\
-            t_val=*datapi;\
-            *yuv_y=_yr[__RVALUE_##__bit_depth__(t_val)] +\
-                   _yg[__GVALUE_##__bit_depth__(t_val)] +\
-                   _yb[__BVALUE_##__bit_depth__(t_val)] ;\
-            datapi++;\
-            yuv_y++;\
-        }\
-        yuv_y+=yuv->y_width-width_tm;\
-    }\
-}
-
-#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,\
-                          datapi,\
-                          datapi_next,\
-                          _ur,_ug,_ubvr,_vg,_vb,\
-                          __sampling_type,\
-                          __bit_depth__)\
-            if(__sampling_type==__PXL_AVERAGE){\
-                CALC_TVAL_AVG_##__bit_depth__(t_val,datapi,datapi_next)\
-            }\
-            else\
-                t_val=*datapi;\
-            *yuv_u=\
-            _ur[__RVALUE_##__bit_depth__(t_val)] +\
-            _ug[__GVALUE_##__bit_depth__(t_val)] +\
-            _ubvr[__BVALUE_##__bit_depth__(t_val)];\
-            *yuv_v=\
-            _ubvr[__RVALUE_##__bit_depth__(t_val)] +\
-            _vg[__GVALUE_##__bit_depth__(t_val)] +\
-            _vb[__BVALUE_##__bit_depth__(t_val)];\
-
-
-#define UPDATE_UV_PLANES(data,\
-                         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;\
-    if(__sampling_type==__PXL_AVERAGE){\
-        datapi_next=datapi+width_tm;\
-    }\
-    for(k=0;k<height_tm;k+=2){\
-        for(i=0;i<width_tm;i+=2){\
-            UPDATE_A_UV_PIXEL(  yuv_u,\
-                                yuv_v,\
-                                t_val,\
-                                datapi,\
-                                datapi_next,\
-                                _ur,_ug,_ubvr,_vg,_vb,\
-                                __sampling_type,\
-                                __bit_depth__)\
-            datapi+=2;\
-            if(__sampling_type==__PXL_AVERAGE)\
-                datapi_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;\
-        if(__sampling_type==__PXL_AVERAGE)\
-            datapi_next+=width_tm;\
-    }\
-}
-
-#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,\
-                          x_tm,\
-                          y_tm,\
-                          width_tm,\
-                          height_tm,\
-                          __sampling_type,\
-                          __color_depth){\
-    if(data_back==NULL){\
-        if((__color_depth==24)||(__color_depth==32)){\
-            UPDATE_Y_PLANE(data,x_tm,y_tm,height_tm,width_tm,yuv,32)\
-            UPDATE_UV_PLANES(data,x_tm,y_tm,height_tm,width_tm,\
-                             yuv,__sampling_type,32)\
-        }\
-        else if(__color_depth==16){\
-            UPDATE_Y_PLANE(data,x_tm,y_tm,height_tm,width_tm,yuv,16)\
-            UPDATE_UV_PLANES(data,x_tm,y_tm,height_tm,width_tm,\
-                            yuv,__sampling_type,16)\
-        }\
-    }\
-    else{\
-        if((__color_depth==24)||(__color_depth==32)){\
-            UPDATE_Y_PLANE_DBUF(data,data_back,x_tm,y_tm,\
-                                height_tm,width_tm,yuv,32)\
-            UPDATE_UV_PLANES_DBUF(data,data_back,x_tm,y_tm,height_tm,width_tm,\
-                                  yuv,__sampling_type,32)\
-        }\
-        else if(__color_depth==16){\
-            UPDATE_Y_PLANE_DBUF(data,data_back,x_tm,y_tm,\
-                                height_tm,width_tm,yuv,16)\
-            UPDATE_UV_PLANES_DBUF(data,data_back,x_tm,y_tm,height_tm,width_tm,\
-                                  yuv,__sampling_type,16)\
-        }\
-    }\
-}
-
-
-
-#define DUMMY_POINTER_TO_YUV(yuv,\
-                             data_tm,\
-                             x_tm,\
-                             y_tm,\
-                             width_tm,\
-                             height_tm,\
-                             x_offset,\
-                             y_offset,\
-                             no_pixel){\
-    int i,k,j=0;\
-    int x_2=x_tm/2,y_2=y_tm/2,y_width_2=(yuv)->y_width/2;\
-    for(k=y_offset;k<y_offset+height_tm;k++){\
-        for(i=x_offset;i<x_offset+width_tm;i++){\
-            j=k*16+i;\
-            if(data_tm[(j*4)]!=(no_pixel)){\
-                (yuv)->y[x_tm+(i-x_offset)+((k-y_offset)+y_tm)*(yuv)->y_width]=\
-                    Yr[data_tm[(j*4)+__RBYTE]] +\
-                    Yg[data_tm[(j*4)+__GBYTE]] +\
-                    Yb[data_tm[(j*4)+__BBYTE]];\
-                if((k%2)&&(i%2)){\
-                    yuv->u[x_2+(i-x_offset)/2+((k-y_offset)/2+y_2)*y_width_2]=\
-                        Ur[data_tm[(k*width_tm+i)*4+__RBYTE]] +\
-                        Ug[data_tm[(k*width_tm+i)*4+__GBYTE]] +\
-                        UbVr[data_tm[(k*width_tm+i)*4+__BBYTE]];\
-                    yuv->v[x_2+(i-x_offset)/2+((k-y_offset)/2+y_2)*y_width_2]=\
-                        UbVr[data_tm[(k*width_tm+i)*4+__RBYTE]] +\
-                        Vg[data_tm[(k*width_tm+i)*4+__GBYTE]] +\
-                        Vb[data_tm[(k*width_tm+i)*4+__BBYTE]] ;\
-                }\
-            }\
-        }\
-    }\
-}
-
-#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;\
-    }\
-}
 
 #define I16TOA(number,buffer){\
     int t_num=(number),__k=0,__i=0;\