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

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

Issue 2405183002: Moving WebRtcVoiceMediaChannel::SendSetCodec to AudioSendStream. (Closed)
Patch Set: working version Created 4 years, 2 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
11 #ifndef WEBRTC_AUDIO_AUDIO_SEND_STREAM_H_ 11 #ifndef WEBRTC_AUDIO_AUDIO_SEND_STREAM_H_
12 #define WEBRTC_AUDIO_AUDIO_SEND_STREAM_H_ 12 #define WEBRTC_AUDIO_AUDIO_SEND_STREAM_H_
13 13
14 #include <memory> 14 #include <memory>
15 15
16 #include "webrtc/api/call/audio_send_stream.h" 16 #include "webrtc/api/call/audio_send_stream.h"
17 #include "webrtc/api/call/audio_state.h" 17 #include "webrtc/api/call/audio_state.h"
18 #include "webrtc/api/rtpparameters.h"
the sun 2016/10/12 15:15:17 why?
minyue-webrtc 2016/10/12 18:59:21 No need now. In patch set 1, some moved function k
18 #include "webrtc/base/constructormagic.h" 19 #include "webrtc/base/constructormagic.h"
19 #include "webrtc/base/thread_checker.h" 20 #include "webrtc/base/thread_checker.h"
20 #include "webrtc/call/bitrate_allocator.h" 21 #include "webrtc/call/bitrate_allocator.h"
21 22
22 namespace webrtc { 23 namespace webrtc {
23 class CongestionController; 24 class CongestionController;
24 class VoiceEngine; 25 class VoiceEngine;
25 class RtcEventLog; 26 class RtcEventLog;
26 27
27 namespace voe { 28 namespace voe {
(...skipping 26 matching lines...) Expand all
54 // Implements BitrateAllocatorObserver. 55 // Implements BitrateAllocatorObserver.
55 uint32_t OnBitrateUpdated(uint32_t bitrate_bps, 56 uint32_t OnBitrateUpdated(uint32_t bitrate_bps,
56 uint8_t fraction_loss, 57 uint8_t fraction_loss,
57 int64_t rtt) override; 58 int64_t rtt) override;
58 59
59 const webrtc::AudioSendStream::Config& config() const; 60 const webrtc::AudioSendStream::Config& config() const;
60 61
61 private: 62 private:
62 VoiceEngine* voice_engine() const; 63 VoiceEngine* voice_engine() const;
63 64
65 bool SetSendCodecs();
66 bool SetSendCodec(const webrtc::CodecInst& send_codec);
67 bool ApplyMaxSendBitrate();
68 bool HasSendCodec() const;
69
64 rtc::ThreadChecker thread_checker_; 70 rtc::ThreadChecker thread_checker_;
65 rtc::TaskQueue* worker_queue_; 71 rtc::TaskQueue* worker_queue_;
66 const webrtc::AudioSendStream::Config config_; 72 const webrtc::AudioSendStream::Config config_;
67 rtc::scoped_refptr<webrtc::AudioState> audio_state_; 73 rtc::scoped_refptr<webrtc::AudioState> audio_state_;
68 std::unique_ptr<voe::ChannelProxy> channel_proxy_; 74 std::unique_ptr<voe::ChannelProxy> channel_proxy_;
69 75
70 BitrateAllocator* const bitrate_allocator_; 76 BitrateAllocator* const bitrate_allocator_;
71 77
72 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AudioSendStream); 78 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AudioSendStream);
73 }; 79 };
74 } // namespace internal 80 } // namespace internal
75 } // namespace webrtc 81 } // namespace webrtc
76 82
77 #endif // WEBRTC_AUDIO_AUDIO_SEND_STREAM_H_ 83 #endif // WEBRTC_AUDIO_AUDIO_SEND_STREAM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698