Bug 1509875 - Update cubeb from upstream to e5c3a1d8a68c. r=padenot
authorJean-Yves Avenard <jyavenard@mozilla.com>
Tue, 04 Dec 2018 21:40:49 +0000
changeset 508646 fc0e006e1ee9538dd508fac725bea70a097450f4
parent 508645 4a88ba63269cb0460cf9dd658ed4298399d453fe
child 508647 b6fbf0a6d8f7dd01e5024a4f32aac6299a2d787f
push id1905
push userffxbld-merge
push dateMon, 21 Jan 2019 12:33:13 +0000
treeherdermozilla-release@c2fca1944d8c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerspadenot
bugs1509875
milestone65.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 1509875 - Update cubeb from upstream to e5c3a1d8a68c. r=padenot Differential Revision: https://phabricator.services.mozilla.com/D13755
media/libcubeb/moz.yaml
media/libcubeb/src/cubeb_mixer.cpp
--- a/media/libcubeb/moz.yaml
+++ b/media/libcubeb/moz.yaml
@@ -14,10 +14,10 @@ bugzilla:
 origin:
   name: "cubeb"
   description: "Cross platform audio library"
 
   url: "https://github.com/kinetiknz/cubeb"
   license: "ISC"
 
   # update.sh will update this value
-  release: "9a7a55153e7f9b9e0036ab023909c7bc4a41688b (2018-10-30 09:05:26 +1300)"
+  release: "e5c3a1d8a68c412177f768908b1d54550cf9d510-dirty (2018-11-29 18:20:54 +0100)"
 
--- a/media/libcubeb/src/cubeb_mixer.cpp
+++ b/media/libcubeb/src/cubeb_mixer.cpp
@@ -231,23 +231,18 @@ int MixerContext::auto_matrix()
   if (unaccounted & CHANNEL_BACK_CENTER) {
     if (out_ch_layout & CHANNEL_BACK_LEFT) {
       matrix[BACK_LEFT][BACK_CENTER] += M_SQRT1_2;
       matrix[BACK_RIGHT][BACK_CENTER] += M_SQRT1_2;
     } else if (out_ch_layout & CHANNEL_SIDE_LEFT) {
       matrix[SIDE_LEFT][BACK_CENTER] += M_SQRT1_2;
       matrix[SIDE_RIGHT][BACK_CENTER] += M_SQRT1_2;
     } else if (out_ch_layout & CHANNEL_FRONT_LEFT) {
-      if (unaccounted & (CHANNEL_BACK_LEFT | CHANNEL_SIDE_LEFT)) {
-        matrix[FRONT_LEFT][BACK_CENTER] -= _surround_mix_level * M_SQRT1_2;
-        matrix[FRONT_RIGHT][BACK_CENTER] += _surround_mix_level * M_SQRT1_2;
-      } else {
-        matrix[FRONT_LEFT][BACK_CENTER] -= _surround_mix_level;
-        matrix[FRONT_RIGHT][BACK_CENTER] += _surround_mix_level;
-      }
+      matrix[FRONT_LEFT][BACK_CENTER] += _surround_mix_level * M_SQRT1_2;
+      matrix[FRONT_RIGHT][BACK_CENTER] += _surround_mix_level * M_SQRT1_2;
     } else if (out_ch_layout & CHANNEL_FRONT_CENTER) {
       matrix[FRONT_CENTER][BACK_CENTER] +=
         _surround_mix_level * M_SQRT1_2;
     }
   }
   if (unaccounted & CHANNEL_BACK_LEFT) {
     if (out_ch_layout & CHANNEL_BACK_CENTER) {
       matrix[BACK_CENTER][BACK_LEFT] += M_SQRT1_2;
@@ -256,20 +251,18 @@ int MixerContext::auto_matrix()
       if (in_ch_layout & CHANNEL_SIDE_LEFT) {
         matrix[SIDE_LEFT][BACK_LEFT] += M_SQRT1_2;
         matrix[SIDE_RIGHT][BACK_RIGHT] += M_SQRT1_2;
       } else {
         matrix[SIDE_LEFT][BACK_LEFT] += 1.0;
         matrix[SIDE_RIGHT][BACK_RIGHT] += 1.0;
       }
     } else if (out_ch_layout & CHANNEL_FRONT_LEFT) {
-      matrix[FRONT_LEFT][BACK_LEFT] -= _surround_mix_level * M_SQRT1_2;
-      matrix[FRONT_LEFT][BACK_RIGHT] -= _surround_mix_level * M_SQRT1_2;
-      matrix[FRONT_RIGHT][BACK_LEFT] += _surround_mix_level * M_SQRT1_2;
-      matrix[FRONT_RIGHT][BACK_RIGHT] += _surround_mix_level * M_SQRT1_2;
+      matrix[FRONT_LEFT][BACK_LEFT] += _surround_mix_level;
+      matrix[FRONT_RIGHT][BACK_RIGHT] += _surround_mix_level;
     } else if (out_ch_layout & CHANNEL_FRONT_CENTER) {
       matrix[FRONT_CENTER][BACK_LEFT] += _surround_mix_level * M_SQRT1_2;
       matrix[FRONT_CENTER][BACK_RIGHT] += _surround_mix_level * M_SQRT1_2;
     }
   }
 
   if (unaccounted & CHANNEL_SIDE_LEFT) {
     if (out_ch_layout & CHANNEL_BACK_LEFT) {
@@ -281,20 +274,18 @@ int MixerContext::auto_matrix()
       } else {
         matrix[BACK_LEFT][SIDE_LEFT] += 1.0;
         matrix[BACK_RIGHT][SIDE_RIGHT] += 1.0;
       }
     } else if (out_ch_layout & CHANNEL_BACK_CENTER) {
       matrix[BACK_CENTER][SIDE_LEFT] += M_SQRT1_2;
       matrix[BACK_CENTER][SIDE_RIGHT] += M_SQRT1_2;
     } else if (out_ch_layout & CHANNEL_FRONT_LEFT) {
-      matrix[FRONT_LEFT][SIDE_LEFT] -= _surround_mix_level * M_SQRT1_2;
-      matrix[FRONT_LEFT][SIDE_RIGHT] -= _surround_mix_level * M_SQRT1_2;
-      matrix[FRONT_RIGHT][SIDE_LEFT] += _surround_mix_level * M_SQRT1_2;
-      matrix[FRONT_RIGHT][SIDE_RIGHT] += _surround_mix_level * M_SQRT1_2;
+      matrix[FRONT_LEFT][SIDE_LEFT] += _surround_mix_level;
+      matrix[FRONT_RIGHT][SIDE_RIGHT] += _surround_mix_level;
     } else if (out_ch_layout & CHANNEL_FRONT_CENTER) {
       matrix[FRONT_CENTER][SIDE_LEFT] += _surround_mix_level * M_SQRT1_2;
       matrix[FRONT_CENTER][SIDE_RIGHT] += _surround_mix_level * M_SQRT1_2;
     }
   }
 
   if (unaccounted & CHANNEL_FRONT_LEFT_OF_CENTER) {
     if (out_ch_layout & CHANNEL_FRONT_LEFT) {