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

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

Issue 2984473002: Move total audio energy and duration tracking to AudioLevel and protect with existing critial secti… (Closed)
Patch Set: rebase Created 3 years, 5 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 | « webrtc/voice_engine/audio_level.cc ('k') | 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
(...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 std::unique_ptr<RTPPayloadRegistry> rtp_payload_registry_; 467 std::unique_ptr<RTPPayloadRegistry> rtp_payload_registry_;
468 std::unique_ptr<ReceiveStatistics> rtp_receive_statistics_; 468 std::unique_ptr<ReceiveStatistics> rtp_receive_statistics_;
469 std::unique_ptr<RtpReceiver> rtp_receiver_; 469 std::unique_ptr<RtpReceiver> rtp_receiver_;
470 TelephoneEventHandler* telephone_event_handler_; 470 TelephoneEventHandler* telephone_event_handler_;
471 std::unique_ptr<RtpRtcp> _rtpRtcpModule; 471 std::unique_ptr<RtpRtcp> _rtpRtcpModule;
472 std::unique_ptr<AudioCodingModule> audio_coding_; 472 std::unique_ptr<AudioCodingModule> audio_coding_;
473 acm2::CodecManager codec_manager_; 473 acm2::CodecManager codec_manager_;
474 acm2::RentACodec rent_a_codec_; 474 acm2::RentACodec rent_a_codec_;
475 std::unique_ptr<AudioSinkInterface> audio_sink_; 475 std::unique_ptr<AudioSinkInterface> audio_sink_;
476 AudioLevel _outputAudioLevel; 476 AudioLevel _outputAudioLevel;
477 double totalOutputEnergy_ = 0.0;
478 double totalOutputDuration_ = 0.0;
479 bool _externalTransport; 477 bool _externalTransport;
480 // Downsamples to the codec rate if necessary. 478 // Downsamples to the codec rate if necessary.
481 PushResampler<int16_t> input_resampler_; 479 PushResampler<int16_t> input_resampler_;
482 std::unique_ptr<FilePlayer> input_file_player_; 480 std::unique_ptr<FilePlayer> input_file_player_;
483 std::unique_ptr<FilePlayer> output_file_player_; 481 std::unique_ptr<FilePlayer> output_file_player_;
484 std::unique_ptr<FileRecorder> output_file_recorder_; 482 std::unique_ptr<FileRecorder> output_file_recorder_;
485 int _inputFilePlayerId; 483 int _inputFilePlayerId;
486 int _outputFilePlayerId; 484 int _outputFilePlayerId;
487 int _outputFileRecorderId; 485 int _outputFileRecorderId;
488 bool _outputFileRecording; 486 bool _outputFileRecording;
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
559 557
560 bool encoder_queue_is_active_ GUARDED_BY(encoder_queue_lock_) = false; 558 bool encoder_queue_is_active_ GUARDED_BY(encoder_queue_lock_) = false;
561 559
562 rtc::TaskQueue* encoder_queue_ = nullptr; 560 rtc::TaskQueue* encoder_queue_ = nullptr;
563 }; 561 };
564 562
565 } // namespace voe 563 } // namespace voe
566 } // namespace webrtc 564 } // namespace webrtc
567 565
568 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_ 566 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_
OLDNEW
« no previous file with comments | « webrtc/voice_engine/audio_level.cc ('k') | webrtc/voice_engine/channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698