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

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

Issue 1386653002: Remove default receive channel from WVoE; baby step 0. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « talk/media/webrtc/webrtcvideoengine2_unittest.cc ('k') | 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 69e88e44c472a0d49f9f6088ba3f581242d39328..61dc7b16e187fdd2306b5e24ce5cbff6d5979c95 100644
--- a/talk/media/webrtc/webrtcvoiceengine.h
+++ b/talk/media/webrtc/webrtcvoiceengine.h
@@ -127,15 +127,12 @@ class WebRtcVoiceEngine
void Print(webrtc::TraceLevel level, const char* trace, int length) override;
// webrtc::VoiceEngineObserver:
- void CallbackOnError(int channel, int errCode) override;
+ void CallbackOnError(int channel_id, int errCode) override;
// Given the device type, name, and id, find device id. Return true and
// set the output parameter rtc_id if successful.
bool FindWebRtcAudioDeviceId(
bool is_input, const std::string& dev_name, int dev_id, int* rtc_id);
- bool FindChannelAndSsrc(int channel_num,
- WebRtcVoiceMediaChannel** channel,
- uint32* ssrc) const;
void StartAecDump(const std::string& filename);
void StopAecDump();
@@ -237,11 +234,10 @@ class WebRtcVoiceMediaChannel : public VoiceMediaChannel,
return VoiceMediaChannel::SendRtcp(&packet);
}
- bool FindSsrc(int channel_num, uint32* ssrc);
- void OnError(uint32 ssrc, int error);
+ void OnError(int error);
- int GetReceiveChannelNum(uint32 ssrc) const;
- int GetSendChannelNum(uint32 ssrc) const;
+ int GetReceiveChannelId(uint32 ssrc) const;
+ int GetSendChannelId(uint32 ssrc) const;
private:
bool SetSendCodecs(const std::vector<AudioCodec>& codecs);
« no previous file with comments | « talk/media/webrtc/webrtcvideoengine2_unittest.cc ('k') | talk/media/webrtc/webrtcvoiceengine.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698