Bug 1448883 - Resync with cubeb 7401fc25a9d. r?padenot draft
authorJean-Yves Avenard <jyavenard@mozilla.com>
Mon, 26 Mar 2018 18:07:10 +0200
changeset 772604 18d40df4f7b154ce10b95250790388f3c1c54009
parent 772574 7b9da7139d94951431a148dcaf8a388640c91b27
child 773034 f87223987b9d6c75de91b40de989d659fae9c8a4
push id103982
push userbmo:jyavenard@mozilla.com
push dateMon, 26 Mar 2018 16:07:42 +0000
reviewerspadenot
bugs1448883
milestone61.0a1
Bug 1448883 - Resync with cubeb 7401fc25a9d. r?padenot MozReview-Commit-ID: 1Lg0fpsSa10
media/libcubeb/README_MOZILLA
media/libcubeb/src/cubeb.c
--- 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 7712aaabfa140e8c7fe890e3f5f65dfe3fe58632 (2018-03-25 11:30:38 +0200)
+The git commit ID used was 7401fc25a9d87ed57d49648883e3e5658305c1cb (2018-03-26 16:54:01 +0200)
--- a/media/libcubeb/src/cubeb.c
+++ b/media/libcubeb/src/cubeb.c
@@ -63,17 +63,17 @@ int kai_init(cubeb ** context, char cons
 
 static int
 validate_stream_params(cubeb_stream_params * input_stream_params,
                        cubeb_stream_params * output_stream_params)
 {
   XASSERT(input_stream_params || output_stream_params);
   if (output_stream_params) {
     if (output_stream_params->rate < 1000 || output_stream_params->rate > 192000 ||
-        output_stream_params->channels < 1 || output_stream_params->channels > 8) {
+        output_stream_params->channels < 1) {
       return CUBEB_ERROR_INVALID_FORMAT;
     }
   }
   if (input_stream_params) {
     if (input_stream_params->rate < 1000 || input_stream_params->rate > 192000 ||
         input_stream_params->channels < 1 || input_stream_params->channels > 8) {
       return CUBEB_ERROR_INVALID_FORMAT;
     }