Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 20:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Back out 6d5ff743bb6b:9b321cd729e5 (bug 784519) for mochitest failures

Browse Source
This commit is contained in:
Phil Ringnalda 2013-05-07 21:12:06 -07:00
parent cf41fdc2e7
commit b7f28135e7
6 changed files with 238 additions and 576 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
View File

@ -135,7 +135,7 @@ public:
mRemoteStream = mPC->media()->GetRemoteStream(streams->media_stream_id);
MOZ_ASSERT(mRemoteStream);
}
if ((mCallState == CREATEOFFERSUCCESS) || (mCallState == CREATEANSWERSUCCESS)) {
if ((mCallState == CREATEOFFER) || (mCallState == CREATEANSWER)) {
mSdpStr = aInfo->getSDP();
}
}
@ -165,11 +165,11 @@ public:
}
switch (mCallState) {
case CREATEOFFERSUCCESS:
case CREATEOFFER:
mObserver->OnCreateOfferSuccess(mSdpStr.c_str());
break;
case CREATEANSWERSUCCESS:
case CREATEANSWER:
mObserver->OnCreateAnswerSuccess(mSdpStr.c_str());
break;
@ -181,7 +181,7 @@ public:
mObserver->OnCreateAnswerError(mCode, mReason.c_str());
break;
case SETLOCALDESCSUCCESS:
case SETLOCALDESC:
// TODO: The SDP Parse error list should be copied out and sent up
// to the Javascript layer before being cleared here. Even though
// there was not a failure, it is possible that the SDP parse generated
@ -191,7 +191,7 @@ public:
mObserver->OnSetLocalDescriptionSuccess();
break;
case SETREMOTEDESCSUCCESS:
case SETREMOTEDESC:
// TODO: The SDP Parse error list should be copied out and sent up
// to the Javascript layer before being cleared here. Even though
// there was not a failure, it is possible that the SDP parse generated
@ -1278,12 +1278,12 @@ PeerConnectionImpl::onCallEvent(ccapi_call_event_e aCallEvent,
}
switch (event) {
case SETLOCALDESCSUCCESS:
case SETLOCALDESC:
case UPDATELOCALDESC:
mLocalSDP = aInfo->getSDP();
break;
case SETREMOTEDESCSUCCESS:
case SETREMOTEDESC:
case ADDICECANDIDATE:
mRemoteSDP = aInfo->getSDP();
break;

756
media/webrtc/signaling/src/sipcc/core/gsm/fsmdef.c
View File

File diff suppressed because it is too large Load Diff

12
media/webrtc/signaling/src/sipcc/core/gsm/h/fsm.h
View File

@ -67,10 +67,7 @@ typedef enum {
typedef enum {
FSMDEF_S_MIN = -1,
FSMDEF_S_IDLE,
/* SIP States */
FSMDEF_S_COLLECT_INFO,
FSMDEF_S_CALL_SENT,
FSMDEF_S_OUTGOING_PROCEEDING,
@ -86,15 +83,6 @@ typedef enum {
FSMDEF_S_HOLDING,
FSMDEF_S_RESUME_PENDING,
FSMDEF_S_PRESERVED,
/* WebRTC States */
FSMDEF_S_STABLE,
FSMDEF_S_HAVE_LOCAL_OFFER,
FSMDEF_S_HAVE_REMOTE_OFFER,
FSMDEF_S_HAVE_REMOTE_PRANSWER,
FSMDEF_S_HAVE_LOCAL_PRANSWER,
FSMDEF_S_CLOSED,
FSMDEF_S_MAX
} fsmdef_states_t;

8
media/webrtc/signaling/src/sipcc/core/includes/uiapi.h
View File

@ -31,12 +31,12 @@ typedef enum {
evHoldRevert = HOLDREVERT,
evWhisper = WHISPER,
evWaitingForDigits = WAITINGFORDIGITS,
evCreateOfferSuccess = CREATEOFFERSUCCESS,
evCreateAnswerSuccess = CREATEANSWERSUCCESS,
evCreateOffer = CREATEOFFER,
evCreateAnswer = CREATEANSWER,
evCreateOfferError = CREATEOFFERERROR,
evCreateAnswerError = CREATEANSWERERROR,
evSetLocalDescSuccess = SETLOCALDESCSUCCESS,
evSetRemoteDescSuccess = SETREMOTEDESCSUCCESS,
evSetLocalDesc = SETLOCALDESC,
evSetRemoteDesc = SETREMOTEDESC,
evUpdateLocalDesc = UPDATELOCALDESC,
evSetLocalDescError = SETLOCALDESCERROR,
evSetRemoteDescError = SETREMOTEDESCERROR,

8
media/webrtc/signaling/src/sipcc/include/cc_constants.h
View File

@ -276,12 +276,12 @@ typedef enum {
WHISPER,
PRESERVATION,
WAITINGFORDIGITS = 21,
CREATEOFFERSUCCESS,
CREATEANSWERSUCCESS,
CREATEOFFER,
CREATEANSWER,
CREATEOFFERERROR,
CREATEANSWERERROR,
SETLOCALDESCSUCCESS,
SETREMOTEDESCSUCCESS,
SETLOCALDESC,
SETREMOTEDESC,
UPDATELOCALDESC,
UPDATEREMOTEDESC,
SETLOCALDESCERROR,

16
media/webrtc/signaling/src/softphonewrapper/CC_SIPCCCallInfo.cpp
View File

@ -115,11 +115,11 @@ std::string CC_SIPCCCallInfo::callStateToString (cc_call_state_t state)
case WAITINGFORDIGITS:
statestr = "WAITINGFORDIGITS";
break;
case CREATEOFFERSUCCESS:
statestr = "CREATEOFFERSUCCESS";
case CREATEOFFER:
statestr = "CREATEOFFER";
break;
case CREATEANSWERSUCCESS:
statestr = "CREATEANSWERSUCCESS";
case CREATEANSWER:
statestr = "CREATEANSWER";
break;
case CREATEOFFERERROR:
statestr = "CREATEOFFERERROR";
@ -127,11 +127,11 @@ std::string CC_SIPCCCallInfo::callStateToString (cc_call_state_t state)
case CREATEANSWERERROR:
statestr = "CREATEANSWERERROR";
break;
case SETLOCALDESCSUCCESS:
statestr = "SETLOCALDESCSUCCESS";
case SETLOCALDESC:
statestr = "SETLOCALDESC";
break;
case SETREMOTEDESCSUCCESS:
statestr = "SETREMOTEDESCSUCCESS";
case SETREMOTEDESC:
statestr = "SETREMOTEDESC";
break;
case UPDATELOCALDESC:
statestr = "UPDATELOCALDESC";