Mercurial > sdl-ios-xcode
view src/cdrom/macosx/AudioFilePlayer.h @ 1176:dd2a8deeb26d
Date: Mon, 17 Oct 2005 20:09:03 -0400
From: Mark Schreiber <mark7@alumni.cmu.edu>
To: ryan@clutteredmind.org
Subject: [PATCH]SDL mprotect() crash fix
(I'm going to throw this patch your way at the suggestion of #SDL --
for some reason, I had some difficulty sending it to the main list
last time, and I go bonkers subscribing to send each email or
patch...)
Currently, when I run SDL applications as non-root using
SDL_VIDEODRIVER=dga, the fbdev fallback mprotect()s read/write the
proper size of mmapped /dev/fb0 (7.5MB), but on framebuffer release
mprotect()s read-only the range by the entire size of my video memory
(128MB), which causes a segfault:
#0 0x002a9a27 in ?? () from /lib/libc.so.6
#1 0x04a63eb6 in SDL_XDGAUnmapFramebuffer (screen=3D0) at XF86DGA2.c:978
#2 0x04a63efc in SDL_XDGACloseFramebuffer (dpy=3D0x9d3f008, screen=3D0)
at XF86DGA2.c:268
#3 0x04a68b57 in DGA_Available () at SDL_dgavideo.c:98
#4 0x04a53677 in SDL_VideoInit (driver_name=3D0xbfb0bfc7 "dga", flags=3D0)
at SDL_video.c:180
#5 0x04a2613f in SDL_InitSubSystem (flags=3D32) at SDL.c:74
#6 0x04a2617c in SDL_Init (flags=3D32) at SDL.c:166
#7 0x08049722 in main (argc=3D1, argv=3D0x0) at testwin.c:32
This is SDL 1.2.8 on Fedora Core 4, radeon driver for a Radeon 9250,
xorg-x11-6.8.2-37.
I've attached a one-line patch against SDL CVS that updates the size
of the framebuffer at framebuffer map time so that the mprotect() on
unmap will be the same size. I'm not sure if this is the best
approach (i.e. one might want to retain the original value), but it
does make my SDL applications work without segfaulting.
-- Best of luck, Mark Schreiber
author | Ryan C. Gordon <icculus@icculus.org> |
---|---|
date | Sat, 19 Nov 2005 18:57:00 +0000 |
parents | 71a2648acc75 |
children | d910939febfa |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2004 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 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 Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Sam Lantinga slouken@libsdl.org This file based on Apple sample code. We haven't changed the file name, so if you want to see the original search for it on apple.com/developer */ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // AudioFilePlayer.h // #ifndef __AudioFilePlayer_H__ #define __AudioFilePlayer_H__ #include <CoreServices/CoreServices.h> #include <AudioUnit/AudioUnit.h> #include "SDL_error.h" const char* AudioFilePlayerErrorStr (OSStatus error); /* void ThrowResult (OSStatus result, const char *str); #define THROW_RESULT(str) \ if (result) { \ ThrowResult (result, str); \ } */ typedef void (*AudioFilePlayNotifier)(void *inRefCon, OSStatus inStatus); enum { kAudioFilePlayErr_FilePlayUnderrun = -10000, kAudioFilePlay_FileIsFinished = -10001, kAudioFilePlay_PlayerIsUninitialized = -10002 }; struct S_AudioFileManager; #pragma mark __________ AudioFilePlayer typedef struct S_AudioFilePlayer { //public: int (*SetDestination)(struct S_AudioFilePlayer *afp, AudioUnit *inDestUnit); void (*SetNotifier)(struct S_AudioFilePlayer *afp, AudioFilePlayNotifier inNotifier, void *inRefCon); void (*SetStartFrame)(struct S_AudioFilePlayer *afp, int frame); // seek in the file int (*GetCurrentFrame)(struct S_AudioFilePlayer *afp); // get the current frame position void (*SetStopFrame)(struct S_AudioFilePlayer *afp, int frame); // set limit in the file int (*Connect)(struct S_AudioFilePlayer *afp); void (*Disconnect)(struct S_AudioFilePlayer *afp); void (*DoNotification)(struct S_AudioFilePlayer *afp, OSStatus inError); int (*IsConnected)(struct S_AudioFilePlayer *afp); AudioUnit (*GetDestUnit)(struct S_AudioFilePlayer *afp); void (*Print)(struct S_AudioFilePlayer *afp); //private: AudioUnit mPlayUnit; SInt16 mForkRefNum; AudioUnitInputCallback mInputCallback; AudioStreamBasicDescription mFileDescription; int mConnected; struct S_AudioFileManager* mAudioFileManager; AudioFilePlayNotifier mNotifier; void* mRefCon; int mStartFrame; #pragma mark __________ Private_Methods int (*OpenFile)(struct S_AudioFilePlayer *afp, const FSRef *inRef, SInt64 *outFileSize); } AudioFilePlayer; AudioFilePlayer *new_AudioFilePlayer(const FSRef *inFileRef); void delete_AudioFilePlayer(AudioFilePlayer *afp); #pragma mark __________ AudioFileManager typedef struct S_AudioFileManager { //public: // this method should NOT be called by an object of this class // as it is called by the parent's Disconnect() method void (*Disconnect)(struct S_AudioFileManager *afm); int (*DoConnect)(struct S_AudioFileManager *afm); OSStatus (*Read)(struct S_AudioFileManager *afm, char *buffer, UInt32 *len); const char* (*GetFileBuffer)(struct S_AudioFileManager *afm); const AudioFilePlayer *(*GetParent)(struct S_AudioFileManager *afm); void (*SetPosition)(struct S_AudioFileManager *afm, SInt64 pos); // seek/rewind in the file int (*GetByteCounter)(struct S_AudioFileManager *afm); // return actual bytes streamed to audio hardware void (*SetEndOfFile)(struct S_AudioFileManager *afm, SInt64 pos); // set the "EOF" (will behave just like it reached eof) //protected: AudioFilePlayer* mParent; SInt16 mForkRefNum; SInt64 mAudioDataOffset; char* mFileBuffer; int mByteCounter; int mReadFromFirstBuffer; int mLockUnsuccessful; int mIsEngaged; int mNumTimesAskedSinceFinished; void* mTmpBuffer; UInt32 mBufferSize; UInt32 mBufferOffset; //public: UInt32 mChunkSize; SInt64 mFileLength; SInt64 mReadFilePosition; int mWriteToFirstBuffer; int mFinishedReadingData; //protected: OSStatus (*Render)(struct S_AudioFileManager *afm, AudioBuffer *ioData); OSStatus (*GetFileData)(struct S_AudioFileManager *afm, void** inOutData, UInt32 *inOutDataSize); void (*AfterRender)(struct S_AudioFileManager *afm); //public: //static OSStatus (*FileInputProc)(void *inRefCon, AudioUnitRenderActionFlags inActionFlags, const AudioTimeStamp *inTimeStamp, UInt32 inBusNumber, AudioBuffer *ioData); } AudioFileManager; AudioFileManager *new_AudioFileManager (AudioFilePlayer *inParent, SInt16 inForkRefNum, SInt64 inFileLength, UInt32 inChunkSize); void delete_AudioFileManager(AudioFileManager *afm); #endif