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

Side by Side Diff: webrtc/audio/audio_receive_stream.h

Issue 2663063008: Remove unnecessary RTPHeaderParser, following https://codereview.webrtc.org/2659563002/ (Closed)
Patch Set: remove unrelated change Created 3 years, 10 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/audio/audio_receive_stream.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) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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_AUDIO_AUDIO_RECEIVE_STREAM_H_ 11 #ifndef WEBRTC_AUDIO_AUDIO_RECEIVE_STREAM_H_
12 #define WEBRTC_AUDIO_AUDIO_RECEIVE_STREAM_H_ 12 #define WEBRTC_AUDIO_AUDIO_RECEIVE_STREAM_H_
13 13
14 #include <memory> 14 #include <memory>
15 15
16 #include "webrtc/api/audio/audio_mixer.h" 16 #include "webrtc/api/audio/audio_mixer.h"
17 #include "webrtc/audio/audio_state.h" 17 #include "webrtc/audio/audio_state.h"
18 #include "webrtc/base/constructormagic.h" 18 #include "webrtc/base/constructormagic.h"
19 #include "webrtc/base/thread_checker.h" 19 #include "webrtc/base/thread_checker.h"
20 #include "webrtc/call/audio_receive_stream.h" 20 #include "webrtc/call/audio_receive_stream.h"
21 #include "webrtc/call/syncable.h" 21 #include "webrtc/call/syncable.h"
22 #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
23 22
24 namespace webrtc { 23 namespace webrtc {
25 class PacketRouter; 24 class PacketRouter;
26 class RemoteBitrateEstimator; 25 class RemoteBitrateEstimator;
27 class RtcEventLog; 26 class RtcEventLog;
28 27
29 namespace voe { 28 namespace voe {
30 class ChannelProxy; 29 class ChannelProxy;
31 } // namespace voe 30 } // namespace voe
32 31
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 private: 73 private:
75 VoiceEngine* voice_engine() const; 74 VoiceEngine* voice_engine() const;
76 AudioState* audio_state() const; 75 AudioState* audio_state() const;
77 int SetVoiceEnginePlayout(bool playout); 76 int SetVoiceEnginePlayout(bool playout);
78 77
79 rtc::ThreadChecker worker_thread_checker_; 78 rtc::ThreadChecker worker_thread_checker_;
80 rtc::ThreadChecker module_process_thread_checker_; 79 rtc::ThreadChecker module_process_thread_checker_;
81 RemoteBitrateEstimator* const remote_bitrate_estimator_; 80 RemoteBitrateEstimator* const remote_bitrate_estimator_;
82 const webrtc::AudioReceiveStream::Config config_; 81 const webrtc::AudioReceiveStream::Config config_;
83 rtc::scoped_refptr<webrtc::AudioState> audio_state_; 82 rtc::scoped_refptr<webrtc::AudioState> audio_state_;
84 std::unique_ptr<RtpHeaderParser> rtp_header_parser_;
85 std::unique_ptr<voe::ChannelProxy> channel_proxy_; 83 std::unique_ptr<voe::ChannelProxy> channel_proxy_;
86 84
87 bool playing_ ACCESS_ON(worker_thread_checker_) = false; 85 bool playing_ ACCESS_ON(worker_thread_checker_) = false;
88 86
89 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AudioReceiveStream); 87 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AudioReceiveStream);
90 }; 88 };
91 } // namespace internal 89 } // namespace internal
92 } // namespace webrtc 90 } // namespace webrtc
93 91
94 #endif // WEBRTC_AUDIO_AUDIO_RECEIVE_STREAM_H_ 92 #endif // WEBRTC_AUDIO_AUDIO_RECEIVE_STREAM_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/audio/audio_receive_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698