Mercurial > sdl-ios-xcode
view src/video/dga/SDL_dgavideo.h @ 3880:74e828c64315 SDL-1.2
Fixed bug #292
I might be on crack here.
It looks like SDL_ConvertMono() in src/audio/SDL_audiocvt.c adds the left and
right channels of a stereo stream together, and clamps the new mono channel if
it would overflow.
Shouldn't it be dividing by 2 to average the two sample points instead of
clamping? Otherwise the mono sample point's volume doubles in the conversion.
This would also make the conversion faster, as it replaces two branches per
sample frame with a bitwise shift.
--ryan.
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Sun, 24 Sep 2006 15:45:37 +0000 |
parents | 409974dedf2e |
children | c121d94672cb 6f7af895ab02 |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2006 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library 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 Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org */ #include "SDL_config.h" #ifndef _SDL_dgavideo_h #define _SDL_dgavideo_h #include <X11/Xlib.h> #include <X11/Xproto.h> #include "SDL_mouse.h" #include "SDL_mutex.h" #include "../SDL_sysvideo.h" #if SDL_VIDEO_DRIVER_X11_DPMS #include <X11/extensions/dpms.h> #endif /* Hidden "this" pointer for the video functions */ #define _THIS SDL_VideoDevice *this /* Define this if you need the DGA driver to be thread-safe */ #define LOCK_DGA_DISPLAY #ifdef LOCK_DGA_DISPLAY #define LOCK_DISPLAY() SDL_mutexP(event_lock) #define UNLOCK_DISPLAY() SDL_mutexV(event_lock) #else #define LOCK_DISPLAY() #define UNLOCK_DISPLAY() #endif /* This is the structure we use to keep track of video memory */ typedef struct vidmem_bucket { struct vidmem_bucket *prev; int used; int dirty; Uint8 *base; unsigned int size; struct vidmem_bucket *next; } vidmem_bucket; /* Private display data */ struct SDL_PrivateVideoData { Display *DGA_Display; Colormap DGA_colormap; int visualClass; #define NUM_MODELISTS 4 /* 8, 16, 24, and 32 bits-per-pixel */ int SDL_nummodes[NUM_MODELISTS]; SDL_Rect **SDL_modelist[NUM_MODELISTS]; /* Information for the video surface */ Uint8 *memory_base; int memory_pitch; SDL_mutex *hw_lock; int sync_needed; int was_flipped; /* Information for hardware surfaces */ vidmem_bucket surfaces; int surfaces_memtotal; int surfaces_memleft; /* Information for double-buffering */ int flip_page; int flip_yoffset[2]; Uint8 *flip_address[2]; /* Used to handle DGA events */ int event_base; #ifdef LOCK_DGA_DISPLAY SDL_mutex *event_lock; #endif /* Screensaver settings */ int screensaver_timeout; BOOL dpms_enabled; }; /* Old variable names */ #define DGA_Display (this->hidden->DGA_Display) #define DGA_Screen DefaultScreen(DGA_Display) #define DGA_colormap (this->hidden->DGA_colormap) #define DGA_visualClass (this->hidden->visualClass) #define memory_base (this->hidden->memory_base) #define memory_pitch (this->hidden->memory_pitch) #define flip_page (this->hidden->flip_page) #define flip_yoffset (this->hidden->flip_yoffset) #define flip_address (this->hidden->flip_address) #define sync_needed (this->hidden->sync_needed) #define was_flipped (this->hidden->was_flipped) #define SDL_nummodes (this->hidden->SDL_nummodes) #define SDL_modelist (this->hidden->SDL_modelist) #define surfaces (this->hidden->surfaces) #define surfaces_memtotal (this->hidden->surfaces_memtotal) #define surfaces_memleft (this->hidden->surfaces_memleft) #define hw_lock (this->hidden->hw_lock) #define DGA_event_base (this->hidden->event_base) #define event_lock (this->hidden->event_lock) #define screensaver_timeout (this->hidden->screensaver_timeout) #define dpms_enabled (this->hidden->dpms_enabled) #endif /* _SDL_dgavideo_h */