comparison libao2/ao_macosx.c @ 15722:b53c4b26dc96

removes the use of AudioConverters. patch by Alexander Strange <[e-mail]>

15721:eec6ace22741

typedef struct ao_macosx_s
{
  /* AudioUnit */
  AudioUnit theOutputUnit;
  AudioConverterRef theConverter;
  int packetSize;

  /* Ring-buffer */
  /* does not need explicit synchronization, but needs to allocate
   * (num_chunks + 1) * chunk_size memory to store num_chunks * chunk_size

  }
  ao->buf_read_pos = (ao->buf_read_pos + len) % ao->buffer_len;
  return len;
}

/* end ring buffer stuff */

OSStatus ACComplexInputProc(AudioConverterRef inAudioConverter, UInt32 *ioNumberDataPackets, AudioBufferList *ioData, AudioStreamPacketDescription **outDataPacketDescription, void *inUserData)
{
int amt=buf_used();
int req=(*ioNumberDataPackets)*ao->packetSize;


	ioData->mBuffers[0].mData = ao->chunk;
 	ioData->mBuffers[0].mDataByteSize = req;
 	
// 	fprintf(stderr, "##### req=%d amt=%d #####\n", req, amt);

	if(amt>req)
 		amt=req;

	if(amt)
		read_buffer((unsigned char *)ioData->mBuffers[0].mData, amt);

	if(req-amt)
		memset(ioData->mBuffers[0].mData+amt, 0, req-amt);

 	return noErr;
}

OSStatus theRenderProc(void *inRefCon, AudioUnitRenderActionFlags *inActionFlags, const AudioTimeStamp *inTimeStamp, UInt32 inBusNumber, UInt32 inNumFrames, AudioBufferList *ioData)
{
OSStatus err = noErr;
void *inInputDataProcUserData = NULL;
AudioStreamPacketDescription *outPacketDescription = NULL;


    err = AudioConverterFillComplexBuffer(ao->theConverter, ACComplexInputProc, inInputDataProcUserData, &inNumFrames, ioData, outPacketDescription);

    /*Parameters for AudioConverterFillComplexBuffer()
	    converter - the converter being used
	    ACComplexInputProc() - input procedure to supply data to the Audio Converter
	    inInputDataProcUserData - Used to hold any data that needs to be passed on.
        inNumFrames - The amount of requested data.  On output, this number is the amount actually received.
		ioData - Buffer of the converted data recieved on return
		outPacketDescription - contains the format of the returned data.
    */

	if(err)
		ao_msg(MSGT_AO, MSGL_WARN, "AudioConverterFillComplexBuffer failed status %-8d\n", err);

    return err;
}

static int control(int cmd,void *arg){
	switch (cmd) {
	case AOCONTROL_SET_DEVICE:

		ao_msg(MSGT_AO, MSGL_WARN, "Unable to initialize Output Unit component (err=%d)\n", err);
		return CONTROL_FALSE;
	}

	size =  sizeof(AudioStreamBasicDescription);
	err = AudioUnitGetProperty(ao->theOutputUnit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Output, 0, &outDesc, &size);
	print_format("destination: ", &outDesc);	
	err = AudioUnitSetProperty(ao->theOutputUnit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input, 0, &outDesc, size);

	err = AudioConverterNew(&inDesc, &outDesc, &(ao->theConverter));
	if (err) {
		ao_msg(MSGT_AO, MSGL_WARN, "Unable to create the AudioConverter component (err=%d)\n", err);
		return CONTROL_FALSE;
	}

	size=sizeof(UInt32);
	maxFrames=8192; // This was calculated empirically. On MY system almost everything works more or less the same...

  int i;
  OSErr status;

  reset();

  AudioConverterDispose(ao->theConverter);
  AudioOutputUnitStop(ao->theOutputUnit);
  AudioUnitUninitialize(ao->theOutputUnit);
  CloseComponent(ao->theOutputUnit);

  free(ao->chunk);

15722:b53c4b26dc96

typedef struct ao_macosx_s
{
  /* AudioUnit */
  AudioUnit theOutputUnit;
  int packetSize;

  /* Ring-buffer */
  /* does not need explicit synchronization, but needs to allocate
   * (num_chunks + 1) * chunk_size memory to store num_chunks * chunk_size

  }
  ao->buf_read_pos = (ao->buf_read_pos + len) % ao->buffer_len;
  return len;
}

OSStatus theRenderProc(void *inRefCon, AudioUnitRenderActionFlags *inActionFlags, const AudioTimeStamp *inTimeStamp, UInt32 inBusNumber, UInt32 inNumFrames, AudioBufferList *ioData)
{
int amt=buf_used();
int req=(inNumFrames)*ao->packetSize;


	ioData->mBuffers[0].mData = ao->chunk;

	if(amt>req)
 		amt=req;

	if(amt)
		read_buffer((unsigned char *)ioData->mBuffers[0].mData, amt);

	ioData->mBuffers[0].mDataByteSize = amt;

 	return noErr;
}

static int control(int cmd,void *arg){
	switch (cmd) {
	case AOCONTROL_SET_DEVICE:

		ao_msg(MSGT_AO, MSGL_WARN, "Unable to initialize Output Unit component (err=%d)\n", err);
		return CONTROL_FALSE;
	}

	size =  sizeof(AudioStreamBasicDescription);
	err = AudioUnitSetProperty(ao->theOutputUnit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input, 0, &inDesc, size);

	if (err) {
		ao_msg(MSGT_AO, MSGL_WARN, "Unable to set the input format (err=%d)\n", err);
		return CONTROL_FALSE;
	}

	size=sizeof(UInt32);
	maxFrames=8192; // This was calculated empirically. On MY system almost everything works more or less the same...

  int i;
  OSErr status;

  reset();

  AudioOutputUnitStop(ao->theOutputUnit);
  AudioUnitUninitialize(ao->theOutputUnit);
  CloseComponent(ao->theOutputUnit);

  free(ao->chunk);