From f39f779f299cd78a574999830699e30f92932f06 Mon Sep 17 00:00:00 2001 From: iovar Date: Fri, 2 Feb 2007 04:03:15 +0000 Subject: changed OSS buffer scheme, to work with frames(like ALSA) and reduce ifdefs git-svn-id: https://recordmydesktop.svn.sourceforge.net/svnroot/recordmydesktop/trunk@272 f606c939-3180-4ac9-a4b8-4b8779d57d0a --- recordmydesktop/src/load_cache.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'recordmydesktop/src/load_cache.c') diff --git a/recordmydesktop/src/load_cache.c b/recordmydesktop/src/load_cache.c index 00ddf96..f75c375 100644 --- a/recordmydesktop/src/load_cache.c +++ b/recordmydesktop/src/load_cache.c @@ -135,10 +135,11 @@ void *LoadCache(ProgData *pdata){ #ifdef HAVE_LIBASOUND int framesize=((snd_pcm_format_width(SND_PCM_FORMAT_S16_LE))/8)* pdata->args.channels;//audio frame size - signed char *sound_data=(signed char *)malloc(pdata->periodsize*framesize); #else - signed char *sound_data=(signed char *)malloc(pdata->args.buffsize); + int framesize=pdata->args.channels<<1;//Always signed 16 bit data #endif + signed char *sound_data=(signed char *)malloc(pdata->periodsize*framesize); + u_int32_t YBlocks[(yuv->y_width*yuv->y_height)/Y_UNIT_BYTES], UBlocks[(yuv->uv_width*yuv->uv_height)/UV_UNIT_BYTES], VBlocks[(yuv->uv_width*yuv->uv_height)/UV_UNIT_BYTES]; @@ -254,11 +255,7 @@ void *LoadCache(ProgData *pdata){ //audio load and encoding else{ if(!audio_end){ -#ifdef HAVE_LIBASOUND int nbytes=fread(sound_data,1,pdata->periodsize*framesize,afp); -#else - int nbytes=fread(sound_data,1,pdata->args.buffsize,afp); -#endif if(nbytes<=0) audio_end=1; else -- cgit v1.2.1