commit 6a74b411ec7fc864a62b179c1e4727176446773b
author Jean-Marc Valin <jmvalin@jmvalin.ca> Fri Jun 15 16:52:14 2018 -0400
committer Jean-Marc Valin <jmvalin@jmvalin.ca> Wed Jul 25 22:41:14 2018 -0400
tree bff5ab2e4dce1173b55904aa255701ba701e8f4d
parent 1827db6a601e02729475c4618500f49f8b0cbefa

Use ambisonics families 2 and 3 instead of 254 and 253

src/opus_multistream_encoder.c

diff --git a/src/opus_multistream_encoder.c b/src/opus_multistream_encoder.c
index aa48a61..09a84b2 100644
--- a/src/opus_multistream_encoder.c
+++ b/src/opus_multistream_encoder.c
@@ -415,7 +415,7 @@
       nb_streams=channels;
       nb_coupled_streams=0;
 #ifdef ENABLE_EXPERIMENTAL_AMBISONICS
-   } else if (mapping_family==254)
+   } else if (mapping_family==2)
    {
       if (!validate_ambisonics(channels, &nb_streams, &nb_coupled_streams))
          return 0;
@@ -563,7 +563,7 @@
       for(i=0;i<channels;i++)
          mapping[i] = i;
 #ifdef ENABLE_EXPERIMENTAL_AMBISONICS
-   } else if (mapping_family==254)
+   } else if (mapping_family==2)
    {
       int i;
       if (!validate_ambisonics(channels, streams, coupled_streams))
@@ -579,7 +579,7 @@
    if (channels>2 && mapping_family==1) {
       mapping_type = MAPPING_TYPE_SURROUND;
 #ifdef ENABLE_EXPERIMENTAL_AMBISONICS
-   } else if (mapping_family==254)
+   } else if (mapping_family==2)
    {
       mapping_type = MAPPING_TYPE_AMBISONICS;
 #endif

src/opus_projection_encoder.c

diff --git a/src/opus_projection_encoder.c b/src/opus_projection_encoder.c
index 8309e4b..5dfb4cf 100644
--- a/src/opus_projection_encoder.c
+++ b/src/opus_projection_encoder.c
@@ -104,7 +104,7 @@
                                      int *streams, int *coupled_streams,
                                      int *order_plus_one)
 {
-  if (mapping_family == 253)
+  if (mapping_family == 3)
   {
     if (get_order_plus_one_from_channels(channels, order_plus_one) != OPUS_OK)
       return OPUS_BAD_ARG;
@@ -222,7 +222,7 @@
     coupled_streams, &order_plus_one) != OPUS_OK)
     return OPUS_BAD_ARG;
 
-  if (mapping_family == 253)
+  if (mapping_family == 3)
   {
     /* Assign mixing matrix based on available pre-computed matrices. */
     mixing_matrix = get_mixing_matrix(st);