Yea, it worksss!

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@973 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 116 insertions, 62 deletions

diff --git a/libao2/ao_sdl.c b/libao2/ao_sdl.c
index be95075451..4dff31dccb 100644
--- a/libao2/ao_sdl.c
+++ b/libao2/ao_sdl.c
@@ -1,9 +1,22 @@
+/* 
+ * ao_sdl.c - libao2 SDLlib Audio Output Driver for MPlayer
+ *
+ * This driver is under the same license as MPlayer.
+ * (http://mplayer.sf.net)
+ *
+ * Copyleft 2001 by Felix Bünemann (atmosfear@users.sf.net)
+ *
+ * Thanks to Arpi for nice ringbuffer-code!
+ *
+ */
+
 #include <stdio.h>
-#include <stdlib.h>
 
 #include "audio_out.h"
 #include "audio_out_internal.h"
 
+#include "../libvo/fastmemcpy.h"
+
 static ao_info_t info = 
 {
 	"SDLlib audio output",
@@ -22,9 +35,65 @@ LIBAO_EXTERN(sdl)
 // ao_outburst
 // ao_buffersize
 
-int audiolen = 0;
-int audioplayed = 0;
-int audiobuffer = 0;
+// Samplesize used by the SDLlib AudioSpec struct
+#define SAMPLESIZE 512
+
+// General purpose Ring-buffering routines
+
+#define BUFFSIZE 1024
+#define NUM_BUFS 64
+
+static unsigned char *buffer[NUM_BUFS];
+
+static unsigned int buf_read=0;
+static unsigned int buf_write=0;
+static unsigned int buf_read_pos=0;
+static unsigned int buf_write_pos=0;
+
+static int full_buffers=0;
+static int buffered_bytes=0;
+
+static int write_buffer(unsigned char* data,int len){
+  int len2=0;
+  int x;
+  while(len>0){
+    if(full_buffers==NUM_BUFS) break;
+    x=BUFFSIZE-buf_write_pos;
+    if(x>len) x=len;
+    memcpy(buffer[buf_write]+buf_write_pos,data+len2,x);
+    len2+=x; len-=x;
+    buffered_bytes+=x; buf_write_pos+=x;
+    if(buf_write_pos>=BUFFSIZE){
+       // block is full, find next!
+       buf_write=(buf_write+1)%NUM_BUFS;
+       ++full_buffers;
+       buf_write_pos=0;
+    }
+  }
+  return len2;
+}
+
+static int read_buffer(unsigned char* data,int len){
+  int len2=0;
+  int x;
+  while(len>0){
+    if(full_buffers==0) break; // no more data buffered!
+    x=BUFFSIZE-buf_read_pos;
+    if(x>len) x=len;
+    memcpy(data+len2,buffer[buf_read]+buf_read_pos,x);
+    len2+=x; len-=x;
+    buffered_bytes-=x; buf_read_pos+=x;
+    if(buf_read_pos>=BUFFSIZE){
+       // block is empty, find next!
+       buf_read=(buf_read+1)%NUM_BUFS;
+       --full_buffers;
+       buf_read_pos=0;
+    }
+  }
+  return len2;
+}
+
+// end ring buffer stuff
 
 #ifdef __FreeBSD__
 #include <SDL11/SDL.h>
@@ -32,71 +101,55 @@ int audiobuffer = 0;
 #include <SDL/SDL.h>
 #endif
 
-/*
-
-typedef struct{
-  int freq;
-  Uint16 format;
-  Uint8 channels;
-  Uint8 silence;
-  Uint16 samples;
-  Uint32 size;
-  void (*callback)(void *userdata, Uint8 *stream, int len);
-  void *userdata;
-} SDL_AudioSpec;
-
-*/
-
-//static struct sdl_priv_s {
-
-	/* SDL Audio Specifications */
-	SDL_AudioSpec aspec;
-
-//} sdl_priv;
-
 // to set/get/query special features/parameters
 static int control(int cmd,int arg){
     return -1;
 }
 
-// Callback function
-void mixaudio(void *datastream, Uint8 *stream, int len) {
-	//printf("SDL: mixaudio called!\n");
-	//printf("SDL pts: %u %u\n", aspec.userdata, stream);
-	if(audiolen == 0) return;
-	len = (len > audiolen ? audiolen : len);
-	SDL_MixAudio(stream, aspec.userdata, len, SDL_MIX_MAXVOLUME);
-	audiobuffer -= len;
-	audioplayed = len;
+// SDL Callback function
+void outputaudio(void *unused, Uint8 *stream, int len) {
+	//SDL_MixAudio(stream, read_buffer(buffers, len), len, SDL_MIX_MAXVOLUME);
+	read_buffer(stream, len);
 }
 
 // open & setup audio device
 // return: 1=success 0=fail
 static int init(int rate,int channels,int format,int flags){
 
-	printf("SDL: Audio Out - This driver is early alpha, do not use!\n");
-	printf("SDL: rate: %iHz channels %i format %i Bit flags %i\n", rate, channels, format, flags);
-//    ao_outburst=4096;
+	/* SDL Audio Specifications */
+	SDL_AudioSpec aspec;
+	
+	int i;
+	/* Allocate ring-buffer memory */
+	for(i=0;i<NUM_BUFS;i++) buffer[i]=malloc(BUFFSIZE);
+
+	printf("SDL: Samplerate: %iHz Channels: %s Format %iBit\n", rate, (channels > 1) ? "Stereo" : "Mono", format);
 	
 	/* The desired audio frequency in samples-per-second. */
 	aspec.freq     = rate;
 
 	/* The desired audio format (see SDL_AudioSpec) */
-	aspec.format   = (format == 16) ? AUDIO_S16 : AUDIO_S8;
+	aspec.format   = (format == 16) ? AUDIO_S16 : AUDIO_U8;
 
 	/* Number of channels (mono/stereo) */
 	aspec.channels = channels;
 
 	/* The desired size of the audio buffer in samples. This number should be a power of two, and may be adjusted by the audio driver to a value more suitable for the hardware. Good values seem to range between 512 and 8192 inclusive, depending on the application and CPU speed. Smaller values yield faster response time, but can lead to underflow if the application is doing heavy processing and cannot fill the audio buffer in time. A stereo sample consists of both right and left channels in LR ordering. Note that the number of samples is directly related to time by the following formula: ms = (samples*1000)/freq */
-	aspec.samples  = 4096;
+	aspec.samples  = SAMPLESIZE;
 
 	/* This should be set to a function that will be called when the audio device is ready for more data. It is passed a pointer to the audio buffer, and the length in bytes of the audio buffer. This function usually runs in a separate thread, and so you should protect data structures that it accesses by calling SDL_LockAudio and SDL_UnlockAudio in your code. The callback prototype is:
 void callback(void *userdata, Uint8 *stream, int len); userdata is the pointer stored in userdata field of the SDL_AudioSpec. stream is a pointer to the audio buffer you want to fill with information and len is the length of the audio buffer in bytes. */
-	aspec.callback = mixaudio;
+	aspec.callback = outputaudio;
 
 	/* This pointer is passed as the first parameter to the callback function. */
 	aspec.userdata = NULL;
 
+	/* initialize the SDL Audio system */
+        if (SDL_Init (SDL_INIT_AUDIO/*|SDL_INIT_NOPARACHUTE*/)) {
+                printf("SDL: Initializing of SDL Audio failed: %s.\n", SDL_GetError());
+                return 0;
+        }
+
 	/* Open the audio device and start playing sound! */
 	if(SDL_OpenAudio(&aspec, NULL) < 0) {
         	printf("SDL: Unable to open audio: %s\n", SDL_GetError());
@@ -105,57 +158,58 @@ void callback(void *userdata, Uint8 *stream, int len); userdata is the pointer s
 	
 	/* unsilence audio, if callback is ready */
 	SDL_PauseAudio(0);
-	
-	
-
 
 	return 1;
 }
 
 // close audio device
 static void uninit(){
-	/* Wait for sound to complete */
-	while ( audiolen > 0 ) {
-		SDL_Delay(100);         /* Sleep 1/10 second */
-	}
 	SDL_CloseAudio();
+	SDL_QuitSubSystem(SDL_INIT_AUDIO);
 }
 
 // stop playing and empty buffers (for seeking/pause)
 static void reset(){
+	
+	/* Reset ring-buffer state */
+	buf_read=0;
+	buf_write=0;
+	buf_read_pos=0;
+	buf_write_pos=0;
+
+	full_buffers=0;
+	buffered_bytes=0;
 
 }
 
 // return: how many bytes can be played without blocking
 static int get_space(){
-
-    return aspec.samples;
+    return (NUM_BUFS-full_buffers)*BUFFSIZE - buf_write_pos;
 }
 
 // plays 'len' bytes of 'data'
 // it should round it down to outburst*n
 // return: number of bytes played
 static int play(void* data,int len,int flags){
-	
-	//printf("SDL: play called!\n");
-	
-	audiolen = len;
-	audiobuffer = len;
 
-	SDL_LockAudio();
-	// copy audio stream into mixaudio stream here
-	aspec.userdata = data;
-	//printf("SDL pt: %u %u\n", data, aspec.userdata);
+#if 0	
+	int ret;
 
+	/* Audio locking prohibits call of outputaudio */
+	SDL_LockAudio();
+	// copy audio stream into ring-buffer 
+	ret = write_buffer(data, len);
 	SDL_UnlockAudio();
 
-    	return audioplayed;
+    	return ret;
+#else
+	return write_buffer(data, len);
+#endif
 }
 
 // return: how many unplayed bytes are in the buffer
 static int get_delay(){
-	//printf("SDL: get_delay called (%i)!\n", audiobuffer);
-    	return audiobuffer;
+    return buffered_bytes;
 }