generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

(Auto)update libjingle 70004190-> 70103367

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6555 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
buildbot@webrtc.org
2014-06-27 16:04:43 +00:00
parent 680555f923
commit bfa758a54c
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
talk/media/webrtc/fakewebrtcvoiceengine.h
View File

@@ -862,9 +862,12 @@ class FakeWebRtcVoiceEngine
} }
#ifdef USE_WEBRTC_DEV_BRANCH #ifdef USE_WEBRTC_DEV_BRANCH
WEBRTC_FUNC(SetREDStatus, (int channel, bool enable, int redPayloadtype)) { WEBRTC_FUNC(SetREDStatus, (int channel, bool enable, int redPayloadtype)) {
#else return SetFECStatus(channel, enable, redPayloadtype);
}
#endif
// TODO(minyue): remove the below function when transition to SetREDStatus
// is finished.
WEBRTC_FUNC(SetFECStatus, (int channel, bool enable, int redPayloadtype)) { WEBRTC_FUNC(SetFECStatus, (int channel, bool enable, int redPayloadtype)) {
#endif // USE_WEBRTC_DEV_BRANCH
WEBRTC_CHECK_CHANNEL(channel); WEBRTC_CHECK_CHANNEL(channel);
channels_[channel]->red = enable; channels_[channel]->red = enable;
channels_[channel]->red_type = redPayloadtype; channels_[channel]->red_type = redPayloadtype;
@@ -872,9 +875,12 @@ class FakeWebRtcVoiceEngine
} }
#ifdef USE_WEBRTC_DEV_BRANCH #ifdef USE_WEBRTC_DEV_BRANCH
WEBRTC_FUNC(GetREDStatus, (int channel, bool& enable, int& redPayloadtype)) { WEBRTC_FUNC(GetREDStatus, (int channel, bool& enable, int& redPayloadtype)) {
#else return GetFECStatus(channel, enable, redPayloadtype);
}
#endif
// TODO(minyue): remove the below function when transition to GetREDStatus
// is finished.
WEBRTC_FUNC(GetFECStatus, (int channel, bool& enable, int& redPayloadtype)) { WEBRTC_FUNC(GetFECStatus, (int channel, bool& enable, int& redPayloadtype)) {
#endif // USE_WEBRTC_DEV_BRANCH
WEBRTC_CHECK_CHANNEL(channel); WEBRTC_CHECK_CHANNEL(channel);
enable = channels_[channel]->red; enable = channels_[channel]->red;
redPayloadtype = channels_[channel]->red_type; redPayloadtype = channels_[channel]->red_type;