comparison libao2/ao_macosx.c @ 12788:a6ff4398e4e6

enables resampling of audio in ao_macosx by Dan Christiansen

12787:7aa852ffba45

/* Prefix for all mp_msg() calls */
#define ao_msg(a, b, c...) mp_msg(a, b, "AO: [macosx] " c)

/* 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

typedef struct ao_macosx_s
{
  /* CoreAudio */
  AudioDeviceID outputDeviceID;

        ao_msg(MSGT_AO,MSGL_WARN, "AudioDeviceGetProperty returned %d when getting kAudioDevicePropertyBufferSize\n", (int)status);
	return CONTROL_FALSE;
    }
    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.channels = ao->outputStreamBasicDescription.mChannelsPerFrame;
    ao_data.outburst = ao_data.buffersize = ao->buffer_len;
    ao_data.bps = 
      ao_data.samplerate * ao->outputStreamBasicDescription.mBytesPerFrame;

12788:a6ff4398e4e6

/* Prefix for all mp_msg() calls */
#define ao_msg(a, b, c...) mp_msg(a, b, "AO: [macosx] " c)

/* 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 16

typedef struct ao_macosx_s
{
  /* CoreAudio */
  AudioDeviceID outputDeviceID;

        ao_msg(MSGT_AO,MSGL_WARN, "AudioDeviceGetProperty returned %d when getting kAudioDevicePropertyBufferSize\n", (int)status);
	return CONTROL_FALSE;
    }
    ao_msg(MSGT_AO,MSGL_V, "%5d ao->buffer_len\n", (int)ao->buffer_len);

    ao_data.samplerate = ao->outputStreamBasicDescription.mSampleRate;
    ao_data.channels = ao->outputStreamBasicDescription.mChannelsPerFrame;
    ao_data.outburst = ao_data.buffersize = ao->buffer_len;
    ao_data.bps = 
      ao_data.samplerate * ao->outputStreamBasicDescription.mBytesPerFrame;