diff options
| author | nplourde <nplourde@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-07-10 00:23:19 +0000 |
|---|---|---|
| committer | nplourde <nplourde@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-07-10 00:23:19 +0000 |
| commit | fbfda67d7cc786ec91be25056237b02fdc0b8920 (patch) | |
| tree | 5ae43c1e3bb6aa7a5249c920228bd8a1e893e0f6 /libao2 | |
| parent | 6696304efe63dcafa981f08d5324d921dbc3bc42 (diff) | |
| download | mpv-fbfda67d7cc786ec91be25056237b02fdc0b8920.tar.bz2 mpv-fbfda67d7cc786ec91be25056237b02fdc0b8920.tar.xz | |
enables resampling of audio in ao_macosx by Dan Christiansen
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12789 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2')
| -rw-r--r-- | libao2/ao_macosx.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/libao2/ao_macosx.c b/libao2/ao_macosx.c index 8b799ae785..42ac17e967 100644 --- a/libao2/ao_macosx.c +++ b/libao2/ao_macosx.c @@ -64,7 +64,7 @@ LIBAO_EXTERN(macosx) /* This is large, but best (maybe it should be even larger). * CoreAudio supposedly has an internal latency in the order of 2ms */ -#define NUM_BUFS 128 +#define NUM_BUFS 16 typedef struct ao_macosx_s { @@ -243,19 +243,7 @@ static int init(int rate,int channels,int format,int flags) } ao_msg(MSGT_AO,MSGL_V, "%5d ao->buffer_len\n", (int)ao->buffer_len); - /* FIXME: - * - * Resampling of 32-bit float audio is broken in MPlayer. Refuse to - * handle anything other than the native format until this is fixed - * or this module is rewritten, whichever comes first. - */ - if (ao_data.samplerate == ao->outputStreamBasicDescription.mSampleRate) { - ao_data.samplerate = (int)ao->outputStreamBasicDescription.mSampleRate; - } else { - ao_msg(MSGT_AO,MSGL_WARN, "Resampling not supported yet.\n"); - return 0; - } - + ao_data.samplerate = ao->outputStreamBasicDescription.mSampleRate; ao_data.channels = ao->outputStreamBasicDescription.mChannelsPerFrame; ao_data.outburst = ao_data.buffersize = ao->buffer_len; ao_data.bps = |