Mercurial > sdl-ios-xcode
annotate src/audio/symbian/streamplayer.cpp @ 4157:baf615f9f2a0 SDL-1.2
Date: Thu, 16 Oct 2008 20:27:34 +0400
From: "Ilya Kasnacheev" <ilya.kasnacheev@gmail.com>
To: sdl@lists.libsdl.org
Subject: [SDL] SDL for Windows CE: a few GAPI patches
Hi *!
I've just ported a POWDER roguelike ( http://www.zincland.com/powder/ ) to
Windows CE (PDAs, Windows Mobile/Pocket PC). To do that, I had to get libsdl
working. Thanks for the awesome project files, it built without a hitch.
Nevertheless, I've found quite a few bugs in Windows CE (GAPI) SDL
implementation, which I've solved and now present as a serie of patches.
I'll try carefully annotate them. Please annotate them so I can work
toward accepting
them into the main source tree since without them SDL isn't really working on
Windows CE (I wonder why nobody fixed them before, btw: why isn't SDL popular as
a way to develop Windows CE games? Where are no ports?)
These changes can't be considered flawless, but they can be considered working
because I've yet to hear complains about things I fixed and POWDER build for
Windows CE is now considered stable.
Note: my comments start with !!, delete them before applying.
diff -bru SDL-1.2.13/src/video/gapi/SDL_gapivideo.c
SDL-1.2.13-new/src/video/gapi/SDL_gapivideo.c
--- SDL-1.2.13/src/video/gapi/SDL_gapivideo.c 2007-12-31
07:48:00.000000000 +0300
+++ SDL-1.2.13-new/src/video/gapi/SDL_gapivideo.c 2008-10-16
20:02:11.000000000 +0400
@@ -643,6 +643,7 @@
}
gapi->userOrientation = SDL_ORIENTATION_UP;
+ gapi->systemOrientation = SDL_ORIENTATION_UP;
video->flags = SDL_FULLSCREEN; /* Clear flags, GAPI supports
fullscreen only */
/* GAPI or VGA? */
@@ -661,18 +662,21 @@
}
/* detect user landscape mode */
- if( (width > height) && (GetSystemMetrics(SM_CXSCREEN) <
GetSystemMetrics(SM_CYSCREEN)))
+ if( (width > height) && (gapi->gxProperties.cxWidth <
gapi->gxProperties.cyHeight))
gapi->userOrientation = SDL_ORIENTATION_RIGHT;
+ if(GetSystemMetrics(SM_CYSCREEN) < GetSystemMetrics(SM_CXSCREEN))
+ gapi->systemOrientation = SDL_ORIENTATION_RIGHT;
+
/* shall we apply hires fix? for example when we do not use
hires resource */
gapi->hiresFix = 0;
- if( gapi->userOrientation == SDL_ORIENTATION_RIGHT )
+ if( gapi->systemOrientation == gapi->userOrientation )
{
- if( (width > GetSystemMetrics(SM_CYSCREEN)) || (height
> GetSystemMetrics(SM_CXSCREEN)))
+ if( (width > GetSystemMetrics(SM_CXSCREEN)) || (height
> GetSystemMetrics(SM_CYSCREEN)))
gapi->hiresFix = 1;
} else
- if( (width > GetSystemMetrics(SM_CXSCREEN)) || (height
> GetSystemMetrics(SM_CYSCREEN)))
- if( !((width == GetSystemMetrics(SM_CYSCREEN))
&& (height == GetSystemMetrics(SM_CXSCREEN)))) // user portrait,
device landscape
+ if( (width > GetSystemMetrics(SM_CYSCREEN)) || (height
> GetSystemMetrics(SM_CXSCREEN)))
+// if( !((width == gapi->gxProperties.cyHeight)
&& (height == gapi->gxProperties.cxWidth))) // user portrait, device
landscape
gapi->hiresFix = 1;
switch( gapi->userOrientation )
!! It used to query system metrics which return dimensions according to screen
!! orientation, which can really be portrait, left landscape or right landscape.
!! This is presumably incorrect because we couldn't care less about user mode
!! dimensions - all we want are the GAPI framebuffer dimensions, which
only match
!! user dimensions in one of possible orientations.
!! There's a fair dose of cargo cult programming involved in this fix, but it
!! used to work only in one orientation (portrait for PDAs, where frame-buffer
!! have same orientation as user screen), and now it works on all orientations.
@@ -742,21 +746,30 @@
WIN_FlushMessageQueue();
/* Open GAPI display */
- if( !gapi->useVga && this->hidden->useGXOpenDisplay )
+ if( !gapi->useVga && this->hidden->useGXOpenDisplay &&
!this->hidden->alreadyGXOpened )
+ {
+ this->hidden->alreadyGXOpened = 1;
if( !gapi->gxFunc.GXOpenDisplay(SDL_Window, GX_FULLSCREEN) )
{
SDL_SetError("Couldn't initialize GAPI");
return(NULL);
}
+ }
#if REPORT_VIDEO_INFO
printf("Video properties:\n");
printf("display bpp: %d\n", gapi->gxProperties.cBPP);
printf("display width: %d\n", gapi->gxProperties.cxWidth);
printf("display height: %d\n", gapi->gxProperties.cyHeight);
+ printf("system display width: %d\n", GetSystemMetrics(SM_CXSCREEN));
+ printf("system display height: %d\n", GetSystemMetrics(SM_CYSCREEN));
printf("x pitch: %d\n", gapi->gxProperties.cbxPitch);
printf("y pitch: %d\n", gapi->gxProperties.cbyPitch);
printf("gapi flags: 0x%x\n", gapi->gxProperties.ffFormat);
+ printf("user orientation: %d\n", gapi->userOrientation);
+ printf("system orientation: %d\n", gapi->userOrientation);
+ printf("gapi orientation: %d\n", gapi->gapiOrientation);
+
if( !gapi->useVga && this->hidden->useGXOpenDisplay && gapi->needUpdate)
{
!! Previous version used to call gapi->gxFunc.GXOpenDisplay each time the video
!! mode would be changed. You shouldn't, because this call has a
meaning "Lock the
!! GAPI framebuffer, designate it as busy", so the second call will fail (it is
!! already locked/busy).
!! Testing might not find that because most programs set up the video mode only
!! once, but POWDER does this once in a while, so it crashed when in
320x240 mode
!! (640x480 mode doesn't use that code, it worked fine).
diff -bru SDL-1.2.13/src/video/gapi/SDL_gapivideo.h
SDL-1.2.13-new/src/video/gapi/SDL_gapivideo.h
--- SDL-1.2.13/src/video/gapi/SDL_gapivideo.h 2007-12-31
07:48:00.000000000 +0300
+++ SDL-1.2.13-new/src/video/gapi/SDL_gapivideo.h 2008-10-16
20:02:11.000000000 +0400
@@ -132,12 +132,17 @@
#define NUM_MODELISTS 4 /* 8, 16, 24, and 32 bits-per-pixel */
int SDL_nummodes[NUM_MODELISTS];
SDL_Rect **SDL_modelist[NUM_MODELISTS];
+ // The orientation of the video mode user wants to get
+ // Probably restricted to UP and RIGHT
enum SDL_ScreenOrientation userOrientation;
int invert;
char hiresFix; // using hires mode without defining hires resource
// --------------
int useGXOpenDisplay; /* use GXOpenDispplay */
+ int alreadyGXOpened;
int w, h;
+ // The orientation of GAPI framebuffer.
+ // Never changes on the same device.
enum SDL_ScreenOrientation gapiOrientation;
void *buffer; // may be 8, 16, 24, 32 bpp
@@ -153,6 +158,10 @@
int startOffset; // in bytes
int useVga;
int suspended; // do not pu anything into video memory
+ // The orientation of the system, as defined by SM_CXSCREEN
and SM_CYSCREEN
+ // User can change it by using 'screen layout' in system options
+ // Restricted to UP or RIGHT
+ enum SDL_ScreenOrientation systemOrientation;
};
!! This is a flag variable, see the previous comment
!! And yet another orientation: now we have to keep three of them in mind.
diff -bru SDL-1.2.13/src/video/wincommon/SDL_sysevents.c
SDL-1.2.13-new/src/video/wincommon/SDL_sysevents.c
--- SDL-1.2.13/src/video/wincommon/SDL_sysevents.c 2007-12-31
07:48:02.000000000 +0300
+++ SDL-1.2.13-new/src/video/wincommon/SDL_sysevents.c 2008-10-16
20:02:12.000000000 +0400
@@ -160,10 +160,22 @@
#endif */
}
break;
+ // FIXME: Older version used just SDL_VideoSurface->(w, h)
+ // w and h are "clipped" while x and y are "raw", which caused
+ // x in former and y in latter case to be clipped in a
wrong direction,
+ // thus offsetting the coordinate on 2 x clip pixels
+ // (like, 128 for 640 -> 512 clipping).
+ // We will now try to extract and use raw values.
+ // The way to do that RIGHT is do
(orientation-dependent) clipping before
+ // doing this transform, but it's hardly possible.
+
+ // SEE SDL_mouse.c /ClipOffset to understand these calculations.
case SDL_ORIENTATION_RIGHT:
if (!SDL_VideoSurface)
break;
- rotatedX = SDL_VideoSurface->w - *y;
+ rotatedX = (2 *
((SDL_VideoSurface->offset%SDL_VideoSurface->pitch)/
+ SDL_VideoSurface->format->BytesPerPixel))
+ + SDL_VideoSurface->w - *y;
rotatedY = *x;
*x = rotatedX;
*y = rotatedY;
@@ -172,7 +184,8 @@
if (!SDL_VideoSurface)
break;
rotatedX = *y;
- rotatedY = SDL_VideoSurface->h - *x;
+ rotatedY = (2 *
(SDL_VideoSurface->offset/SDL_VideoSurface->pitch))
+ + SDL_VideoSurface->h - *x;
*x = rotatedX;
*y = rotatedY;
break;
!! That's the trickest part, hence the long comment.
!! GAPI would really support only 320x240 or 640x480 mode, if application
!! requested the different screen size (as POWDER did, wishing
256x192), then SDL
!! is going to grab the first mode that fits the requested, and pad the screen
!! with black bars (as they do with wide-screen films).
!! It would also get, say, 240x320 mode, and to turn it into 256x192 it would
!! need to rotate mouse clicks.
!! It worked, but one bug slipped through: it would receive mouse clicks
!! unpadded, then rotate them, and then pad the black bars. The
problem is: rotate
!! is done by GAPI driver while padding is done by SDL core. SDL core
doesn't know
!! anything about rotating, so it would pad one of dimensions incorrectly.
I understand that some of my claims (or code) might seem unbacked, but you can
always grab the POWDER binary, compile your own libsdl with one or more of
those fixes turned off, and see how weird it would misbehave. I can even supply
you with those custom builds of libsdl if you don't want to set up the build
environment for windows ce, you'll just need a PDA or a smartphone with it.
I plan to take care of SDL on Windows CE as long as I maintain the POWDER port.
POWDER is good for that because it:
Employs both padded (with centered image, black bars) and unpadded
(image occupies full screen) graphics; initializes video more than
once; uses both 320x240 and 640x480 video; uses both stylus and
buttons.
There's still a list of unresolved issues which I'm planning to fix:
1) Arrow buttons on PDA return weird scancodes compared to PC, this
caused the game to misbehave before I've fixed that. You can see it on
those diagrams:
http://wrar.name/upload/powder-htc.png
http://wrar.name/upload/powder-pda.png
2) SDL (or underlying windows) doesn't care to rotate arrow presses
when we're in a low-res GAPI mode, but it will rotate them in VGA mode
(because of different screen orientations, the same arrow buttons can
suddently mean different directions). Solution: we should stick to
GAPI user orientation (the orientation the program supposedly wants)
and rotate the keys on our own.
_______________________________________________
SDL mailing list
SDL@lists.libsdl.org
http://lists.libsdl.org/listinfo.cgi/sdl-libsdl.org
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Fri, 07 Nov 2008 04:15:36 +0000 |
| parents | e85e65aec22f |
| children |
| rev | line source |
|---|---|
| 3975 | 1 #include "streamplayer.h" |
| 2 #include<mda/common/audio.h> | |
| 3 | |
| 4 | |
| 5 | |
| 6 const TInt KMaxVolume(256); | |
| 7 | |
| 8 LOCAL_C TInt GetSampleRate(TInt aRate) | |
| 9 { | |
| 10 switch(aRate) | |
| 11 { | |
| 12 case 8000: return TMdaAudioDataSettings::ESampleRate8000Hz; | |
| 13 case 11025: return TMdaAudioDataSettings::ESampleRate11025Hz; | |
| 14 case 12000: return TMdaAudioDataSettings::ESampleRate12000Hz; | |
| 15 case 16000: return TMdaAudioDataSettings::ESampleRate16000Hz; | |
| 16 case 22050: return TMdaAudioDataSettings::ESampleRate22050Hz; | |
| 17 case 24000: return TMdaAudioDataSettings::ESampleRate24000Hz; | |
| 18 case 32000: return TMdaAudioDataSettings::ESampleRate32000Hz; | |
| 19 case 44100: return TMdaAudioDataSettings::ESampleRate44100Hz; | |
| 20 case 48000: return TMdaAudioDataSettings::ESampleRate48000Hz; | |
| 21 case 96000: return TMdaAudioDataSettings::ESampleRate96000Hz; | |
| 22 case 64000: return TMdaAudioDataSettings::ESampleRate64000Hz; | |
| 23 } | |
| 24 return KErrNotFound; | |
| 25 } | |
| 26 | |
| 27 LOCAL_C TInt GetChannels(TInt aChannels) | |
| 28 { | |
| 29 switch(aChannels) | |
| 30 { | |
| 31 case 1: return TMdaAudioDataSettings::EChannelsMono; | |
| 32 case 2: return TMdaAudioDataSettings::EChannelsStereo; | |
| 33 } | |
| 34 return KErrNotFound; | |
| 35 } | |
| 36 | |
| 37 TInt CStreamPlayer::ClosestSupportedRate(TInt aRate) | |
| 38 { | |
| 39 if(aRate > 96000) | |
| 40 return 96000; | |
| 41 TInt rate = aRate; | |
| 42 while(GetSampleRate(rate) == KErrNotFound) | |
| 43 { | |
| 44 ++rate; | |
| 45 } | |
| 46 return rate; | |
| 47 } | |
| 48 | |
| 49 CStreamPlayer::CStreamPlayer(MStreamProvider& aProvider, MStreamObs& aObs) : | |
| 50 iProvider(aProvider), iObs(aObs), iVolume(KMaxVolume) | |
| 51 { | |
| 52 } | |
| 53 | |
| 54 CStreamPlayer::~CStreamPlayer() | |
| 55 { | |
| 56 iState |= EDied; | |
| 57 if(iState & EInited) | |
| 58 Close(); | |
| 59 User::After(100000); //wait buffer to be flushed | |
| 60 ASSERT(iPtr.Length() == 0); | |
| 61 delete iStream; | |
| 62 } | |
| 63 | |
| 64 | |
| 65 void CStreamPlayer::ConstructL() | |
| 66 { | |
| 67 iStream = CMdaAudioOutputStream::NewL(*this, EMdaPriorityMax); | |
| 68 iSilence.SetMax(); | |
| 69 iSilence.FillZ(); | |
| 70 } | |
| 71 | |
| 72 | |
| 73 TInt CStreamPlayer::OpenStream(TInt aRate, TInt aChannels, TUint32 aType) | |
| 74 { | |
| 75 Close(); | |
| 76 | |
| 77 iType = aType; | |
| 78 | |
| 79 iRate = GetSampleRate(aRate); | |
| 80 if(iRate == KErrNotFound) | |
| 81 return KErrNotSupported; | |
| 82 | |
| 83 iChannels = GetChannels(aChannels); | |
| 84 if(iChannels == KErrNotFound) | |
| 85 return KErrNotSupported; | |
| 86 | |
| 87 Open(); | |
| 88 | |
| 89 return KErrNone; | |
| 90 } | |
| 91 | |
| 92 | |
| 93 TInt CStreamPlayer::MaxVolume() const | |
| 94 { | |
| 95 return KMaxVolume; | |
| 96 } | |
| 97 | |
| 98 void CStreamPlayer::SetVolume(TInt aNew) | |
| 99 { | |
| 100 | |
| 101 const TInt maxi = MaxVolume(); | |
| 102 if(aNew > maxi) | |
| 103 return; | |
| 104 if(aNew < 0) | |
| 105 return; | |
| 106 | |
| 107 iVolume = aNew; | |
| 108 | |
| 109 iState |= EVolumeChange; | |
| 110 } | |
| 111 | |
| 112 TInt CStreamPlayer::Volume() const | |
| 113 { | |
| 114 return iVolume; | |
| 115 } | |
| 116 | |
| 117 void CStreamPlayer::Open() | |
| 118 { | |
| 119 TMdaAudioDataSettings audioSettings; | |
| 120 audioSettings.Query(); | |
| 121 audioSettings.iCaps = TMdaAudioDataSettings::ERealTime | | |
| 122 TMdaAudioDataSettings::ESampleRateFixed; | |
| 123 audioSettings.iSampleRate = iRate; | |
| 124 audioSettings.iChannels = iChannels; | |
| 125 audioSettings.iFlags = TMdaAudioDataSettings::ENoNetworkRouting; | |
| 126 audioSettings.iVolume = 0; | |
| 127 | |
| 128 iState &= ~EStopped; | |
| 129 iStream->Open(&audioSettings); | |
| 130 } | |
| 131 | |
| 132 void CStreamPlayer::Stop() | |
| 133 { | |
| 134 if(iState & (EStarted | EInited)) | |
| 135 { | |
| 136 Close(); | |
| 137 iState |= EStopped; | |
| 138 } | |
| 139 } | |
| 140 | |
| 141 void CStreamPlayer::Start() | |
| 142 { | |
| 143 if(iPtr.Length() == 0) | |
| 144 { | |
| 145 iState |= EStarted; | |
| 146 if(iState & EInited) | |
| 147 { | |
| 148 Request(); | |
| 149 } | |
| 150 else if(iState & EStopped) | |
| 151 { | |
| 152 Open(); | |
| 153 } | |
| 154 } | |
| 155 } | |
| 156 | |
| 157 void CStreamPlayer::Close() | |
| 158 { | |
| 159 iState &= ~EInited; | |
| 160 iStream->Stop(); | |
| 161 iState &= ~EStarted; | |
| 162 } | |
| 163 | |
| 164 void CStreamPlayer::Request() | |
| 165 { | |
| 166 if(iState & EInited) | |
| 167 { | |
| 168 iPtr.Set(KNullDesC8); | |
| 169 | |
| 170 if(iState & EVolumeChange) | |
| 171 { | |
| 172 const TReal newVol = iVolume; | |
| 173 const TReal newMax = MaxVolume(); | |
| 174 const TInt maxVol = iStream->MaxVolume(); | |
| 175 const TReal max = static_cast<TReal>(maxVol); | |
| 176 const TReal newvolume = (newVol * max) / newMax; | |
| 177 const TInt vol = static_cast<TReal>(newvolume); | |
| 178 iStream->SetVolume(vol); | |
| 179 iState &= ~EVolumeChange; | |
| 180 } | |
| 181 | |
| 182 if(iState & EStarted) | |
| 183 { | |
| 184 iPtr.Set(iProvider.Data()); | |
| 185 } | |
| 186 if(iPtr.Length() == 0) | |
| 187 { | |
| 188 iPtr.Set(iSilence); | |
| 189 } | |
| 190 TRAPD(err, iStream->WriteL(iPtr)); | |
| 191 if(err != KErrNone) | |
| 192 { | |
| 193 iObs.Complete(MStreamObs::EWrite, err); | |
| 194 } | |
| 195 /* else | |
| 196 { | |
| 197 iProvider.Written(iPtr.Length()); | |
| 198 }*/ | |
| 199 } | |
| 200 } | |
| 201 | |
| 202 | |
| 203 void CStreamPlayer::SetCapsL() | |
| 204 { | |
| 205 iStream->SetDataTypeL(iType); | |
| 206 iStream->SetAudioPropertiesL(iRate, iChannels); | |
| 207 } | |
| 208 | |
| 209 void CStreamPlayer::MaoscOpenComplete(TInt aError) | |
| 210 { | |
| 211 if(aError == KErrNone) | |
| 212 { | |
| 213 TRAPD(err, SetCapsL()); | |
| 214 if(err == KErrNone) | |
| 215 { | |
| 216 iStream->SetPriority(EPriorityNormal, EMdaPriorityPreferenceTime); | |
| 217 iState |= EInited; | |
| 218 | |
| 219 | |
| 220 SetVolume(Volume()); | |
| 221 | |
| 222 if(iState & EStarted) | |
| 223 { | |
| 224 Request(); | |
| 225 } | |
| 226 | |
| 227 } | |
| 228 aError = err; | |
| 229 } | |
| 230 if(!(iState & EDied)) | |
| 231 iObs.Complete(MStreamObs::EInit, aError); | |
| 232 } | |
| 233 | |
| 234 void CStreamPlayer::MaoscBufferCopied(TInt aError, const TDesC8& /*aBuffer*/) | |
| 235 { | |
| 236 iPtr.Set(KNullDesC8); | |
| 237 if(aError == KErrNone) | |
| 238 { | |
| 239 if(iState & EInited) | |
| 240 Request(); | |
| 241 else | |
| 242 iStream->Stop(); | |
| 243 } | |
| 244 else if(!(iState & EDied)) | |
| 245 iObs.Complete(MStreamObs::EPlay, aError); | |
| 246 } | |
| 247 | |
| 248 void CStreamPlayer::MaoscPlayComplete(TInt aError) | |
| 249 { | |
| 250 iPtr.Set(KNullDesC8); | |
| 251 iState &= ~EStarted; | |
| 252 if(!(iState & EDied)) | |
| 253 iObs.Complete(MStreamObs::EClose, aError); | |
| 254 } | |
| 255 | |
| 256 TBool CStreamPlayer::Playing() const | |
| 257 { | |
| 258 return (iState & EInited) && (iState & EStarted); | |
| 259 } | |
| 260 | |
| 261 TBool CStreamPlayer::Closed() const | |
| 262 { | |
| 263 return !(iState & EInited) && !(iState & EDied); | |
| 264 } | |
| 265 | |
| 266 /* | |
| 267 void CStreamPlayer::Request() | |
| 268 { | |
| 269 SetActive(); | |
| 270 TRequestStatus* s = &iStatus; | |
| 271 User::RequestComplete(s, KErrNone); | |
| 272 } | |
| 273 // iTimer.After(0); | |
| 274 */ | |
| 275 | |
| 276 | |
| 277 | |
| 278 | |
| 279 |