| OLD | NEW | 
|   1 /* |   1 /* | 
|   2  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. |   2  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 
|   3  * |   3  * | 
|   4  *  Use of this source code is governed by a BSD-style license |   4  *  Use of this source code is governed by a BSD-style license | 
|   5  *  that can be found in the LICENSE file in the root of the source |   5  *  that can be found in the LICENSE file in the root of the source | 
|   6  *  tree. An additional intellectual property rights grant can be found |   6  *  tree. An additional intellectual property rights grant can be found | 
|   7  *  in the file PATENTS.  All contributing project authors may |   7  *  in the file PATENTS.  All contributing project authors may | 
|   8  *  be found in the AUTHORS file in the root of the source tree. |   8  *  be found in the AUTHORS file in the root of the source tree. | 
|   9  */ |   9  */ | 
|  10  |  10  | 
|  11 #include "webrtc/modules/audio_coding/acm2/acm_resampler.h" |  11 #include "webrtc/modules/audio_coding/acm2/acm_resampler.h" | 
|  12  |  12  | 
|  13 #include <assert.h> |  13 #include <assert.h> | 
|  14 #include <string.h> |  14 #include <string.h> | 
|  15  |  15  | 
|  16 #include "webrtc/common_audio/resampler/include/resampler.h" |  16 #include "webrtc/common_audio/resampler/include/resampler.h" | 
|  17 #include "webrtc/system_wrappers/include/logging.h" |  17 #include "webrtc/base/logging.h" | 
|  18  |  18  | 
|  19 namespace webrtc { |  19 namespace webrtc { | 
|  20 namespace acm2 { |  20 namespace acm2 { | 
|  21  |  21  | 
|  22 ACMResampler::ACMResampler() { |  22 ACMResampler::ACMResampler() { | 
|  23 } |  23 } | 
|  24  |  24  | 
|  25 ACMResampler::~ACMResampler() { |  25 ACMResampler::~ACMResampler() { | 
|  26 } |  26 } | 
|  27  |  27  | 
| (...skipping 26 matching lines...) Expand all  Loading... | 
|  54     LOG(LS_ERROR) << "Resample(" << in_audio << ", " << in_length << ", " |  54     LOG(LS_ERROR) << "Resample(" << in_audio << ", " << in_length << ", " | 
|  55                   << out_audio << ", " << out_capacity_samples << ") failed."; |  55                   << out_audio << ", " << out_capacity_samples << ") failed."; | 
|  56     return -1; |  56     return -1; | 
|  57   } |  57   } | 
|  58  |  58  | 
|  59   return static_cast<int>(out_length / num_audio_channels); |  59   return static_cast<int>(out_length / num_audio_channels); | 
|  60 } |  60 } | 
|  61  |  61  | 
|  62 }  // namespace acm2 |  62 }  // namespace acm2 | 
|  63 }  // namespace webrtc |  63 }  // namespace webrtc | 
| OLD | NEW |