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

Side by Side Diff: webrtc/modules/audio_coding/acm2/acm_receiver.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) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 // Return value : 0 if OK. 188 // Return value : 0 if OK.
189 // -1 if an error occurred. 189 // -1 if an error occurred.
190 // 190 //
191 int RemoveCodec(uint8_t payload_type); 191 int RemoveCodec(uint8_t payload_type);
192 192
193 // 193 //
194 // Remove all registered codecs. 194 // Remove all registered codecs.
195 // 195 //
196 int RemoveAllCodecs(); 196 int RemoveAllCodecs();
197 197
198 // 198 // Returns the RTP timestamp for the last sample delivered by GetAudio().
199 // Gets the RTP timestamp of the last sample delivered by GetAudio(). 199 // The return value will be empty if no valid timestamp is available.
200 // Returns true if the RTP timestamp is valid, otherwise false. 200 rtc::Optional<uint32_t> GetPlayoutTimestamp();
201 //
202 bool GetPlayoutTimestamp(uint32_t* timestamp);
203 201
204 // 202 //
205 // Get the audio codec associated with the last non-CNG/non-DTMF received 203 // Get the audio codec associated with the last non-CNG/non-DTMF received
206 // payload. If no non-CNG/non-DTMF packet is received -1 is returned, 204 // payload. If no non-CNG/non-DTMF packet is received -1 is returned,
207 // otherwise return 0. 205 // otherwise return 0.
208 // 206 //
209 int LastAudioCodec(CodecInst* codec) const; 207 int LastAudioCodec(CodecInst* codec) const;
210 208
211 // 209 //
212 // Get a decoder given its registered payload-type. 210 // Get a decoder given its registered payload-type.
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 Clock* clock_; // TODO(henrik.lundin) Make const if possible. 270 Clock* clock_; // TODO(henrik.lundin) Make const if possible.
273 bool resampled_last_output_frame_ GUARDED_BY(crit_sect_); 271 bool resampled_last_output_frame_ GUARDED_BY(crit_sect_);
274 rtc::Optional<int> last_packet_sample_rate_hz_ GUARDED_BY(crit_sect_); 272 rtc::Optional<int> last_packet_sample_rate_hz_ GUARDED_BY(crit_sect_);
275 }; 273 };
276 274
277 } // namespace acm2 275 } // namespace acm2
278 276
279 } // namespace webrtc 277 } // namespace webrtc
280 278
281 #endif // WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_RECEIVER_H_ 279 #endif // WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_RECEIVER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698