Mercurial > sdl-ios-xcode
view src/audio/SDL_mixer_MMX_VC.c @ 1629:ef4a796e7f24
Fixed bug #55
From Christian Walther:
When writing my patch for #12, I ended up doing all sorts of changes to the way
application/window activating/deactivating is handled in the Quartz backend,
resulting in the attached patch. It does make the code a bit cleaner IMHO, but
as it might be regarded as a case of "if it ain't broken, don't fix it" I'd
like to hear other people's opinion about it. Please shout if some change
strikes you as unnecessary or wrong, and I'll explain the reasons behind it. As
far as I tested it, it does not introduce any new bugs, but I may well have
missed some.
- The most fundamental change (that triggered most of the others) is irrelevant
for the usual single-window SDL applications, it only affects the people who
are crazy enough to display other Cocoa windows alongside the SDL window (I'm
actually doing this currently, although the additional window only displays
debugging info and won't be present in the final product): Before, some things
were done on the application becoming active, some on the window becoming key,
and some on the window becoming main. Conceptually, all these actions belong to
the window becoming key, so that's what I implemented. However, since in a
single-window application these three events always happen together, the
previous implementation "ain't broken".
- This slightly changed the meaning of the SDL_APPMOUSEFOCUS flag from
SDL_GetAppState(): Before, it meant "window is main and mouse is inside window
(or mode is fullscreen)". Now, it means "window is key and mouse is inside
window (or mode is fullscreen)". It makes more sense to me that way. (See
http://developer.apple.com/documentation/Cocoa/Conceptual/WinPanel/Concepts/ChangingMainKeyWindow.html
for a discussion of what key and main windows are.) The other two flags are
unchanged: SDL_APPACTIVE = application is not hidden and window is not
minimized, SDL_APPINPUTFOCUS = window is key (or mode is fullscreen).
- As a side effect, the reorganization fixes the following two issues (and
maybe others) (but they could also be fixed in less invasive ways):
* A regression that was introduced in revision 1.42 of SDL_QuartzVideo.m
(http://libsdl.org/cgi/cvsweb.cgi/SDL12/src/video/quartz/SDL_QuartzVideo.m.diff?r1=1.41&r2=1.42)
(from half-desirable to undesirable behavior):
Situation: While in windowed mode, hide the cursor using
SDL_ShowCursor(SDL_DISABLE), move the mouse outside of the window so that the
cursor becomes visible again, and SDL_SetVideoMode() to a fullscreen mode.
What happened before revision 1.42: The cursor is visible, but becomes
invisible as soon as the mouse is moved (half-desirable).
What happens in revision 1.42 and after (including current CVS): The cursor is
visible and stays visible (undesirable).
What happens after my patch: The cursor is invisible from the beginning
(desirable).
* When the cursor is hidden and grabbed, switch away from the application using
cmd-tab (which ungrabs and makes the cursor visible), move the cursor outside
of the SDL window, then cmd-tab back to the application. In 1.2.8 and in the
current CVS, the cursor is re-grabbed, but it stays visible (immovable in the
middle of the window). With my patch, the cursor is correctly re-grabbed and
hidden. (For some reason, it still doesn't work correctly if you switch back to
the application using the dock instead of cmd-tab. I haven't been able to
figure out why. I can step over [NSCursor hide] being called in the debugger,
but it seems to have no effect.)
- The patch includes my patch for #12 (it was easier to obtain using cvs diff
that way). If you apply both of them, you will end up with 6 duplicate lines in
SDL_QuartzEvents.m.
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Thu, 13 Apr 2006 14:17:48 +0000 |
parents | e3242177fe4a |
children | 782fd950bd46 c121d94672cb 328a3f973890 |
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" #include "SDL_mixer_MMX_VC.h" #if ((defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)) && defined(SDL_ASSEMBLY_ROUTINES) // MMX assembler version of SDL_MixAudio for signed little endian 16 bit samples and signed 8 bit samples // Copyright 2002 Stephane Marchesin (stephane.marchesin@wanadoo.fr) // Converted to Intel ASM notation by Cth // This code is licensed under the LGPL (see COPYING for details) // // Assumes buffer size in bytes is a multiple of 16 // Assumes SDL_MIX_MAXVOLUME = 128 //////////////////////////////////////////////// // Mixing for 16 bit signed buffers //////////////////////////////////////////////// void SDL_MixAudio_MMX_S16_VC(char* dst,char* src,unsigned int nSize,int volume) { __asm { push edi push esi push ebx mov edi, dst // edi = dst mov esi, src // esi = src mov eax, volume // eax = volume mov ebx, nSize // ebx = size shr ebx, 4 // process 16 bytes per iteration = 8 samples jz endS16 pxor mm0, mm0 movd mm0, eax //%%eax,%%mm0 movq mm1, mm0 //%%mm0,%%mm1 psllq mm0, 16 //$16,%%mm0 por mm0, mm1 //%%mm1,%%mm0 psllq mm0, 16 //$16,%%mm0 por mm0, mm1 //%%mm1,%%mm0 psllq mm0, 16 //$16,%%mm0 por mm0, mm1 //%%mm1,%%mm0 // mm0 = vol|vol|vol|vol #ifndef __WATCOMC__ align 16 #endif mixloopS16: movq mm1, [esi] //(%%esi),%%mm1\n" // mm1 = a|b|c|d movq mm2, mm1 //%%mm1,%%mm2\n" // mm2 = a|b|c|d movq mm4, [esi + 8] //8(%%esi),%%mm4\n" // mm4 = e|f|g|h // pre charger le buffer dst dans mm7 movq mm7, [edi] //(%%edi),%%mm7\n" // mm7 = dst[0]" // multiplier par le volume pmullw mm1, mm0 //%%mm0,%%mm1\n" // mm1 = l(a*v)|l(b*v)|l(c*v)|l(d*v) pmulhw mm2, mm0 //%%mm0,%%mm2\n" // mm2 = h(a*v)|h(b*v)|h(c*v)|h(d*v) movq mm5, mm4 //%%mm4,%%mm5\n" // mm5 = e|f|g|h pmullw mm4, mm0 //%%mm0,%%mm4\n" // mm4 = l(e*v)|l(f*v)|l(g*v)|l(h*v) pmulhw mm5, mm0 //%%mm0,%%mm5\n" // mm5 = h(e*v)|h(f*v)|h(g*v)|h(h*v) movq mm3, mm1 //%%mm1,%%mm3\n" // mm3 = l(a*v)|l(b*v)|l(c*v)|l(d*v) punpckhwd mm1, mm2 //%%mm2,%%mm1\n" // mm1 = a*v|b*v movq mm6, mm4 //%%mm4,%%mm6\n" // mm6 = l(e*v)|l(f*v)|l(g*v)|l(h*v) punpcklwd mm3, mm2 //%%mm2,%%mm3\n" // mm3 = c*v|d*v punpckhwd mm4, mm5 //%%mm5,%%mm4\n" // mm4 = e*f|f*v punpcklwd mm6, mm5 //%%mm5,%%mm6\n" // mm6 = g*v|h*v // pre charger le buffer dst dans mm5 movq mm5, [edi + 8] //8(%%edi),%%mm5\n" // mm5 = dst[1] // diviser par 128 psrad mm1, 7 //$7,%%mm1\n" // mm1 = a*v/128|b*v/128 , 128 = SDL_MIX_MAXVOLUME add esi, 16 //$16,%%esi\n" psrad mm3, 7 //$7,%%mm3\n" // mm3 = c*v/128|d*v/128 psrad mm4, 7 //$7,%%mm4\n" // mm4 = e*v/128|f*v/128 // mm1 = le sample avec le volume modifie packssdw mm3, mm1 //%%mm1,%%mm3\n" // mm3 = s(a*v|b*v|c*v|d*v) psrad mm6, 7 //$7,%%mm6\n" // mm6= g*v/128|h*v/128 paddsw mm3, mm7 //%%mm7,%%mm3\n" // mm3 = adjust_volume(src)+dst // mm4 = le sample avec le volume modifie packssdw mm6, mm4 //%%mm4,%%mm6\n" // mm6 = s(e*v|f*v|g*v|h*v) movq [edi], mm3 //%%mm3,(%%edi)\n" paddsw mm6, mm5 //%%mm5,%%mm6\n" // mm6 = adjust_volume(src)+dst movq [edi + 8], mm6 //%%mm6,8(%%edi)\n" add edi, 16 //$16,%%edi\n" dec ebx //%%ebx\n" jnz mixloopS16 ends16: emms pop ebx pop esi pop edi } } //////////////////////////////////////////////// // Mixing for 8 bit signed buffers //////////////////////////////////////////////// void SDL_MixAudio_MMX_S8_VC(char* dst,char* src,unsigned int nSize,int volume) { _asm { push edi push esi push ebx mov edi, dst //movl %0,%%edi // edi = dst mov esi, src //%1,%%esi // esi = src mov eax, volume //%3,%%eax // eax = volume movd mm0, eax //%%eax,%%mm0 movq mm1, mm0 //%%mm0,%%mm1 psllq mm0, 16 //$16,%%mm0 por mm0, mm1 //%%mm1,%%mm0 psllq mm0, 16 //$16,%%mm0 por mm0, mm1 //%%mm1,%%mm0 psllq mm0, 16 //$16,%%mm0 por mm0, mm1 //%%mm1,%%mm0 mov ebx, nSize //%2,%%ebx // ebx = size shr ebx, 3 //$3,%%ebx // process 8 bytes per iteration = 8 samples cmp ebx, 0 //$0,%%ebx je endS8 #ifndef __WATCOMC__ align 16 #endif mixloopS8: pxor mm2, mm2 //%%mm2,%%mm2 // mm2 = 0 movq mm1, [esi] //(%%esi),%%mm1 // mm1 = a|b|c|d|e|f|g|h movq mm3, mm1 //%%mm1,%%mm3 // mm3 = a|b|c|d|e|f|g|h // on va faire le "sign extension" en faisant un cmp avec 0 qui retourne 1 si <0, 0 si >0 pcmpgtb mm2, mm1 //%%mm1,%%mm2 // mm2 = 11111111|00000000|00000000.... punpckhbw mm1, mm2 //%%mm2,%%mm1 // mm1 = 0|a|0|b|0|c|0|d punpcklbw mm3, mm2 //%%mm2,%%mm3 // mm3 = 0|e|0|f|0|g|0|h movq mm2, [edi] //(%%edi),%%mm2 // mm2 = destination pmullw mm1, mm0 //%%mm0,%%mm1 // mm1 = v*a|v*b|v*c|v*d add esi, 8 //$8,%%esi pmullw mm3, mm0 //%%mm0,%%mm3 // mm3 = v*e|v*f|v*g|v*h psraw mm1, 7 //$7,%%mm1 // mm1 = v*a/128|v*b/128|v*c/128|v*d/128 psraw mm3, 7 //$7,%%mm3 // mm3 = v*e/128|v*f/128|v*g/128|v*h/128 packsswb mm3, mm1 //%%mm1,%%mm3 // mm1 = v*a/128|v*b/128|v*c/128|v*d/128|v*e/128|v*f/128|v*g/128|v*h/128 paddsb mm3, mm2 //%%mm2,%%mm3 // add to destination buffer movq [edi], mm3 //%%mm3,(%%edi) // store back to ram add edi, 8 //$8,%%edi dec ebx //%%ebx jnz mixloopS8 endS8: emms pop ebx pop esi pop edi } } #endif /* SDL_ASSEMBLY_ROUTINES */