Bug 1263735: Update libcubeb to remove wasapi stubbing for enumeration r=kinetik
authorRandell Jesup <rjesup@jesup.org>
Mon, 11 Apr 2016 17:19:46 -0400
changeset 330540 fe2eadfc65e71e9d6c7a5c18a0eda86813fc9aba
parent 330539 f9ffbf9846523e72e96b5643685b6a6be26d473a
child 330541 aa154d7c7747a8d633243bcf81e4743fbad2f4c2
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskinetik
bugs1263735
milestone48.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 1263735: Update libcubeb to remove wasapi stubbing for enumeration r=kinetik Also removes two spurious includes that were landed as possible bustage fixes in mozilla MozReview-Commit-ID: 5PIxLpEAFmI
media/libcubeb/README_MOZILLA
media/libcubeb/src/cubeb_wasapi.cpp
media/libcubeb/tests/test_duplex.cpp
media/libcubeb/tests/test_record.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 f3470c48b362c9f74c1aeb55a6ed440d0509dfa1.
+The git commit ID used was 55afd4e682c25b1fc0509b0c75144ed6b3c7da1d.
--- a/media/libcubeb/src/cubeb_wasapi.cpp
+++ b/media/libcubeb/src/cubeb_wasapi.cpp
@@ -1591,21 +1591,16 @@ wasapi_stream_init(cubeb * context, cube
 {
   HRESULT hr;
   int rv;
   auto_com com;
   if (!com.ok()) {
     return CUBEB_ERROR;
   }
 
-  if (input_device || output_device) {
-    /* Device selection not yet implemented. */
-    return CUBEB_ERROR_DEVICE_UNAVAILABLE;
-  }
-
   XASSERT(context && stream);
 
   if (output_stream_params && output_stream_params->format != CUBEB_SAMPLE_FLOAT32NE ||
       input_stream_params && input_stream_params->format != CUBEB_SAMPLE_FLOAT32NE) {
     return CUBEB_ERROR_INVALID_FORMAT;
   }
 
   cubeb_stream * stm = (cubeb_stream *)calloc(1, sizeof(cubeb_stream));
--- a/media/libcubeb/tests/test_duplex.cpp
+++ b/media/libcubeb/tests/test_duplex.cpp
@@ -8,17 +8,16 @@
 /* libcubeb api/function test. Loops input back to output and check audio
  * is flowing. */
 #ifdef NDEBUG
 #undef NDEBUG
 #endif
 #define _XOPEN_SOURCE 600
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <math.h>
 #include <assert.h>
 
 #include "cubeb/cubeb.h"
 #include "common.h"
 #ifdef CUBEB_GECKO_BUILD
 #include "TestHarness.h"
 #endif
@@ -88,17 +87,17 @@ void state_cb(cubeb_stream *stream, void
   }
 
   return;
 }
 
 int main(int argc, char *argv[])
 {
 #ifdef CUBEB_GECKO_BUILD
-  ScopedXPCOM xpcom("test_record");
+  ScopedXPCOM xpcom("test_duplex");
 #endif
 
   cubeb *ctx;
   cubeb_stream *stream;
   cubeb_stream_params input_params;
   cubeb_stream_params output_params;
   int r;
   user_state stream_state = { false };
--- a/media/libcubeb/tests/test_record.cpp
+++ b/media/libcubeb/tests/test_record.cpp
@@ -7,17 +7,16 @@
 
 /* libcubeb api/function test. Record the mic and check there is sound. */
 #ifdef NDEBUG
 #undef NDEBUG
 #endif
 #define _XOPEN_SOURCE 600
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <math.h>
 #include <assert.h>
 
 #include "cubeb/cubeb.h"
 #include "common.h"
 #ifdef CUBEB_GECKO_BUILD
 #include "TestHarness.h"
 #endif