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

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

Issue 2987763003: Make ~webrtc::AudioSendStream public, and s/config()/GetConfig(), as well as make public. (Closed)
Patch Set: 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
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
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 rtc::TaskQueue* worker_queue, 44 rtc::TaskQueue* worker_queue,
45 RtpTransportControllerSendInterface* transport, 45 RtpTransportControllerSendInterface* transport,
46 BitrateAllocator* bitrate_allocator, 46 BitrateAllocator* bitrate_allocator,
47 RtcEventLog* event_log, 47 RtcEventLog* event_log,
48 RtcpRttStats* rtcp_rtt_stats, 48 RtcpRttStats* rtcp_rtt_stats,
49 const rtc::Optional<RtpState>& suspended_rtp_state); 49 const rtc::Optional<RtpState>& suspended_rtp_state);
50 ~AudioSendStream() override; 50 ~AudioSendStream() override;
51 51
52 // webrtc::AudioSendStream implementation. 52 // webrtc::AudioSendStream implementation.
53 void Reconfigure(const webrtc::AudioSendStream::Config& config) override; 53 void Reconfigure(const webrtc::AudioSendStream::Config& config) override;
54 const webrtc::AudioSendStream::Config& GetConfig() const override;
eladalon 2017/07/25 13:35:59 I'm not going to move this in the .cc file, though
55 RtpState GetRtpState() const override;
56 const TimeInterval& GetActiveLifetime() const override;
54 57
55 void Start() override; 58 void Start() override;
56 void Stop() override; 59 void Stop() override;
57 bool SendTelephoneEvent(int payload_type, int payload_frequency, int event, 60 bool SendTelephoneEvent(int payload_type, int payload_frequency, int event,
58 int duration_ms) override; 61 int duration_ms) override;
59 void SetMuted(bool muted) override; 62 void SetMuted(bool muted) override;
60 webrtc::AudioSendStream::Stats GetStats() const override; 63 webrtc::AudioSendStream::Stats GetStats() const override;
61 64
62 void SignalNetworkState(NetworkState state); 65 void SignalNetworkState(NetworkState state);
63 bool DeliverRtcp(const uint8_t* packet, size_t length); 66 bool DeliverRtcp(const uint8_t* packet, size_t length);
64 67
65 // Implements BitrateAllocatorObserver. 68 // Implements BitrateAllocatorObserver.
66 uint32_t OnBitrateUpdated(uint32_t bitrate_bps, 69 uint32_t OnBitrateUpdated(uint32_t bitrate_bps,
67 uint8_t fraction_loss, 70 uint8_t fraction_loss,
68 int64_t rtt, 71 int64_t rtt,
69 int64_t bwe_period_ms) override; 72 int64_t bwe_period_ms) override;
70 73
71 // From PacketFeedbackObserver. 74 // From PacketFeedbackObserver.
72 void OnPacketAdded(uint32_t ssrc, uint16_t seq_num) override; 75 void OnPacketAdded(uint32_t ssrc, uint16_t seq_num) override;
73 void OnPacketFeedbackVector( 76 void OnPacketFeedbackVector(
74 const std::vector<PacketFeedback>& packet_feedback_vector) override; 77 const std::vector<PacketFeedback>& packet_feedback_vector) override;
75 78
76 const webrtc::AudioSendStream::Config& config() const;
77 void SetTransportOverhead(int transport_overhead_per_packet); 79 void SetTransportOverhead(int transport_overhead_per_packet);
78 80
79 RtpState GetRtpState() const;
80 const TimeInterval& GetActiveLifetime() const;
81
82 private: 81 private:
83 class TimedTransport; 82 class TimedTransport;
84 83
85 VoiceEngine* voice_engine() const; 84 VoiceEngine* voice_engine() const;
86 85
87 // These are all static to make it less likely that (the old) config_ is 86 // These are all static to make it less likely that (the old) config_ is
88 // accessed unintentionally. 87 // accessed unintentionally.
89 static void ConfigureStream(AudioSendStream* stream, 88 static void ConfigureStream(AudioSendStream* stream,
90 const Config& new_config, 89 const Config& new_config,
91 bool first_time); 90 bool first_time);
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 122
124 std::unique_ptr<TimedTransport> timed_send_transport_adapter_; 123 std::unique_ptr<TimedTransport> timed_send_transport_adapter_;
125 TimeInterval active_lifetime_; 124 TimeInterval active_lifetime_;
126 125
127 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AudioSendStream); 126 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AudioSendStream);
128 }; 127 };
129 } // namespace internal 128 } // namespace internal
130 } // namespace webrtc 129 } // namespace webrtc
131 130
132 #endif // WEBRTC_AUDIO_AUDIO_SEND_STREAM_H_ 131 #endif // WEBRTC_AUDIO_AUDIO_SEND_STREAM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698