Bug 933284 - Initialize cubeb_audiotrack's get_output_samplingrate even on non-Froyo systems. r=padenot a=bbajaj
authorMatthew Gregan <kinetik@flim.org>
Mon, 04 Nov 2013 11:37:04 +1300
changeset 166528 8c087322d4497c8c91c0f25acddcc0a25b4f9b2c
parent 166527 1c1fcdc50acc3964580262277a202e2cd9941cd4
child 166529 bfa55569c7e9ce0de196e1dc452c1b2376d15773
push id3066
push userakeybl@mozilla.com
push dateMon, 09 Dec 2013 19:58:46 +0000
treeherdermozilla-beta@a31a0dce83aa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerspadenot, bbajaj
bugs933284
milestone27.0a2
Bug 933284 - Initialize cubeb_audiotrack's get_output_samplingrate even on non-Froyo systems. r=padenot a=bbajaj
media/libcubeb/src/cubeb_audiotrack.c
--- a/media/libcubeb/src/cubeb_audiotrack.c
+++ b/media/libcubeb/src/cubeb_audiotrack.c
@@ -228,22 +228,23 @@ audiotrack_init(cubeb ** context, char c
     DLSYM_DLERROR("_ZN7android10AudioTrackC1EijiiijPFviPvS1_ES1_i", ctx->klass.ctor_froyo, ctx->library);
     assert(ctx->klass.ctor_froyo);
   }
   DLSYM_DLERROR("_ZN7android10AudioTrackD1Ev", ctx->klass.dtor, ctx->library);
 
   DLSYM_DLERROR("_ZNK7android10AudioTrack7latencyEv", ctx->klass.latency, ctx->library);
   DLSYM_DLERROR("_ZNK7android10AudioTrack9initCheckEv", ctx->klass.check, ctx->library);
 
+  DLSYM_DLERROR("_ZN7android11AudioSystem21getOutputSamplingRateEPii", ctx->klass.get_output_samplingrate, ctx->library);
+
   /* |getMinFrameCount| is not available on Froyo, and is available on
    * gingerbread and ICS with a different signature. */
   if (audiotrack_version_is_froyo(ctx)) {
     DLSYM_DLERROR("_ZN7android11AudioSystem19getOutputFrameCountEPii", ctx->klass.get_output_frame_count, ctx->library);
     DLSYM_DLERROR("_ZN7android11AudioSystem16getOutputLatencyEPji", ctx->klass.get_output_latency, ctx->library);
-    DLSYM_DLERROR("_ZN7android11AudioSystem21getOutputSamplingRateEPii", ctx->klass.get_output_samplingrate, ctx->library);
   } else {
     DLSYM_DLERROR("_ZN7android10AudioTrack16getMinFrameCountEPi19audio_stream_type_tj", ctx->klass.get_min_frame_count, ctx->library);
     if (!ctx->klass.get_min_frame_count) {
       DLSYM_DLERROR("_ZN7android10AudioTrack16getMinFrameCountEPiij", ctx->klass.get_min_frame_count_gingerbread, ctx->library);
     }
   }
 
   DLSYM_DLERROR("_ZN7android10AudioTrack5startEv", ctx->klass.start, ctx->library);