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

Side by Side Diff: webrtc/voice_engine/channel.h

Issue 1857183002: VoE: Handle empty playout timestamp differently (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@neteq-playout-timestamp-optional
Patch Set: Fixing a comment 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
« no previous file with comments | « no previous file | webrtc/voice_engine/channel.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
11 #ifndef WEBRTC_VOICE_ENGINE_CHANNEL_H_ 11 #ifndef WEBRTC_VOICE_ENGINE_CHANNEL_H_
12 #define WEBRTC_VOICE_ENGINE_CHANNEL_H_ 12 #define WEBRTC_VOICE_ENGINE_CHANNEL_H_
13 13
14 #include <memory> 14 #include <memory>
15 15
16 #include "webrtc/audio_sink.h" 16 #include "webrtc/audio_sink.h"
17 #include "webrtc/base/criticalsection.h" 17 #include "webrtc/base/criticalsection.h"
18 #include "webrtc/base/optional.h"
18 #include "webrtc/common_audio/resampler/include/push_resampler.h" 19 #include "webrtc/common_audio/resampler/include/push_resampler.h"
19 #include "webrtc/common_types.h" 20 #include "webrtc/common_types.h"
20 #include "webrtc/modules/audio_coding/include/audio_coding_module.h" 21 #include "webrtc/modules/audio_coding/include/audio_coding_module.h"
21 #include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_d efines.h" 22 #include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_d efines.h"
22 #include "webrtc/modules/audio_processing/rms_level.h" 23 #include "webrtc/modules/audio_processing/rms_level.h"
23 #include "webrtc/modules/rtp_rtcp/include/remote_ntp_time_estimator.h" 24 #include "webrtc/modules/rtp_rtcp/include/remote_ntp_time_estimator.h"
24 #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" 25 #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
25 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" 26 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
26 #include "webrtc/modules/utility/include/file_player.h" 27 #include "webrtc/modules/utility/include/file_player.h"
27 #include "webrtc/modules/utility/include/file_recorder.h" 28 #include "webrtc/modules/utility/include/file_recorder.h"
(...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after
494 int _outputFileRecorderId; 495 int _outputFileRecorderId;
495 bool _outputFileRecording; 496 bool _outputFileRecording;
496 bool _outputExternalMedia; 497 bool _outputExternalMedia;
497 VoEMediaProcess* _inputExternalMediaCallbackPtr; 498 VoEMediaProcess* _inputExternalMediaCallbackPtr;
498 VoEMediaProcess* _outputExternalMediaCallbackPtr; 499 VoEMediaProcess* _outputExternalMediaCallbackPtr;
499 uint32_t _timeStamp; 500 uint32_t _timeStamp;
500 501
501 RemoteNtpTimeEstimator ntp_estimator_ GUARDED_BY(ts_stats_lock_); 502 RemoteNtpTimeEstimator ntp_estimator_ GUARDED_BY(ts_stats_lock_);
502 503
503 // Timestamp of the audio pulled from NetEq. 504 // Timestamp of the audio pulled from NetEq.
504 uint32_t jitter_buffer_playout_timestamp_; 505 rtc::Optional<uint32_t> jitter_buffer_playout_timestamp_;
505 uint32_t playout_timestamp_rtp_ GUARDED_BY(video_sync_lock_); 506 uint32_t playout_timestamp_rtp_ GUARDED_BY(video_sync_lock_);
506 uint32_t playout_timestamp_rtcp_; 507 uint32_t playout_timestamp_rtcp_;
507 uint32_t playout_delay_ms_ GUARDED_BY(video_sync_lock_); 508 uint32_t playout_delay_ms_ GUARDED_BY(video_sync_lock_);
508 uint32_t _numberOfDiscardedPackets; 509 uint32_t _numberOfDiscardedPackets;
509 uint16_t send_sequence_number_; 510 uint16_t send_sequence_number_;
510 uint8_t restored_packet_[kVoiceEngineMaxIpPacketSizeBytes]; 511 uint8_t restored_packet_[kVoiceEngineMaxIpPacketSizeBytes];
511 512
512 rtc::CriticalSection ts_stats_lock_; 513 rtc::CriticalSection ts_stats_lock_;
513 514
514 std::unique_ptr<rtc::TimestampWrapAroundHandler> rtp_ts_wraparound_handler_; 515 std::unique_ptr<rtc::TimestampWrapAroundHandler> rtp_ts_wraparound_handler_;
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
568 PacketRouter* packet_router_ = nullptr; 569 PacketRouter* packet_router_ = nullptr;
569 std::unique_ptr<TransportFeedbackProxy> feedback_observer_proxy_; 570 std::unique_ptr<TransportFeedbackProxy> feedback_observer_proxy_;
570 std::unique_ptr<TransportSequenceNumberProxy> seq_num_allocator_proxy_; 571 std::unique_ptr<TransportSequenceNumberProxy> seq_num_allocator_proxy_;
571 std::unique_ptr<RtpPacketSenderProxy> rtp_packet_sender_proxy_; 572 std::unique_ptr<RtpPacketSenderProxy> rtp_packet_sender_proxy_;
572 }; 573 };
573 574
574 } // namespace voe 575 } // namespace voe
575 } // namespace webrtc 576 } // namespace webrtc
576 577
577 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_ 578 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/voice_engine/channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698