Bug 1315495 - Update libcubeb to 98b189d2. r=achronop
authorMatthew Gregan <kinetik@flim.org>
Sun, 06 Nov 2016 11:51:33 +1300
changeset 321310 d84108f190ee2ff550bd26d7ea07f8d843217298
parent 321309 e80ad115dbb882562a6ad3f066d6b41a00232357
child 321311 4bed3a0e2332f24ffe38f08e234c8898c42249ee
push id83549
push usermgregan@mozilla.com
push dateSat, 05 Nov 2016 22:54:45 +0000
treeherdermozilla-inbound@d84108f190ee [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersachronop
bugs1315495
milestone52.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 1315495 - Update libcubeb to 98b189d2. r=achronop
media/libcubeb/README_MOZILLA
media/libcubeb/src/cubeb_utils.h
media/libcubeb/src/cubeb_wasapi.cpp
--- a/media/libcubeb/README_MOZILLA
+++ b/media/libcubeb/README_MOZILLA
@@ -1,8 +1,8 @@
 The source from this directory was copied from the cubeb 
 git repository using the update.sh script.  The only changes
 made were those applied by update.sh and the addition of
 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 8c41e5641df50a4b78650057872178a5860222f0.
+The git commit ID used was 98b189d2aad06bef758a5ae76fb758fa4dfa9bba.
--- a/media/libcubeb/src/cubeb_utils.h
+++ b/media/libcubeb/src/cubeb_utils.h
@@ -207,23 +207,9 @@ struct auto_lock {
   ~auto_lock()
   {
     lock.leave();
   }
 private:
   owned_critical_section & lock;
 };
 
-struct auto_unlock {
-  explicit auto_unlock(owned_critical_section & lock)
-    : lock(lock)
-  {
-    lock.leave();
-  }
-  ~auto_unlock()
-  {
-    lock.enter();
-  }
-private:
-  owned_critical_section & lock;
-};
-
 #endif /* CUBEB_UTILS */
--- a/media/libcubeb/src/cubeb_wasapi.cpp
+++ b/media/libcubeb/src/cubeb_wasapi.cpp
@@ -1743,21 +1743,24 @@ void close_wasapi_stream(cubeb_stream * 
 {
   XASSERT(stm);
 
   stm->stream_reset_lock.assert_current_thread_owns();
 
   SafeRelease(stm->output_client);
   stm->output_client = NULL;
   SafeRelease(stm->input_client);
-  stm->capture_client = NULL;
+  stm->input_client = NULL;
 
   SafeRelease(stm->render_client);
   stm->render_client = NULL;
 
+  SafeRelease(stm->capture_client);
+  stm->capture_client = NULL;
+
   SafeRelease(stm->audio_stream_volume);
   stm->audio_stream_volume = NULL;
 
   SafeRelease(stm->audio_clock);
   stm->audio_clock = NULL;
   stm->total_frames_written += static_cast<UINT64>(round(stm->frames_written * stream_to_mix_samplerate_ratio(stm->output_stream_params, stm->output_mix_params)));
   stm->frames_written = 0;