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

Unified Diff: talk/media/webrtc/webrtcvoiceengine.h

Issue 1291343002: Use C++11 loops in WebRtcVoiceMediaEngine/Channel. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 5 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | talk/media/webrtc/webrtcvoiceengine.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/media/webrtc/webrtcvoiceengine.h
diff --git a/talk/media/webrtc/webrtcvoiceengine.h b/talk/media/webrtc/webrtcvoiceengine.h
index 21056cd0b116443ac460e29c94f0077a94d95363..2c19df7c63d8aff492df7946b3d303dc3108f023 100644
--- a/talk/media/webrtc/webrtcvoiceengine.h
+++ b/talk/media/webrtc/webrtcvoiceengine.h
@@ -160,7 +160,7 @@ class WebRtcVoiceEngine
int CreateMediaVoiceChannel();
private:
- typedef std::vector<WebRtcVoiceMediaChannel *> ChannelList;
+ typedef std::vector<WebRtcVoiceMediaChannel*> ChannelList;
typedef sigslot::
signal3<uint32, MediaProcessorDirection, AudioFrame*> FrameSignal;
@@ -357,8 +357,8 @@ class WebRtcVoiceMediaChannel : public VoiceMediaChannel,
void OnError(uint32 ssrc, int error);
bool sending() const { return send_ != SEND_NOTHING; }
- int GetReceiveChannelNum(uint32 ssrc);
- int GetSendChannelNum(uint32 ssrc);
+ int GetReceiveChannelNum(uint32 ssrc) const;
+ int GetSendChannelNum(uint32 ssrc) const;
void SetCall(webrtc::Call* call);
@@ -406,6 +406,7 @@ class WebRtcVoiceMediaChannel : public VoiceMediaChannel,
const RtpHeaderExtension* extension);
void TryAddAudioRecvStream(uint32 ssrc);
void TryRemoveAudioRecvStream(uint32 ssrc);
+ bool SetRecvCodecsInternal(const std::vector<AudioCodec>& new_codecs);
bool SetChannelRecvRtpHeaderExtensions(
int channel_id,
« no previous file with comments | « no previous file | talk/media/webrtc/webrtcvoiceengine.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698