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

removes the use of AudioConverters. patch by Alexander Strange <alexander.strange@ithinksw.com> 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15723 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
nplourde 2005-06-14 12:41:42 +00:00
parent eeec580edc
commit 585a341c94
1 changed files with 5 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
libao2/ao_macosx.c
View File

@ -74,7 +74,6 @@ typedef struct ao_macosx_s
{ {
/* AudioUnit */ /* AudioUnit */
AudioUnit theOutputUnit; AudioUnit theOutputUnit;
AudioConverterRef theConverter;
int packetSize; int packetSize;
/* Ring-buffer */ /* Ring-buffer */
@ -155,18 +154,13 @@ static int read_buffer(unsigned char* data,int len){
return len; return len;
} }
/* end ring buffer stuff */ OSStatus theRenderProc(void *inRefCon, AudioUnitRenderActionFlags *inActionFlags, const AudioTimeStamp *inTimeStamp, UInt32 inBusNumber, UInt32 inNumFrames, AudioBufferList *ioData)
OSStatus ACComplexInputProc(AudioConverterRef inAudioConverter, UInt32 *ioNumberDataPackets, AudioBufferList *ioData, AudioStreamPacketDescription **outDataPacketDescription, void *inUserData)
{ {
int amt=buf_used(); int amt=buf_used();
int req=(*ioNumberDataPackets)*ao->packetSize; int req=(inNumFrames)*ao->packetSize;
ioData->mBuffers[0].mData = ao->chunk; ioData->mBuffers[0].mData = ao->chunk;
ioData->mBuffers[0].mDataByteSize = req;
// fprintf(stderr, "##### req=%d amt=%d #####\n", req, amt);
if(amt>req) if(amt>req)
amt=req; amt=req;
@ -174,36 +168,11 @@ int req=(*ioNumberDataPackets)*ao->packetSize;
if(amt) if(amt)
read_buffer((unsigned char *)ioData->mBuffers[0].mData, amt); read_buffer((unsigned char *)ioData->mBuffers[0].mData, amt);
if(req-amt) ioData->mBuffers[0].mDataByteSize = amt;
memset(ioData->mBuffers[0].mData+amt, 0, req-amt);
return noErr; 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){ static int control(int cmd,void *arg){
switch (cmd) { switch (cmd) {
case AOCONTROL_SET_DEVICE: case AOCONTROL_SET_DEVICE:
@ -333,13 +302,10 @@ UInt32 size, maxFrames;
} }
size = sizeof(AudioStreamBasicDescription); size = sizeof(AudioStreamBasicDescription);
err = AudioUnitGetProperty(ao->theOutputUnit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Output, 0, &outDesc, &size); err = AudioUnitSetProperty(ao->theOutputUnit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input, 0, &inDesc, size);
print_format("destination: ", &outDesc);
err = AudioUnitSetProperty(ao->theOutputUnit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input, 0, &outDesc, size);
err = AudioConverterNew(&inDesc, &outDesc, &(ao->theConverter));
if (err) { if (err) {
ao_msg(MSGT_AO, MSGL_WARN, "Unable to create the AudioConverter component (err=%d)\n", err); ao_msg(MSGT_AO, MSGL_WARN, "Unable to set the input format (err=%d)\n", err);
return CONTROL_FALSE; return CONTROL_FALSE;
} }
@ -417,7 +383,6 @@ static void uninit(int immed)
reset(); reset();
AudioConverterDispose(ao->theConverter);
AudioOutputUnitStop(ao->theOutputUnit); AudioOutputUnitStop(ao->theOutputUnit);
AudioUnitUninitialize(ao->theOutputUnit); AudioUnitUninitialize(ao->theOutputUnit);
CloseComponent(ao->theOutputUnit); CloseComponent(ao->theOutputUnit);