| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 // MSVC++ requires this to be set before any other includes to get M_SQRT1_2. | 5 // MSVC++ requires this to be set before any other includes to get M_SQRT1_2. |
| 6 #define _USE_MATH_DEFINES | 6 #define _USE_MATH_DEFINES |
| 7 | 7 |
| 8 #include "media/base/channel_mixing_matrix.h" | 8 #include "media/base/channel_mixing_matrix.h" |
| 9 | 9 |
| 10 #include <stddef.h> |
| 11 |
| 10 #include <algorithm> | 12 #include <algorithm> |
| 11 #include <cmath> | 13 #include <cmath> |
| 12 | 14 |
| 13 #include "base/logging.h" | 15 #include "base/logging.h" |
| 14 | 16 |
| 15 namespace media { | 17 namespace media { |
| 16 | 18 |
| 17 // Default scale factor for mixing two channels together. We use a different | 19 // Default scale factor for mixing two channels together. We use a different |
| 18 // value for stereo -> mono and mono -> stereo mixes. | 20 // value for stereo -> mono and mono -> stereo mixes. |
| 19 static const float kEqualPowerScale = static_cast<float>(M_SQRT1_2); | 21 static const float kEqualPowerScale = static_cast<float>(M_SQRT1_2); |
| (...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 295 | 297 |
| 296 DCHECK(IsUnaccounted(input_ch)); | 298 DCHECK(IsUnaccounted(input_ch)); |
| 297 DCHECK_GE(input_ch_index, 0); | 299 DCHECK_GE(input_ch_index, 0); |
| 298 DCHECK_GE(output_ch_index, 0); | 300 DCHECK_GE(output_ch_index, 0); |
| 299 | 301 |
| 300 DCHECK_EQ((*matrix_)[output_ch_index][input_ch_index], 0); | 302 DCHECK_EQ((*matrix_)[output_ch_index][input_ch_index], 0); |
| 301 (*matrix_)[output_ch_index][input_ch_index] = scale; | 303 (*matrix_)[output_ch_index][input_ch_index] = scale; |
| 302 } | 304 } |
| 303 | 305 |
| 304 } // namespace media | 306 } // namespace media |
| OLD | NEW |