Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(116)

Side by Side Diff: webrtc/modules/audio_coding/acm2/audio_coding_module_impl.h

Issue 1853183002: Change NetEq::GetPlayoutTimestamp to return an rtc::Optional<uint32_t> (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Adding back the old PlayoutTimestamp method, now DEPRECATED Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
150 150
151 // Minimum playout delay. 151 // Minimum playout delay.
152 int SetMinimumPlayoutDelay(int time_ms) override; 152 int SetMinimumPlayoutDelay(int time_ms) override;
153 153
154 // Maximum playout delay. 154 // Maximum playout delay.
155 int SetMaximumPlayoutDelay(int time_ms) override; 155 int SetMaximumPlayoutDelay(int time_ms) override;
156 156
157 // Smallest latency NetEq will maintain. 157 // Smallest latency NetEq will maintain.
158 int LeastRequiredDelayMs() const override; 158 int LeastRequiredDelayMs() const override;
159 159
160 // Get playout timestamp. 160 RTC_DEPRECATED int32_t PlayoutTimestamp(uint32_t* timestamp) override;
161 int PlayoutTimestamp(uint32_t* timestamp) override; 161
162 rtc::Optional<uint32_t> PlayoutTimestamp() override;
162 163
163 // Get 10 milliseconds of raw audio data to play out, and 164 // Get 10 milliseconds of raw audio data to play out, and
164 // automatic resample to the requested frequency if > 0. 165 // automatic resample to the requested frequency if > 0.
165 int PlayoutData10Ms(int desired_freq_hz, AudioFrame* audio_frame) override; 166 int PlayoutData10Ms(int desired_freq_hz, AudioFrame* audio_frame) override;
166 167
167 ///////////////////////////////////////// 168 /////////////////////////////////////////
168 // Statistics 169 // Statistics
169 // 170 //
170 171
171 int GetNetworkStatistics(NetworkStatistics* statistics) override; 172 int GetNetworkStatistics(NetworkStatistics* statistics) override;
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 rtc::CriticalSection callback_crit_sect_; 293 rtc::CriticalSection callback_crit_sect_;
293 AudioPacketizationCallback* packetization_callback_ 294 AudioPacketizationCallback* packetization_callback_
294 GUARDED_BY(callback_crit_sect_); 295 GUARDED_BY(callback_crit_sect_);
295 ACMVADCallback* vad_callback_ GUARDED_BY(callback_crit_sect_); 296 ACMVADCallback* vad_callback_ GUARDED_BY(callback_crit_sect_);
296 }; 297 };
297 298
298 } // namespace acm2 299 } // namespace acm2
299 } // namespace webrtc 300 } // namespace webrtc
300 301
301 #endif // WEBRTC_MODULES_AUDIO_CODING_ACM2_AUDIO_CODING_MODULE_IMPL_H_ 302 #endif // WEBRTC_MODULES_AUDIO_CODING_ACM2_AUDIO_CODING_MODULE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698