author | Michael Wu <mwu@mozilla.com> |
Thu, 03 Jun 2010 13:59:04 -0700 | |
changeset 43067 | cac6db5caec80fb1f3fbd926ad4338ff835a503b |
parent 43066 | 1c416ab33c8e6cebc2c74d0f36cf76b5a0a6b2dd |
child 43068 | 5153bb3533e61fb28f280ad45f6850d8669e490e |
push id | 13601 |
push user | mwu@mozilla.com |
push date | Thu, 03 Jun 2010 21:02:09 +0000 |
treeherder | mozilla-central@cac6db5caec8 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | kinetik |
bugs | 568315 |
milestone | 1.9.3a5pre |
first release with | nightly win64
cac6db5caec8
/
3.7a5pre
/
20100603152324
/
files
nightly linux32
nightly linux64
nightly mac
nightly win32
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
releases | nightly win64
3.7a5pre
/
20100603152324
/
pushlog to previous
|
--- a/media/libsydneyaudio/src/Makefile.in +++ b/media/libsydneyaudio/src/Makefile.in @@ -46,17 +46,21 @@ LIBRARY_NAME = sydneyaudio FORCE_STATIC_LIB= 1 ifneq (,$(filter DragonFly FreeBSD GNU GNU_% NetBSD OpenBSD,$(OS_ARCH))) CSRCS = \ sydney_audio_oss.c \ $(NULL) endif -ifeq ($(OS_ARCH),Linux) +ifeq ($(OS_TARGET),Android) +CSRCS = \ + sydney_audio_android.c \ + $(NULL) +else ifeq ($(OS_ARCH),Linux) CSRCS = \ sydney_audio_alsa.c \ $(NULL) endif ifneq (,$(filter WINNT WINCE,$(OS_ARCH))) CSRCS = \ sydney_audio_waveapi.c \
new file mode 100644 --- /dev/null +++ b/media/libsydneyaudio/src/sydney_audio_android.c @@ -0,0 +1,422 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Initial Developer of the Original Code is + * CSIRO + * Portions created by the Initial Developer are Copyright (C) 2007 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): Michael Martin + * Michael Wu <mwu@mozilla.com> + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** * + */ + +#include <stdlib.h> +#include <jni.h> +#include "sydney_audio.h" + +/* Android implementation based on sydney_audio_mac.c */ + +/* android.media.AudioTrack */ +struct AudioTrack { + jclass class; + jmethodID constructor; + jmethodID flush; + jmethodID pause; + jmethodID play; + jmethodID setvol; + jmethodID stop; + jmethodID write; + jmethodID getpos; +}; + +enum AudioTrackMode { + MODE_STATIC = 0, + MODE_STREAM = 1 +}; + +/* android.media.AudioManager */ +enum AudioManagerStream { + STREAM_VOICE_CALL = 0, + STREAM_SYSTEM = 1, + STREAM_RING = 2, + STREAM_MUSIC = 3, + STREAM_ALARM = 4, + STREAM_NOTIFICATION = 5, + STREAM_DTMF = 8 +}; + +/* android.media.AudioFormat */ +enum AudioFormatChannel { + CHANNEL_OUT_MONO = 4, + CHANNEL_OUT_STEREO = 12 +}; + +enum AudioFormatEncoding { + ENCODING_PCM_16BIT = 2, + ENCODING_PCM_8BIT = 3 +}; + +struct sa_stream { + jobject output_unit; + + unsigned int rate; + unsigned int channels; + jclass at_class; +}; + +static struct AudioTrack at; +extern JNIEnv * GetJNIForThread(); + +static jclass +init_jni_bindings(JNIEnv *jenv) { + jclass class = + (*jenv)->NewGlobalRef(jenv, + (*jenv)->FindClass(jenv, + "android/media/AudioTrack")); + at.constructor = (*jenv)->GetMethodID(jenv, class, "<init>", "(IIIIII)V"); + at.flush = (*jenv)->GetMethodID(jenv, class, "flush", "()V"); + at.pause = (*jenv)->GetMethodID(jenv, class, "pause", "()V"); + at.play = (*jenv)->GetMethodID(jenv, class, "play", "()V"); + at.setvol = (*jenv)->GetMethodID(jenv, class, "setStereoVolume", "(FF)I"); + at.stop = (*jenv)->GetMethodID(jenv, class, "stop", "()V"); + at.write = (*jenv)->GetMethodID(jenv, class, "write", "([BII)I"); + at.getpos = (*jenv)->GetMethodID(jenv, class, "getPlaybackHeadPosition", "()I"); + + return class; +}; + +/* + * ----------------------------------------------------------------------------- + * Startup and shutdown functions + * ----------------------------------------------------------------------------- + */ + +int +sa_stream_create_pcm( + sa_stream_t ** _s, + const char * client_name, + sa_mode_t mode, + sa_pcm_format_t format, + unsigned int rate, + unsigned int channels +) { + + /* + * Make sure we return a NULL stream pointer on failure. + */ + if (_s == NULL) { + return SA_ERROR_INVALID; + } + *_s = NULL; + + if (mode != SA_MODE_WRONLY) { + return SA_ERROR_NOT_SUPPORTED; + } + if (format != SA_PCM_FORMAT_S16_NE) { + return SA_ERROR_NOT_SUPPORTED; + } + if (channels != 1 && channels != 2) { + return SA_ERROR_NOT_SUPPORTED; + } + + /* + * Allocate the instance and required resources. + */ + sa_stream_t *s; + if ((s = malloc(sizeof(sa_stream_t))) == NULL) { + return SA_ERROR_OOM; + } + + s->output_unit = NULL; + s->rate = rate; + s->channels = channels; + + *_s = s; + return SA_SUCCESS; +} + + +int +sa_stream_open(sa_stream_t *s) { + + if (s == NULL) { + return SA_ERROR_NO_INIT; + } + if (s->output_unit != NULL) { + return SA_ERROR_INVALID; + } + + JNIEnv *jenv = GetJNIForThread(); + if ((*jenv)->PushLocalFrame(jenv, 4)) { + return SA_ERROR_OOM; + } + + s->at_class = init_jni_bindings(jenv); + + jobject obj = + (*jenv)->NewObject(jenv, s->at_class, at.constructor, + STREAM_MUSIC, + s->rate, + s->channels == 1 ? + CHANNEL_OUT_MONO : CHANNEL_OUT_STEREO, + ENCODING_PCM_16BIT, + (s->channels * s->rate) / 2, + MODE_STREAM); + + if (!obj) { + (*jenv)->DeleteGlobalRef(jenv, s->at_class); + (*jenv)->PopLocalFrame(jenv, NULL); + return SA_ERROR_OOM; + } + + s->output_unit = (*jenv)->NewGlobalRef(jenv, obj); + (*jenv)->PopLocalFrame(jenv, NULL); + + return SA_SUCCESS; +} + + +int +sa_stream_destroy(sa_stream_t *s) { + + if (s == NULL) { + return SA_ERROR_NO_INIT; + } + + JNIEnv *jenv = GetJNIForThread(); + (*jenv)->DeleteGlobalRef(jenv, s->output_unit); + (*jenv)->DeleteGlobalRef(jenv, s->at_class); + free(s); + + return SA_SUCCESS; +} + + + +/* + * ----------------------------------------------------------------------------- + * Data read and write functions + * ----------------------------------------------------------------------------- + */ + +int +sa_stream_write(sa_stream_t *s, const void *data, size_t nbytes) { + + if (s == NULL || s->output_unit == NULL) { + return SA_ERROR_NO_INIT; + } + if (nbytes == 0) { + return SA_SUCCESS; + } + JNIEnv *jenv = GetJNIForThread(); + if ((*jenv)->PushLocalFrame(jenv, 2)) { + return SA_ERROR_OOM; + } + + jbyteArray bytearray = (*jenv)->NewByteArray(jenv, nbytes); + if (!bytearray) { + (*jenv)->ExceptionClear(jenv); + (*jenv)->PopLocalFrame(jenv, NULL); + return SA_ERROR_OOM; + } + + jbyte *byte = (*jenv)->GetByteArrayElements(jenv, bytearray, NULL); + if (!byte) { + (*jenv)->PopLocalFrame(jenv, NULL); + return SA_ERROR_OOM; + } + + memcpy(byte, data, nbytes); + (*jenv)->ReleaseByteArrayElements(jenv, bytearray, byte, 0); + jint retval = (*jenv)->CallIntMethod(jenv, s->output_unit, at.write, + bytearray, 0, nbytes); + + (*jenv)->PopLocalFrame(jenv, NULL); + + return retval < 0 ? SA_ERROR_INVALID : SA_SUCCESS; +} + + +/* + * ----------------------------------------------------------------------------- + * General query and support functions + * ----------------------------------------------------------------------------- + */ + +int +sa_stream_get_write_size(sa_stream_t *s, size_t *size) { + + if (s == NULL || s->output_unit == NULL) { + return SA_ERROR_NO_INIT; + } + + // XXX AudioTrack doesn't block on writes but it might not write everything. + // Needs investigation. + *size = (s->rate * s->channels) / 2; + return SA_SUCCESS; +} + + +int +sa_stream_get_position(sa_stream_t *s, sa_position_t position, int64_t *pos) { + + if (s == NULL || s->output_unit == NULL) { + return SA_ERROR_NO_INIT; + } + + JNIEnv *jenv = GetJNIForThread(); + *pos = (*jenv)->CallIntMethod(jenv, s->output_unit, at.getpos); + *pos *= s->channels * 2; + return SA_SUCCESS; +} + + +int +sa_stream_pause(sa_stream_t *s) { + + if (s == NULL || s->output_unit == NULL) { + return SA_ERROR_NO_INIT; + } + + JNIEnv *jenv = GetJNIForThread(); + (*jenv)->CallVoidMethod(jenv, s->output_unit, at.pause); + return SA_SUCCESS; +} + + +int +sa_stream_resume(sa_stream_t *s) { + + if (s == NULL || s->output_unit == NULL) { + return SA_ERROR_NO_INIT; + } + + JNIEnv *jenv = GetJNIForThread(); + (*jenv)->CallVoidMethod(jenv, s->output_unit, at.play); + return SA_SUCCESS; +} + + +int +sa_stream_drain(sa_stream_t *s) +{ + if (s == NULL || s->output_unit == NULL) { + return SA_ERROR_NO_INIT; + } + + JNIEnv *jenv = GetJNIForThread(); + (*jenv)->CallVoidMethod(jenv, s->output_unit, at.flush); + return SA_SUCCESS; +} + + + +/* + * ----------------------------------------------------------------------------- + * Extension functions + * ----------------------------------------------------------------------------- + */ + +int +sa_stream_set_volume_abs(sa_stream_t *s, float vol) { + + if (s == NULL || s->output_unit == NULL) { + return SA_ERROR_NO_INIT; + } + + JNIEnv *jenv = GetJNIForThread(); + (*jenv)->CallIntMethod(jenv, s->output_unit, at.setvol, + (jfloat)vol, (jfloat)vol); + + return SA_SUCCESS; +} + +/* + * ----------------------------------------------------------------------------- + * Unsupported functions + * ----------------------------------------------------------------------------- + */ +#define UNSUPPORTED(func) func { return SA_ERROR_NOT_SUPPORTED; } + +UNSUPPORTED(int sa_stream_create_opaque(sa_stream_t **s, const char *client_name, sa_mode_t mode, const char *codec)) +UNSUPPORTED(int sa_stream_set_write_lower_watermark(sa_stream_t *s, size_t size)) +UNSUPPORTED(int sa_stream_set_read_lower_watermark(sa_stream_t *s, size_t size)) +UNSUPPORTED(int sa_stream_set_write_upper_watermark(sa_stream_t *s, size_t size)) +UNSUPPORTED(int sa_stream_set_read_upper_watermark(sa_stream_t *s, size_t size)) +UNSUPPORTED(int sa_stream_set_channel_map(sa_stream_t *s, const sa_channel_t map[], unsigned int n)) +UNSUPPORTED(int sa_stream_set_xrun_mode(sa_stream_t *s, sa_xrun_mode_t mode)) +UNSUPPORTED(int sa_stream_set_non_interleaved(sa_stream_t *s, int enable)) +UNSUPPORTED(int sa_stream_set_dynamic_rate(sa_stream_t *s, int enable)) +UNSUPPORTED(int sa_stream_set_driver(sa_stream_t *s, const char *driver)) +UNSUPPORTED(int sa_stream_start_thread(sa_stream_t *s, sa_event_callback_t callback)) +UNSUPPORTED(int sa_stream_stop_thread(sa_stream_t *s)) +UNSUPPORTED(int sa_stream_change_device(sa_stream_t *s, const char *device_name)) +UNSUPPORTED(int sa_stream_change_read_volume(sa_stream_t *s, const int32_t vol[], unsigned int n)) +UNSUPPORTED(int sa_stream_change_write_volume(sa_stream_t *s, const int32_t vol[], unsigned int n)) +UNSUPPORTED(int sa_stream_change_rate(sa_stream_t *s, unsigned int rate)) +UNSUPPORTED(int sa_stream_change_meta_data(sa_stream_t *s, const char *name, const void *data, size_t size)) +UNSUPPORTED(int sa_stream_change_user_data(sa_stream_t *s, const void *value)) +UNSUPPORTED(int sa_stream_set_adjust_rate(sa_stream_t *s, sa_adjust_t direction)) +UNSUPPORTED(int sa_stream_set_adjust_nchannels(sa_stream_t *s, sa_adjust_t direction)) +UNSUPPORTED(int sa_stream_set_adjust_pcm_format(sa_stream_t *s, sa_adjust_t direction)) +UNSUPPORTED(int sa_stream_set_adjust_watermarks(sa_stream_t *s, sa_adjust_t direction)) +UNSUPPORTED(int sa_stream_get_mode(sa_stream_t *s, sa_mode_t *access_mode)) +UNSUPPORTED(int sa_stream_get_codec(sa_stream_t *s, char *codec, size_t *size)) +UNSUPPORTED(int sa_stream_get_pcm_format(sa_stream_t *s, sa_pcm_format_t *format)) +UNSUPPORTED(int sa_stream_get_rate(sa_stream_t *s, unsigned int *rate)) +UNSUPPORTED(int sa_stream_get_nchannels(sa_stream_t *s, int *nchannels)) +UNSUPPORTED(int sa_stream_get_user_data(sa_stream_t *s, void **value)) +UNSUPPORTED(int sa_stream_get_write_lower_watermark(sa_stream_t *s, size_t *size)) +UNSUPPORTED(int sa_stream_get_read_lower_watermark(sa_stream_t *s, size_t *size)) +UNSUPPORTED(int sa_stream_get_write_upper_watermark(sa_stream_t *s, size_t *size)) +UNSUPPORTED(int sa_stream_get_read_upper_watermark(sa_stream_t *s, size_t *size)) +UNSUPPORTED(int sa_stream_get_channel_map(sa_stream_t *s, sa_channel_t map[], unsigned int *n)) +UNSUPPORTED(int sa_stream_get_xrun_mode(sa_stream_t *s, sa_xrun_mode_t *mode)) +UNSUPPORTED(int sa_stream_get_non_interleaved(sa_stream_t *s, int *enabled)) +UNSUPPORTED(int sa_stream_get_dynamic_rate(sa_stream_t *s, int *enabled)) +UNSUPPORTED(int sa_stream_get_driver(sa_stream_t *s, char *driver_name, size_t *size)) +UNSUPPORTED(int sa_stream_get_device(sa_stream_t *s, char *device_name, size_t *size)) +UNSUPPORTED(int sa_stream_get_read_volume(sa_stream_t *s, int32_t vol[], unsigned int *n)) +UNSUPPORTED(int sa_stream_get_write_volume(sa_stream_t *s, int32_t vol[], unsigned int *n)) +UNSUPPORTED(int sa_stream_get_meta_data(sa_stream_t *s, const char *name, void*data, size_t *size)) +UNSUPPORTED(int sa_stream_get_adjust_rate(sa_stream_t *s, sa_adjust_t *direction)) +UNSUPPORTED(int sa_stream_get_adjust_nchannels(sa_stream_t *s, sa_adjust_t *direction)) +UNSUPPORTED(int sa_stream_get_adjust_pcm_format(sa_stream_t *s, sa_adjust_t *direction)) +UNSUPPORTED(int sa_stream_get_adjust_watermarks(sa_stream_t *s, sa_adjust_t *direction)) +UNSUPPORTED(int sa_stream_get_state(sa_stream_t *s, sa_state_t *state)) +UNSUPPORTED(int sa_stream_get_event_error(sa_stream_t *s, sa_error_t *error)) +UNSUPPORTED(int sa_stream_get_event_notify(sa_stream_t *s, sa_notify_t *notify)) +UNSUPPORTED(int sa_stream_read(sa_stream_t *s, void *data, size_t nbytes)) +UNSUPPORTED(int sa_stream_read_ni(sa_stream_t *s, unsigned int channel, void *data, size_t nbytes)) +UNSUPPORTED(int sa_stream_write_ni(sa_stream_t *s, unsigned int channel, const void *data, size_t nbytes)) +UNSUPPORTED(int sa_stream_pwrite(sa_stream_t *s, const void *data, size_t nbytes, int64_t offset, sa_seek_t whence)) +UNSUPPORTED(int sa_stream_pwrite_ni(sa_stream_t *s, unsigned int channel, const void *data, size_t nbytes, int64_t offset, sa_seek_t whence)) +UNSUPPORTED(int sa_stream_get_read_size(sa_stream_t *s, size_t *size)) +UNSUPPORTED(int sa_stream_get_volume_abs(sa_stream_t *s, float *vol)) + +const char *sa_strerror(int code) { return NULL; } +
new file mode 100644 --- /dev/null +++ b/media/libsydneyaudio/sydney_android.patch @@ -0,0 +1,443 @@ +diff --git a/media/libsydneyaudio/src/Makefile.in b/media/libsydneyaudio/src/Makefile.in +--- a/media/libsydneyaudio/src/Makefile.in ++++ b/media/libsydneyaudio/src/Makefile.in +@@ -51,7 +51,11 @@ CSRCS = \ + $(NULL) + endif + +-ifeq ($(OS_ARCH),Linux) ++ifeq ($(OS_TARGET),Android) ++CSRCS = \ ++ sydney_audio_android.c \ ++ $(NULL) ++else ifeq ($(OS_ARCH),Linux) + CSRCS = \ + sydney_audio_alsa.c \ + $(NULL) +diff --git a/media/libsydneyaudio/src/sydney_audio_android.c b/media/libsydneyaudio/src/sydney_audio_android.c +new file mode 100644 +--- /dev/null ++++ b/media/libsydneyaudio/src/sydney_audio_android.c +@@ -0,0 +1,422 @@ ++/* ***** BEGIN LICENSE BLOCK ***** ++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 ++ * ++ * The contents of this file are subject to the Mozilla Public License Version ++ * 1.1 (the "License"); you may not use this file except in compliance with ++ * the License. You may obtain a copy of the License at ++ * http://www.mozilla.org/MPL/ ++ * ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. ++ * ++ * The Initial Developer of the Original Code is ++ * CSIRO ++ * Portions created by the Initial Developer are Copyright (C) 2007 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): Michael Martin ++ * Michael Wu <mwu@mozilla.com> ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either the GNU General Public License Version 2 or later (the "GPL"), or ++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++ * in which case the provisions of the GPL or the LGPL are applicable instead ++ * of those above. If you wish to allow use of your version of this file only ++ * under the terms of either the GPL or the LGPL, and not to allow others to ++ * use your version of this file under the terms of the MPL, indicate your ++ * decision by deleting the provisions above and replace them with the notice ++ * and other provisions required by the GPL or the LGPL. If you do not delete ++ * the provisions above, a recipient may use your version of this file under ++ * the terms of any one of the MPL, the GPL or the LGPL. ++ * ++ * ***** END LICENSE BLOCK ***** * ++ */ ++ ++#include <stdlib.h> ++#include <jni.h> ++#include "sydney_audio.h" ++ ++/* Android implementation based on sydney_audio_mac.c */ ++ ++/* android.media.AudioTrack */ ++struct AudioTrack { ++ jclass class; ++ jmethodID constructor; ++ jmethodID flush; ++ jmethodID pause; ++ jmethodID play; ++ jmethodID setvol; ++ jmethodID stop; ++ jmethodID write; ++ jmethodID getpos; ++}; ++ ++enum AudioTrackMode { ++ MODE_STATIC = 0, ++ MODE_STREAM = 1 ++}; ++ ++/* android.media.AudioManager */ ++enum AudioManagerStream { ++ STREAM_VOICE_CALL = 0, ++ STREAM_SYSTEM = 1, ++ STREAM_RING = 2, ++ STREAM_MUSIC = 3, ++ STREAM_ALARM = 4, ++ STREAM_NOTIFICATION = 5, ++ STREAM_DTMF = 8 ++}; ++ ++/* android.media.AudioFormat */ ++enum AudioFormatChannel { ++ CHANNEL_OUT_MONO = 4, ++ CHANNEL_OUT_STEREO = 12 ++}; ++ ++enum AudioFormatEncoding { ++ ENCODING_PCM_16BIT = 2, ++ ENCODING_PCM_8BIT = 3 ++}; ++ ++struct sa_stream { ++ jobject output_unit; ++ ++ unsigned int rate; ++ unsigned int channels; ++ jclass at_class; ++}; ++ ++static struct AudioTrack at; ++extern JNIEnv * GetJNIForThread(); ++ ++static jclass ++init_jni_bindings(JNIEnv *jenv) { ++ jclass class = ++ (*jenv)->NewGlobalRef(jenv, ++ (*jenv)->FindClass(jenv, ++ "android/media/AudioTrack")); ++ at.constructor = (*jenv)->GetMethodID(jenv, class, "<init>", "(IIIIII)V"); ++ at.flush = (*jenv)->GetMethodID(jenv, class, "flush", "()V"); ++ at.pause = (*jenv)->GetMethodID(jenv, class, "pause", "()V"); ++ at.play = (*jenv)->GetMethodID(jenv, class, "play", "()V"); ++ at.setvol = (*jenv)->GetMethodID(jenv, class, "setStereoVolume", "(FF)I"); ++ at.stop = (*jenv)->GetMethodID(jenv, class, "stop", "()V"); ++ at.write = (*jenv)->GetMethodID(jenv, class, "write", "([BII)I"); ++ at.getpos = (*jenv)->GetMethodID(jenv, class, "getPlaybackHeadPosition", "()I"); ++ ++ return class; ++}; ++ ++/* ++ * ----------------------------------------------------------------------------- ++ * Startup and shutdown functions ++ * ----------------------------------------------------------------------------- ++ */ ++ ++int ++sa_stream_create_pcm( ++ sa_stream_t ** _s, ++ const char * client_name, ++ sa_mode_t mode, ++ sa_pcm_format_t format, ++ unsigned int rate, ++ unsigned int channels ++) { ++ ++ /* ++ * Make sure we return a NULL stream pointer on failure. ++ */ ++ if (_s == NULL) { ++ return SA_ERROR_INVALID; ++ } ++ *_s = NULL; ++ ++ if (mode != SA_MODE_WRONLY) { ++ return SA_ERROR_NOT_SUPPORTED; ++ } ++ if (format != SA_PCM_FORMAT_S16_NE) { ++ return SA_ERROR_NOT_SUPPORTED; ++ } ++ if (channels != 1 && channels != 2) { ++ return SA_ERROR_NOT_SUPPORTED; ++ } ++ ++ /* ++ * Allocate the instance and required resources. ++ */ ++ sa_stream_t *s; ++ if ((s = malloc(sizeof(sa_stream_t))) == NULL) { ++ return SA_ERROR_OOM; ++ } ++ ++ s->output_unit = NULL; ++ s->rate = rate; ++ s->channels = channels; ++ ++ *_s = s; ++ return SA_SUCCESS; ++} ++ ++ ++int ++sa_stream_open(sa_stream_t *s) { ++ ++ if (s == NULL) { ++ return SA_ERROR_NO_INIT; ++ } ++ if (s->output_unit != NULL) { ++ return SA_ERROR_INVALID; ++ } ++ ++ JNIEnv *jenv = GetJNIForThread(); ++ if ((*jenv)->PushLocalFrame(jenv, 4)) { ++ return SA_ERROR_OOM; ++ } ++ ++ s->at_class = init_jni_bindings(jenv); ++ ++ jobject obj = ++ (*jenv)->NewObject(jenv, s->at_class, at.constructor, ++ STREAM_MUSIC, ++ s->rate, ++ s->channels == 1 ? ++ CHANNEL_OUT_MONO : CHANNEL_OUT_STEREO, ++ ENCODING_PCM_16BIT, ++ (s->channels * s->rate) / 2, ++ MODE_STREAM); ++ ++ if (!obj) { ++ (*jenv)->DeleteGlobalRef(jenv, s->at_class); ++ (*jenv)->PopLocalFrame(jenv, NULL); ++ return SA_ERROR_OOM; ++ } ++ ++ s->output_unit = (*jenv)->NewGlobalRef(jenv, obj); ++ (*jenv)->PopLocalFrame(jenv, NULL); ++ ++ return SA_SUCCESS; ++} ++ ++ ++int ++sa_stream_destroy(sa_stream_t *s) { ++ ++ if (s == NULL) { ++ return SA_ERROR_NO_INIT; ++ } ++ ++ JNIEnv *jenv = GetJNIForThread(); ++ (*jenv)->DeleteGlobalRef(jenv, s->output_unit); ++ (*jenv)->DeleteGlobalRef(jenv, s->at_class); ++ free(s); ++ ++ return SA_SUCCESS; ++} ++ ++ ++ ++/* ++ * ----------------------------------------------------------------------------- ++ * Data read and write functions ++ * ----------------------------------------------------------------------------- ++ */ ++ ++int ++sa_stream_write(sa_stream_t *s, const void *data, size_t nbytes) { ++ ++ if (s == NULL || s->output_unit == NULL) { ++ return SA_ERROR_NO_INIT; ++ } ++ if (nbytes == 0) { ++ return SA_SUCCESS; ++ } ++ JNIEnv *jenv = GetJNIForThread(); ++ if ((*jenv)->PushLocalFrame(jenv, 2)) { ++ return SA_ERROR_OOM; ++ } ++ ++ jbyteArray bytearray = (*jenv)->NewByteArray(jenv, nbytes); ++ if (!bytearray) { ++ (*jenv)->ExceptionClear(jenv); ++ (*jenv)->PopLocalFrame(jenv, NULL); ++ return SA_ERROR_OOM; ++ } ++ ++ jbyte *byte = (*jenv)->GetByteArrayElements(jenv, bytearray, NULL); ++ if (!byte) { ++ (*jenv)->PopLocalFrame(jenv, NULL); ++ return SA_ERROR_OOM; ++ } ++ ++ memcpy(byte, data, nbytes); ++ (*jenv)->ReleaseByteArrayElements(jenv, bytearray, byte, 0); ++ jint retval = (*jenv)->CallIntMethod(jenv, s->output_unit, at.write, ++ bytearray, 0, nbytes); ++ ++ (*jenv)->PopLocalFrame(jenv, NULL); ++ ++ return retval < 0 ? SA_ERROR_INVALID : SA_SUCCESS; ++} ++ ++ ++/* ++ * ----------------------------------------------------------------------------- ++ * General query and support functions ++ * ----------------------------------------------------------------------------- ++ */ ++ ++int ++sa_stream_get_write_size(sa_stream_t *s, size_t *size) { ++ ++ if (s == NULL || s->output_unit == NULL) { ++ return SA_ERROR_NO_INIT; ++ } ++ ++ // XXX AudioTrack doesn't block on writes but it might not write everything. ++ // Needs investigation. ++ *size = (s->rate * s->channels) / 2; ++ return SA_SUCCESS; ++} ++ ++ ++int ++sa_stream_get_position(sa_stream_t *s, sa_position_t position, int64_t *pos) { ++ ++ if (s == NULL || s->output_unit == NULL) { ++ return SA_ERROR_NO_INIT; ++ } ++ ++ JNIEnv *jenv = GetJNIForThread(); ++ *pos = (*jenv)->CallIntMethod(jenv, s->output_unit, at.getpos); ++ *pos *= s->channels * 2; ++ return SA_SUCCESS; ++} ++ ++ ++int ++sa_stream_pause(sa_stream_t *s) { ++ ++ if (s == NULL || s->output_unit == NULL) { ++ return SA_ERROR_NO_INIT; ++ } ++ ++ JNIEnv *jenv = GetJNIForThread(); ++ (*jenv)->CallVoidMethod(jenv, s->output_unit, at.pause); ++ return SA_SUCCESS; ++} ++ ++ ++int ++sa_stream_resume(sa_stream_t *s) { ++ ++ if (s == NULL || s->output_unit == NULL) { ++ return SA_ERROR_NO_INIT; ++ } ++ ++ JNIEnv *jenv = GetJNIForThread(); ++ (*jenv)->CallVoidMethod(jenv, s->output_unit, at.play); ++ return SA_SUCCESS; ++} ++ ++ ++int ++sa_stream_drain(sa_stream_t *s) ++{ ++ if (s == NULL || s->output_unit == NULL) { ++ return SA_ERROR_NO_INIT; ++ } ++ ++ JNIEnv *jenv = GetJNIForThread(); ++ (*jenv)->CallVoidMethod(jenv, s->output_unit, at.flush); ++ return SA_SUCCESS; ++} ++ ++ ++ ++/* ++ * ----------------------------------------------------------------------------- ++ * Extension functions ++ * ----------------------------------------------------------------------------- ++ */ ++ ++int ++sa_stream_set_volume_abs(sa_stream_t *s, float vol) { ++ ++ if (s == NULL || s->output_unit == NULL) { ++ return SA_ERROR_NO_INIT; ++ } ++ ++ JNIEnv *jenv = GetJNIForThread(); ++ (*jenv)->CallIntMethod(jenv, s->output_unit, at.setvol, ++ (jfloat)vol, (jfloat)vol); ++ ++ return SA_SUCCESS; ++} ++ ++/* ++ * ----------------------------------------------------------------------------- ++ * Unsupported functions ++ * ----------------------------------------------------------------------------- ++ */ ++#define UNSUPPORTED(func) func { return SA_ERROR_NOT_SUPPORTED; } ++ ++UNSUPPORTED(int sa_stream_create_opaque(sa_stream_t **s, const char *client_name, sa_mode_t mode, const char *codec)) ++UNSUPPORTED(int sa_stream_set_write_lower_watermark(sa_stream_t *s, size_t size)) ++UNSUPPORTED(int sa_stream_set_read_lower_watermark(sa_stream_t *s, size_t size)) ++UNSUPPORTED(int sa_stream_set_write_upper_watermark(sa_stream_t *s, size_t size)) ++UNSUPPORTED(int sa_stream_set_read_upper_watermark(sa_stream_t *s, size_t size)) ++UNSUPPORTED(int sa_stream_set_channel_map(sa_stream_t *s, const sa_channel_t map[], unsigned int n)) ++UNSUPPORTED(int sa_stream_set_xrun_mode(sa_stream_t *s, sa_xrun_mode_t mode)) ++UNSUPPORTED(int sa_stream_set_non_interleaved(sa_stream_t *s, int enable)) ++UNSUPPORTED(int sa_stream_set_dynamic_rate(sa_stream_t *s, int enable)) ++UNSUPPORTED(int sa_stream_set_driver(sa_stream_t *s, const char *driver)) ++UNSUPPORTED(int sa_stream_start_thread(sa_stream_t *s, sa_event_callback_t callback)) ++UNSUPPORTED(int sa_stream_stop_thread(sa_stream_t *s)) ++UNSUPPORTED(int sa_stream_change_device(sa_stream_t *s, const char *device_name)) ++UNSUPPORTED(int sa_stream_change_read_volume(sa_stream_t *s, const int32_t vol[], unsigned int n)) ++UNSUPPORTED(int sa_stream_change_write_volume(sa_stream_t *s, const int32_t vol[], unsigned int n)) ++UNSUPPORTED(int sa_stream_change_rate(sa_stream_t *s, unsigned int rate)) ++UNSUPPORTED(int sa_stream_change_meta_data(sa_stream_t *s, const char *name, const void *data, size_t size)) ++UNSUPPORTED(int sa_stream_change_user_data(sa_stream_t *s, const void *value)) ++UNSUPPORTED(int sa_stream_set_adjust_rate(sa_stream_t *s, sa_adjust_t direction)) ++UNSUPPORTED(int sa_stream_set_adjust_nchannels(sa_stream_t *s, sa_adjust_t direction)) ++UNSUPPORTED(int sa_stream_set_adjust_pcm_format(sa_stream_t *s, sa_adjust_t direction)) ++UNSUPPORTED(int sa_stream_set_adjust_watermarks(sa_stream_t *s, sa_adjust_t direction)) ++UNSUPPORTED(int sa_stream_get_mode(sa_stream_t *s, sa_mode_t *access_mode)) ++UNSUPPORTED(int sa_stream_get_codec(sa_stream_t *s, char *codec, size_t *size)) ++UNSUPPORTED(int sa_stream_get_pcm_format(sa_stream_t *s, sa_pcm_format_t *format)) ++UNSUPPORTED(int sa_stream_get_rate(sa_stream_t *s, unsigned int *rate)) ++UNSUPPORTED(int sa_stream_get_nchannels(sa_stream_t *s, int *nchannels)) ++UNSUPPORTED(int sa_stream_get_user_data(sa_stream_t *s, void **value)) ++UNSUPPORTED(int sa_stream_get_write_lower_watermark(sa_stream_t *s, size_t *size)) ++UNSUPPORTED(int sa_stream_get_read_lower_watermark(sa_stream_t *s, size_t *size)) ++UNSUPPORTED(int sa_stream_get_write_upper_watermark(sa_stream_t *s, size_t *size)) ++UNSUPPORTED(int sa_stream_get_read_upper_watermark(sa_stream_t *s, size_t *size)) ++UNSUPPORTED(int sa_stream_get_channel_map(sa_stream_t *s, sa_channel_t map[], unsigned int *n)) ++UNSUPPORTED(int sa_stream_get_xrun_mode(sa_stream_t *s, sa_xrun_mode_t *mode)) ++UNSUPPORTED(int sa_stream_get_non_interleaved(sa_stream_t *s, int *enabled)) ++UNSUPPORTED(int sa_stream_get_dynamic_rate(sa_stream_t *s, int *enabled)) ++UNSUPPORTED(int sa_stream_get_driver(sa_stream_t *s, char *driver_name, size_t *size)) ++UNSUPPORTED(int sa_stream_get_device(sa_stream_t *s, char *device_name, size_t *size)) ++UNSUPPORTED(int sa_stream_get_read_volume(sa_stream_t *s, int32_t vol[], unsigned int *n)) ++UNSUPPORTED(int sa_stream_get_write_volume(sa_stream_t *s, int32_t vol[], unsigned int *n)) ++UNSUPPORTED(int sa_stream_get_meta_data(sa_stream_t *s, const char *name, void*data, size_t *size)) ++UNSUPPORTED(int sa_stream_get_adjust_rate(sa_stream_t *s, sa_adjust_t *direction)) ++UNSUPPORTED(int sa_stream_get_adjust_nchannels(sa_stream_t *s, sa_adjust_t *direction)) ++UNSUPPORTED(int sa_stream_get_adjust_pcm_format(sa_stream_t *s, sa_adjust_t *direction)) ++UNSUPPORTED(int sa_stream_get_adjust_watermarks(sa_stream_t *s, sa_adjust_t *direction)) ++UNSUPPORTED(int sa_stream_get_state(sa_stream_t *s, sa_state_t *state)) ++UNSUPPORTED(int sa_stream_get_event_error(sa_stream_t *s, sa_error_t *error)) ++UNSUPPORTED(int sa_stream_get_event_notify(sa_stream_t *s, sa_notify_t *notify)) ++UNSUPPORTED(int sa_stream_read(sa_stream_t *s, void *data, size_t nbytes)) ++UNSUPPORTED(int sa_stream_read_ni(sa_stream_t *s, unsigned int channel, void *data, size_t nbytes)) ++UNSUPPORTED(int sa_stream_write_ni(sa_stream_t *s, unsigned int channel, const void *data, size_t nbytes)) ++UNSUPPORTED(int sa_stream_pwrite(sa_stream_t *s, const void *data, size_t nbytes, int64_t offset, sa_seek_t whence)) ++UNSUPPORTED(int sa_stream_pwrite_ni(sa_stream_t *s, unsigned int channel, const void *data, size_t nbytes, int64_t offset, sa_seek_t whence)) ++UNSUPPORTED(int sa_stream_get_read_size(sa_stream_t *s, size_t *size)) ++UNSUPPORTED(int sa_stream_get_volume_abs(sa_stream_t *s, float *vol)) ++ ++const char *sa_strerror(int code) { return NULL; } ++
--- a/media/libsydneyaudio/update.sh +++ b/media/libsydneyaudio/update.sh @@ -11,8 +11,9 @@ patch -p4 <sydney_os2_base.patch patch -p4 <sydney_os2_moz.patch patch -p3 <bug495794_closeAudio.patch patch -p3 <bug495558_alsa_endian.patch patch -p3 <bug525401_drain_deadlock.patch patch -p3 <bug526411_latency.patch patch -p3 <sydney_aix.patch patch -p3 <bug562488_oss_destroy_crash.patch patch -p3 <bug564734-win32-drain.patch +patch -p3 <sydney_android.patch