From 98e747f9d2d94ff2e7c3673e3593a10394e1beb6 Mon Sep 17 00:00:00 2001 From: enselic Date: Fri, 12 Sep 2008 18:27:36 +0000 Subject: There is no point in keeping MakeMatrices() in a separate file. src/Makefile.am src/bgr_to_yuv.c: Deleted. src/initialize_data.c: Put MakeMatrices() here as a static function. git-svn-id: https://recordmydesktop.svn.sourceforge.net/svnroot/recordmydesktop/trunk@509 f606c939-3180-4ac9-a4b8-4b8779d57d0a --- recordmydesktop/include/rmdfunc.h | 5 ---- recordmydesktop/src/Makefile.am | 1 - recordmydesktop/src/bgr_to_yuv.c | 52 ----------------------------------- recordmydesktop/src/initialize_data.c | 26 ++++++++++++++++++ 4 files changed, 26 insertions(+), 58 deletions(-) delete mode 100644 recordmydesktop/src/bgr_to_yuv.c diff --git a/recordmydesktop/include/rmdfunc.h b/recordmydesktop/include/rmdfunc.h index f7390b8..3b979c7 100644 --- a/recordmydesktop/include/rmdfunc.h +++ b/recordmydesktop/include/rmdfunc.h @@ -360,11 +360,6 @@ int OpenDev( const char *pcm_dev, */ void InitEncoder(ProgData *pdata,EncData *enc_data_t,int buffer_ready); -/** -* Fill Yr,Yg,Yb,Ur,Ug.Ub,Vr,Vg,Vb arrays(globals) with values. -*/ -void MakeMatrices(); - /** * Image caching thread. Copies the yuv buffer, compares with the last one and * caches the result. diff --git a/recordmydesktop/src/Makefile.am b/recordmydesktop/src/Makefile.am index 48ac3bc..eb91423 100644 --- a/recordmydesktop/src/Makefile.am +++ b/recordmydesktop/src/Makefile.am @@ -1,7 +1,6 @@ bin_PROGRAMS = recordmydesktop recordmydesktop_SOURCES = \ - bgr_to_yuv.c \ cache_audio.c \ cache_frame.c \ capture_sound.c \ diff --git a/recordmydesktop/src/bgr_to_yuv.c b/recordmydesktop/src/bgr_to_yuv.c deleted file mode 100644 index 38e6d5b..0000000 --- a/recordmydesktop/src/bgr_to_yuv.c +++ /dev/null @@ -1,52 +0,0 @@ -/****************************************************************************** -* recordMyDesktop * -******************************************************************************* -* * -* Copyright (C) 2006,2007,2008 John Varouhakis * -* * -* * -* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * -* * -* * -* * -* For further information contact me at johnvarouhakis@gmail.com * -******************************************************************************/ - - -#include - -void MakeMatrices(){ - int i; - - for(i=0;i<256;i++) - Yr[i]=(2104.0*i)/8192.0+8.0; - for(i=0;i<256;i++) - Yg[i]=(4130.0*i)/8192.0+8.0; - for(i=0;i<256;i++) - Yb[i]=(802.0*i)/8192.0; - - for(i=0;i<256;i++) - Ur[i]=37.8-(1204.0*i)/8192.0+8.0; - for(i=0;i<256;i++) - Ug[i]=74.2-(2384.0*i)/8192.0+8.0; - for(i=0;i<256;i++) - UbVr[i]=(3598.0*i)/8192.0 ; - - for(i=0;i<256;i++) - Vg[i]=93.8-(3013.0*i)/8192.0+8.0; - for(i=0;i<256;i++) - Vb[i]=18.2-(585.0*i)/8192.0+8.0; -} - diff --git a/recordmydesktop/src/initialize_data.c b/recordmydesktop/src/initialize_data.c index 6929917..083519b 100644 --- a/recordmydesktop/src/initialize_data.c +++ b/recordmydesktop/src/initialize_data.c @@ -43,6 +43,32 @@ void FixBufferSize(u_int32_t *buffsize){ (int)buffsize_ret,(int)*buffsize); } +/** +* Fill Yr,Yg,Yb,Ur,Ug.Ub,Vr,Vg,Vb arrays(globals) with values. +*/ +static void MakeMatrices () { + int i; + + for (i = 0; i < 256; i++) + Yr[i] = (2104.0 * i) / 8192.0 + 8.0; + for (i = 0; i < 256; i++) + Yg[i] = (4130.0 * i) / 8192.0 + 8.0; + for (i = 0; i < 256; i++) + Yb[i] = (802.0 * i) / 8192.0; + + for (i = 0; i < 256; i++) + Ur[i] = 37.8 - (1204.0 * i) / 8192.0 + 8.0; + for (i = 0; i < 256; i++) + Ug[i] = 74.2 - (2384.0 * i) / 8192.0 + 8.0; + for (i = 0; i < 256; i++) + UbVr[i] = (3598.0 * i) / 8192.0 ; + + for (i = 0; i < 256; i++) + Vg[i] = 93.8 - (3013.0 * i) / 8192.0 + 8.0; + for (i = 0; i < 256; i++) + Vb[i] = 18.2 - (585.0 * i) / 8192.0 + 8.0; +} + int InitializeData(ProgData *pdata, EncData *enc_data, CacheData *cache_data){ -- cgit v1.2.3