diff options
| author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2018-06-15 23:52:14 +0300 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2018-07-26 05:41:14 +0300 |
| commit | 6a74b411ec7fc864a62b179c1e4727176446773b (patch) | |
| tree | bff5ab2e4dce1173b55904aa255701ba701e8f4d /src | |
| parent | 1827db6a601e02729475c4618500f49f8b0cbefa (diff) | |
Use ambisonics families 2 and 3 instead of 254 and 253
Diffstat (limited to 'src')
| -rw-r--r-- | src/opus_multistream_encoder.c | 6 | ||||
| -rw-r--r-- | src/opus_projection_encoder.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/opus_multistream_encoder.c b/src/opus_multistream_encoder.c index aa48a61b..09a84b2e 100644 --- a/src/opus_multistream_encoder.c +++ b/src/opus_multistream_encoder.c @@ -415,7 +415,7 @@ opus_int32 opus_multistream_surround_encoder_get_size(int channels, int mapping_ 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 @@ int opus_multistream_surround_encoder_init( 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 @@ int opus_multistream_surround_encoder_init( 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 diff --git a/src/opus_projection_encoder.c b/src/opus_projection_encoder.c index 8309e4b5..5dfb4cfd 100644 --- a/src/opus_projection_encoder.c +++ b/src/opus_projection_encoder.c @@ -104,7 +104,7 @@ static int get_streams_from_channels(int channels, int mapping_family, 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 @@ int opus_projection_ambisonics_encoder_init(OpusProjectionEncoder *st, opus_int3 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); |