| 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 |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 // Maximum playout delay. | 150 // Maximum playout delay. |
| 151 int SetMaximumPlayoutDelay(int time_ms) override; | 151 int SetMaximumPlayoutDelay(int time_ms) override; |
| 152 | 152 |
| 153 // Smallest latency NetEq will maintain. | 153 // Smallest latency NetEq will maintain. |
| 154 int LeastRequiredDelayMs() const override; | 154 int LeastRequiredDelayMs() const override; |
| 155 | 155 |
| 156 RTC_DEPRECATED int32_t PlayoutTimestamp(uint32_t* timestamp) override; | 156 RTC_DEPRECATED int32_t PlayoutTimestamp(uint32_t* timestamp) override; |
| 157 | 157 |
| 158 rtc::Optional<uint32_t> PlayoutTimestamp() override; | 158 rtc::Optional<uint32_t> PlayoutTimestamp() override; |
| 159 | 159 |
| 160 int FilteredCurrentDelayMs() const override; |
| 161 |
| 160 // Get 10 milliseconds of raw audio data to play out, and | 162 // Get 10 milliseconds of raw audio data to play out, and |
| 161 // automatic resample to the requested frequency if > 0. | 163 // automatic resample to the requested frequency if > 0. |
| 162 int PlayoutData10Ms(int desired_freq_hz, | 164 int PlayoutData10Ms(int desired_freq_hz, |
| 163 AudioFrame* audio_frame, | 165 AudioFrame* audio_frame, |
| 164 bool* muted) override; | 166 bool* muted) override; |
| 165 int PlayoutData10Ms(int desired_freq_hz, AudioFrame* audio_frame) override; | 167 int PlayoutData10Ms(int desired_freq_hz, AudioFrame* audio_frame) override; |
| 166 | 168 |
| 167 ///////////////////////////////////////// | 169 ///////////////////////////////////////// |
| 168 // Statistics | 170 // Statistics |
| 169 // | 171 // |
| (...skipping 1024 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1194 if (!ts) | 1196 if (!ts) |
| 1195 return -1; | 1197 return -1; |
| 1196 *timestamp = *ts; | 1198 *timestamp = *ts; |
| 1197 return 0; | 1199 return 0; |
| 1198 } | 1200 } |
| 1199 | 1201 |
| 1200 rtc::Optional<uint32_t> AudioCodingModuleImpl::PlayoutTimestamp() { | 1202 rtc::Optional<uint32_t> AudioCodingModuleImpl::PlayoutTimestamp() { |
| 1201 return receiver_.GetPlayoutTimestamp(); | 1203 return receiver_.GetPlayoutTimestamp(); |
| 1202 } | 1204 } |
| 1203 | 1205 |
| 1206 int AudioCodingModuleImpl::FilteredCurrentDelayMs() const { |
| 1207 return receiver_.FilteredCurrentDelayMs(); |
| 1208 } |
| 1209 |
| 1204 bool AudioCodingModuleImpl::HaveValidEncoder(const char* caller_name) const { | 1210 bool AudioCodingModuleImpl::HaveValidEncoder(const char* caller_name) const { |
| 1205 if (!encoder_stack_) { | 1211 if (!encoder_stack_) { |
| 1206 WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceAudioCoding, id_, | 1212 WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceAudioCoding, id_, |
| 1207 "%s failed: No send codec is registered.", caller_name); | 1213 "%s failed: No send codec is registered.", caller_name); |
| 1208 return false; | 1214 return false; |
| 1209 } | 1215 } |
| 1210 return true; | 1216 return true; |
| 1211 } | 1217 } |
| 1212 | 1218 |
| 1213 int AudioCodingModuleImpl::UnregisterReceiveCodec(uint8_t payload_type) { | 1219 int AudioCodingModuleImpl::UnregisterReceiveCodec(uint8_t payload_type) { |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1317 // Checks the validity of the parameters of the given codec | 1323 // Checks the validity of the parameters of the given codec |
| 1318 bool AudioCodingModule::IsCodecValid(const CodecInst& codec) { | 1324 bool AudioCodingModule::IsCodecValid(const CodecInst& codec) { |
| 1319 bool valid = acm2::RentACodec::IsCodecValid(codec); | 1325 bool valid = acm2::RentACodec::IsCodecValid(codec); |
| 1320 if (!valid) | 1326 if (!valid) |
| 1321 WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceAudioCoding, -1, | 1327 WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceAudioCoding, -1, |
| 1322 "Invalid codec setting"); | 1328 "Invalid codec setting"); |
| 1323 return valid; | 1329 return valid; |
| 1324 } | 1330 } |
| 1325 | 1331 |
| 1326 } // namespace webrtc | 1332 } // namespace webrtc |
| OLD | NEW |