Mercurial > sdl-ios-xcode
annotate src/video/SDL_yuv.c @ 773:da0a2ad35bf4
Date: Sun, 4 Jan 2004 23:48:19 +0100
From: Max Horn
Subject: Re: Again Audio CD patch
Am 04.01.2004 um 22:38 schrieb Sam Lantinga:
>
> Okay, I fixed the buffering problems by simply using a 4 second buffer
> instead of a 1 second buffer. However, using your code I can't play an
> entire CD - the playback stops after the first song.
>
Found the problem: FSReadFork returns eofErr when the file is finished.
However, we check its return value for errors, and if anything but
noErr occurs, the reader thread aborts its current iteration. That is
bad, because it aborts before it can ever set the flag which tells that
the file is over (also, any remaining data which FSRead did return is
lost - so you'd not hear about to 4 seconds from the end of the file.
Furthermore, the computed data size was 8 bytes to high (I forgot to
account for the fact that the size of an (A)IFF chunk always contains
the chunk header & size fields, too). This is enough to make it work.
However, the end condition is rather fragile, so I tuned some other
things to be pessimistic (check for <= 0 instead of == 0, when eofErr
is encountered enforce mReadFilePosition == mFileLength). You never
know...
The attached patch fixes the issue for me.
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Mon, 05 Jan 2004 00:57:51 +0000 |
parents | b8d311d90021 |
children | c9b51268668f |
rev | line source |
---|---|
0 | 1 /* |
2 SDL - Simple DirectMedia Layer | |
769
b8d311d90021
Updated copyright information for 2004 (Happy New Year!)
Sam Lantinga <slouken@libsdl.org>
parents:
760
diff
changeset
|
3 Copyright (C) 1997-2004 Sam Lantinga |
0 | 4 |
5 This library is free software; you can redistribute it and/or | |
6 modify it under the terms of the GNU Library General Public | |
7 License as published by the Free Software Foundation; either | |
8 version 2 of the License, or (at your option) any later version. | |
9 | |
10 This library is distributed in the hope that it will be useful, | |
11 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
13 Library General Public License for more details. | |
14 | |
15 You should have received a copy of the GNU Library General Public | |
16 License along with this library; if not, write to the Free | |
17 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
18 | |
19 Sam Lantinga | |
252
e8157fcb3114
Updated the source with the correct e-mail address
Sam Lantinga <slouken@libsdl.org>
parents:
81
diff
changeset
|
20 slouken@libsdl.org |
0 | 21 */ |
22 | |
23 #ifdef SAVE_RCSID | |
24 static char rcsid = | |
25 "@(#) $Id$"; | |
26 #endif | |
27 | |
28 /* This is the implementation of the YUV video surface support */ | |
29 | |
30 #include <stdlib.h> | |
31 #include <string.h> | |
32 | |
33 #include "SDL_getenv.h" | |
34 #include "SDL_video.h" | |
660
73440ac574a2
You can't create a YUV overlay in OpenGL mode
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
35 #include "SDL_error.h" |
0 | 36 #include "SDL_sysvideo.h" |
37 #include "SDL_yuvfuncs.h" | |
38 #include "SDL_yuv_sw_c.h" | |
39 | |
40 | |
41 SDL_Overlay *SDL_CreateYUVOverlay(int w, int h, Uint32 format, | |
42 SDL_Surface *display) | |
43 { | |
44 SDL_VideoDevice *video = current_video; | |
45 SDL_VideoDevice *this = current_video; | |
46 const char *yuv_hwaccel; | |
47 SDL_Overlay *overlay; | |
48 | |
760
cf9dd3aa6756
Oops, we only want to fail creation if the display surface is an OpenGL surface.
Sam Lantinga <slouken@libsdl.org>
parents:
660
diff
changeset
|
49 if ( (display->flags & SDL_OPENGL) == SDL_OPENGL ) { |
660
73440ac574a2
You can't create a YUV overlay in OpenGL mode
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
50 SDL_SetError("YUV overlays are not supported in OpenGL mode"); |
73440ac574a2
You can't create a YUV overlay in OpenGL mode
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
51 return NULL; |
73440ac574a2
You can't create a YUV overlay in OpenGL mode
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
52 } |
0 | 53 |
54 /* Display directly on video surface, if possible */ | |
81
1a2723474f12
Added the SDL_VIDEO_YUV_DIRECT hack for better performance when the
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
55 if ( getenv("SDL_VIDEO_YUV_DIRECT") ) { |
1a2723474f12
Added the SDL_VIDEO_YUV_DIRECT hack for better performance when the
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
56 if ( (display == SDL_PublicSurface) && |
1a2723474f12
Added the SDL_VIDEO_YUV_DIRECT hack for better performance when the
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
57 ((SDL_VideoSurface->format->BytesPerPixel == 2) || |
1a2723474f12
Added the SDL_VIDEO_YUV_DIRECT hack for better performance when the
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
58 (SDL_VideoSurface->format->BytesPerPixel == 4)) ) { |
1a2723474f12
Added the SDL_VIDEO_YUV_DIRECT hack for better performance when the
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
59 display = SDL_VideoSurface; |
1a2723474f12
Added the SDL_VIDEO_YUV_DIRECT hack for better performance when the
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
60 } |
0 | 61 } |
660
73440ac574a2
You can't create a YUV overlay in OpenGL mode
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
62 overlay = NULL; |
0 | 63 yuv_hwaccel = getenv("SDL_VIDEO_YUV_HWACCEL"); |
64 if ( ((display == SDL_VideoSurface) && video->CreateYUVOverlay) && | |
65 (!yuv_hwaccel || (atoi(yuv_hwaccel) > 0)) ) { | |
66 overlay = video->CreateYUVOverlay(this, w, h, format, display); | |
67 } | |
68 /* If hardware YUV overlay failed ... */ | |
69 if ( overlay == NULL ) { | |
70 overlay = SDL_CreateYUV_SW(this, w, h, format, display); | |
71 } | |
72 return overlay; | |
73 } | |
74 | |
75 int SDL_LockYUVOverlay(SDL_Overlay *overlay) | |
76 { | |
77 return overlay->hwfuncs->Lock(current_video, overlay); | |
78 } | |
79 | |
80 void SDL_UnlockYUVOverlay(SDL_Overlay *overlay) | |
81 { | |
82 overlay->hwfuncs->Unlock(current_video, overlay); | |
83 } | |
84 | |
85 int SDL_DisplayYUVOverlay(SDL_Overlay *overlay, SDL_Rect *dstrect) | |
86 { | |
87 return overlay->hwfuncs->Display(current_video, overlay, dstrect); | |
88 } | |
89 | |
90 void SDL_FreeYUVOverlay(SDL_Overlay *overlay) | |
91 { | |
92 if ( overlay ) { | |
93 if ( overlay->hwfuncs ) { | |
94 overlay->hwfuncs->FreeHW(current_video, overlay); | |
95 } | |
96 free(overlay); | |
97 } | |
98 } |