RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Better audio format handling. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1067 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
atmosfear 2001-06-09 07:36:32 +00:00
parent d6b8127cb5
commit 7a5aba6dfe
1 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libao2/ao_sdl.c
View File

@ -15,6 +15,7 @@
#include "audio_out.h" #include "audio_out.h"
#include "audio_out_internal.h" #include "audio_out_internal.h"
#include "afmt.h"
#include "../libvo/fastmemcpy.h" #include "../libvo/fastmemcpy.h"
@ -132,7 +133,10 @@ static int control(int cmd,int arg){
// SDL Callback function // SDL Callback function
void outputaudio(void *unused, Uint8 *stream, int len) { void outputaudio(void *unused, Uint8 *stream, int len) {
//SDL_MixAudio(stream, read_buffer(buffers, len), len, SDL_MIX_MAXVOLUME); //SDL_MixAudio(stream, read_buffer(buffers, len), len, SDL_MIX_MAXVOLUME);
//if(!full_buffers) printf("SDL: Buffer underrun!\n");
read_buffer(stream, len); read_buffer(stream, len);
//printf("SDL: Full Buffers: %i\n", full_buffers);
} }
// open & setup audio device // open & setup audio device
@ -154,12 +158,34 @@ static int init(int rate,int channels,int format,int flags){
} }
/* The desired audio format (see SDL_AudioSpec) */
switch(format) {
case AFMT_U8:
aspec.format = AUDIO_U8;
break;
case AFMT_S16_LE:
aspec.format = AUDIO_S16LSB;
break;
case AFMT_S16_BE:
aspec.format = AUDIO_S16MSB;
break;
case AFMT_S8:
aspec.format = AUDIO_S8;
break;
case AFMT_U16_LE:
aspec.format = AUDIO_U16LSB;
break;
case AFMT_U16_BE:
aspec.format = AUDIO_U16MSB;
break;
default:
printf("SDL: Unsupported audio format: 0x%x.\n", format);
return 0;
}
/* The desired audio frequency in samples-per-second. */ /* The desired audio frequency in samples-per-second. */
aspec.freq = rate; aspec.freq = rate;
/* The desired audio format (see SDL_AudioSpec) */
aspec.format = (format == 16) ? AUDIO_S16 : AUDIO_U8;
/* Number of channels (mono/stereo) */ /* Number of channels (mono/stereo) */
aspec.channels = channels; aspec.channels = channels;
@ -204,6 +230,8 @@ static void uninit(){
// stop playing and empty buffers (for seeking/pause) // stop playing and empty buffers (for seeking/pause)
static void reset(){ static void reset(){
//printf("SDL: reset called!\n");
/* Reset ring-buffer state */ /* Reset ring-buffer state */
buf_read=0; buf_read=0;
buf_write=0; buf_write=0;