Bug 1431221 - P13. Remove dual mono layout. r=padenot draft
authorJean-Yves Avenard <jyavenard@mozilla.com>
Wed, 31 Jan 2018 10:54:05 +0100
changeset 771695 20e077bf24bc02c3c7d8fcb4201cf0982a75b3c3
parent 771694 26a99d7fa047f65b696db0b8e5e3bf6a0b05206c
child 771696 f07405a56cadc2fd1ee875bcbf6427752b2f1451
push id103752
push userbmo:jyavenard@mozilla.com
push dateFri, 23 Mar 2018 17:52:32 +0000
reviewerspadenot
bugs1431221
milestone61.0a1
Bug 1431221 - P13. Remove dual mono layout. r=padenot It makes no sense to have a case for those as the data structure used (a bitmask) do not allow to represent this channel layout (a channel can only be present once). As such it was a non-functional layout MozReview-Commit-ID: FjA0fojFcJp
dom/media/CubebUtils.cpp
--- a/dom/media/CubebUtils.cpp
+++ b/dom/media/CubebUtils.cpp
@@ -167,18 +167,16 @@ const int CUBEB_BACKEND_UNKNOWN = CUBEB_
 typedef struct {
   const char* name;
   const unsigned int channels;
   const uint32_t mask;
 } layoutInfo;
 
 const layoutInfo kLayoutInfos[CUBEB_LAYOUT_MAX] = {
   { "undefined",      0, 0 },               // CUBEB_LAYOUT_UNDEFINED
-  { "dual mono",      2, MASK_STEREO },     // CUBEB_LAYOUT_DUAL_MONO
-  { "dual mono lfe",  3, MASK_STEREO_LFE }, // CUBEB_LAYOUT_DUAL_MONO_LFE
   { "mono",           1, MASK_MONO },       // CUBEB_LAYOUT_MONO
   { "mono lfe",       2, MASK_MONO_LFE },   // CUBEB_LAYOUT_MONO_LFE
   { "stereo",         2, MASK_STEREO },     // CUBEB_LAYOUT_STEREO
   { "stereo lfe",     3, MASK_STEREO_LFE }, // CUBEB_LAYOUT_STEREO_LFE
   { "3f",             3, MASK_3F },         // CUBEB_LAYOUT_3F
   { "3f lfe",         4, MASK_3F_LFE },     // CUBEB_LAYOUT_3F_LFE
   { "2f1",            3, MASK_2F1 },        // CUBEB_LAYOUT_2F1
   { "2f1 lfe",        4, MASK_2F1_LFE },    // CUBEB_LAYOUT_2F1_LFE