Bug 865244 - Fix bustage on Android.
authorPaul Adenot <paul@paul.cx>
Mon, 10 Jun 2013 19:58:14 +0200
changeset 134536 efa5667ea807bda2b9e1ff3b1b76f138a1c338d3
parent 134535 3443f1733c2219ef40d6e0f78652a61f15b7c860
child 134537 a1c5ee22d9c31981a9ca0538996ec851b8c82e56
push id29255
push userpaul@paul.cx
push dateMon, 10 Jun 2013 17:59:27 +0000
treeherdermozilla-inbound@efa5667ea807 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs865244
milestone24.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 865244 - Fix bustage on Android.
media/libcubeb/src/cubeb_audiotrack.c
--- a/media/libcubeb/src/cubeb_audiotrack.c
+++ b/media/libcubeb/src/cubeb_audiotrack.c
@@ -337,28 +337,28 @@ audiotrack_stream_init(cubeb * ctx, cube
   if (audiotrack_version_is_froyo(ctx) || audiotrack_version_is_gingerbread(ctx)) {
     channels = stm->params.channels == 2 ? AUDIO_CHANNEL_OUT_STEREO_Legacy : AUDIO_CHANNEL_OUT_MONO_Legacy;
   } else {
     channels = stm->params.channels == 2 ? AUDIO_CHANNEL_OUT_STEREO_ICS : AUDIO_CHANNEL_OUT_MONO_ICS;
   }
 
   if (audiotrack_version_is_froyo(ctx)) {
     ctx->klass.ctor_froyo(stm->instance,
-                          params->stream_type,
+                          stm->params.stream_type,
                           stm->params.rate,
                           AUDIO_FORMAT_PCM_16_BIT,
                           channels,
                           min_frame_count,
                           0,
                           audiotrack_refill,
                           stm,
                           0);
   } else {
     ctx->klass.ctor(stm->instance,
-                    params->stream_type,
+                    stm->params.stream_type,
                     stm->params.rate,
                     AUDIO_FORMAT_PCM_16_BIT,
                     channels,
                     min_frame_count,
                     0,
                     audiotrack_refill,
                     stm,
                     0,