Bug 1385481 - Update cubeb from upstream to 42da8d2. r=kinetik
authorAlex Chronopoulos <achronop@gmail.com>
Sat, 29 Jul 2017 02:45:33 +0300
changeset 420591 11eaa60784b8886d85db57d07404c4285c1b7a98
parent 420590 e05ac296ea1472fd8f2ec7f2347e25348275e76c
child 420592 03533ecbc1af51dd87edf1419b132a5a254f43a1
push id7566
push usermtabara@mozilla.com
push dateWed, 02 Aug 2017 08:25:16 +0000
treeherdermozilla-beta@86913f512c3c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskinetik
bugs1385481
milestone56.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 1385481 - Update cubeb from upstream to 42da8d2. r=kinetik MozReview-Commit-ID: HOrC5Iwd92L
media/libcubeb/README_MOZILLA
media/libcubeb/src/cubeb_audiounit.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 09aeb59259487a2fbeeca1824f1f68f55b6787f4 (2017-07-22 09:54:44 +1200)
+The git commit ID used was cf622778bbc3d240d7079879fabd2dc945237cbc (2017-07-29 11:28:16 +1200)
--- a/media/libcubeb/src/cubeb_audiounit.cpp
+++ b/media/libcubeb/src/cubeb_audiounit.cpp
@@ -585,16 +585,17 @@ audiounit_set_device_info(cubeb_stream *
   if (side == INPUT) {
     info = &stm->input_device;
     type = CUBEB_DEVICE_TYPE_INPUT;
   } else if (side == OUTPUT) {
     info = &stm->output_device;
     type = CUBEB_DEVICE_TYPE_OUTPUT;
   }
   memset(info, 0, sizeof(device_info));
+  info->id = id;
 
   if (side == INPUT) {
     info->flags |= DEV_INPUT;
   } else if (side == OUTPUT) {
     info->flags |= DEV_OUTPUT;
   }
 
   AudioDeviceID default_device_id = audiounit_get_default_device_id(type);