Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-23 10:54:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 778675 - Make cubeb_stream_init errors non-fatal in AudioUnit backend. r=doublec

Browse Source
This commit is contained in:
Matthew Gregan 2012-10-18 18:03:45 +13:00
parent 4955da63dd
commit f996fdbef1
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
media/libcubeb/README_MOZILLA
View File

@ -6,3 +6,4 @@ Makefile.in build files for the Mozilla build system.
The cubeb git repository is: git://github.com/kinetiknz/cubeb.git
The git commit ID used was 2d7d3e8f2ecabb70d2723f3c86fcb591a84b7f85.
Plus the single commit f4c927fb1c2dc0a0580d0bca4bd267c34febada4.

31
media/libcubeb/src/cubeb_audiounit.c
View File

@ -7,7 +7,6 @@
#undef NDEBUG
#include <assert.h>
#include <pthread.h>
#include <stdio.h>
#include <stdlib.h>
#include <CoreServices/CoreServices.h>
#include <AudioUnit/AudioUnit.h>
@ -183,25 +182,25 @@ cubeb_stream_init(cubeb * context, cubeb_stream ** stream, char const * stream_n
r = OpenAComponent(comp, &stm->unit);
if (r != 0) {
fprintf(stderr, "cubeb_audiounit: FATAL: OpenAComponent returned %ld\n", (long) r);
cubeb_stream_destroy(stm);
return CUBEB_ERROR;
}
assert(r == 0);
input.inputProc = audio_unit_output_callback;
input.inputProcRefCon = stm;
r = AudioUnitSetProperty(stm->unit, kAudioUnitProperty_SetRenderCallback,
kAudioUnitScope_Global, 0, &input, sizeof(input));
if (r != 0) {
fprintf(stderr, "cubeb_audiounit: FATAL: AudioUnitSetProperty(SetRenderCallback) returned %ld\n", (long) r);
cubeb_stream_destroy(stm);
return CUBEB_ERROR;
}
assert(r == 0);
r = AudioUnitSetProperty(stm->unit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input,
0, &ss, sizeof(ss));
if (r != 0) {
fprintf(stderr, "cubeb_audiounit: FATAL: AudioUnitSetProperty(StreamFormat) returned %ld\n", (long) r);
cubeb_stream_destroy(stm);
return CUBEB_ERROR;
}
assert(r == 0);
buffer_size = ss.mSampleRate / 1000.0 * latency * ss.mBytesPerFrame / NBUFS;
if (buffer_size % ss.mBytesPerFrame != 0) {
@ -211,9 +210,9 @@ cubeb_stream_init(cubeb * context, cubeb_stream ** stream, char const * stream_n
r = AudioUnitInitialize(stm->unit);
if (r != 0) {
fprintf(stderr, "cubeb_audiounit: FATAL: AudioUnitInitialize returned %ld\n", (long) r);
cubeb_stream_destroy(stm);
return CUBEB_ERROR;
}
assert(r == 0);
*stream = stm;
@ -227,14 +226,16 @@ cubeb_stream_destroy(cubeb_stream * stm)
stm->shutdown = 1;
r = AudioOutputUnitStop(stm->unit);
assert(r == 0);
if (stm->unit) {
r = AudioOutputUnitStop(stm->unit);
assert(r == 0);
r = AudioUnitUninitialize(stm->unit);
assert(r == 0);
r = AudioUnitUninitialize(stm->unit);
assert(r == 0);
r = CloseComponent(stm->unit);
assert(r == 0);
r = CloseComponent(stm->unit);
assert(r == 0);
}
r = pthread_mutex_destroy(&stm->mutex);
assert(r == 0);