wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1133866: Some refactoring and simplification in JsepSessionImpl. r=mt

Browse Source
This commit is contained in:
Byron Campen [:bwc] 2015-02-25 08:36:01 -08:00
parent 23489bab3a
commit 68d2da98bc
2 changed files with 513 additions and 367 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

852
media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp
View File

File diff suppressed because it is too large Load Diff

28
media/webrtc/signaling/src/jsep/JsepSessionImpl.h
View File

@ -189,6 +189,7 @@ private:
SdpMediaSection* msection); SdpMediaSection* msection);
void AddCommonExtmaps(const SdpMediaSection& remoteMsection, void AddCommonExtmaps(const SdpMediaSection& remoteMsection,
SdpMediaSection* msection); SdpMediaSection* msection);
nsresult SetupIds();
void SetupDefaultCodecs(); void SetupDefaultCodecs();
void SetupDefaultRtpExtensions(); void SetupDefaultRtpExtensions();
void SetState(JsepSignalingState state); void SetState(JsepSignalingState state);
@ -200,6 +201,7 @@ private:
nsresult SetRemoteDescriptionAnswer(JsepSdpType type, UniquePtr<Sdp> answer); nsresult SetRemoteDescriptionAnswer(JsepSdpType type, UniquePtr<Sdp> answer);
nsresult ValidateLocalDescription(const Sdp& description); nsresult ValidateLocalDescription(const Sdp& description);
nsresult ValidateRemoteDescription(const Sdp& description); nsresult ValidateRemoteDescription(const Sdp& description);
nsresult ValidateAnswer(const Sdp& offer, const Sdp& answer);
nsresult SetRemoteTracksFromDescription(const Sdp& remoteDescription); nsresult SetRemoteTracksFromDescription(const Sdp& remoteDescription);
// Non-const because we use our Uuid generator // Non-const because we use our Uuid generator
nsresult CreateReceivingTrack(size_t mline, nsresult CreateReceivingTrack(size_t mline,
@ -210,12 +212,28 @@ private:
const UniquePtr<Sdp>& remote); const UniquePtr<Sdp>& remote);
nsresult AddTransportAttributes(SdpMediaSection* msection, nsresult AddTransportAttributes(SdpMediaSection* msection,
SdpSetupAttribute::Role dtlsRole); SdpSetupAttribute::Role dtlsRole);
nsresult CopyTransportParams(const SdpMediaSection& source,
SdpMediaSection* dest);
nsresult CopyStickyParams(const SdpMediaSection& source,
SdpMediaSection* dest);
nsresult AddOfferMSections(const JsepOfferOptions& options, Sdp* sdp);
// Non-const so it can assign m-line index to tracks // Non-const so it can assign m-line index to tracks
nsresult AddOfferMSectionsByType(SdpMediaSection::MediaType type, nsresult AddOfferMSectionsByType(SdpMediaSection::MediaType type,
Maybe<size_t> offerToReceive, Maybe<size_t> offerToReceive,
Sdp* sdp); Sdp* sdp);
nsresult BindLocalTracks(SdpMediaSection::MediaType mediatype,
Sdp* sdp);
nsresult BindTrackToMsection(JsepSendingTrack* track, nsresult BindTrackToMsection(JsepSendingTrack* track,
SdpMediaSection* msection); SdpMediaSection* msection);
nsresult EnsureRecvForRemoteTracks(SdpMediaSection::MediaType mediatype,
Sdp* sdp,
size_t* offerToReceive);
nsresult SetRecvAsNeededOrDisable(SdpMediaSection::MediaType mediatype,
Sdp* sdp,
size_t* offerToRecv);
nsresult AddRecvonlyMsections(SdpMediaSection::MediaType mediatype,
size_t count,
Sdp* sdp);
nsresult CreateReoffer(const Sdp& oldLocalSdp, nsresult CreateReoffer(const Sdp& oldLocalSdp,
const Sdp& oldAnswer, const Sdp& oldAnswer,
Sdp* newSdp); Sdp* newSdp);
@ -231,6 +249,9 @@ private:
std::string* trackId); std::string* trackId);
nsresult GetMsids(const SdpMediaSection& msection, nsresult GetMsids(const SdpMediaSection& msection,
std::vector<SdpMsidAttributeList::Msid>* msids); std::vector<SdpMsidAttributeList::Msid>* msids);
nsresult ParseMsid(const std::string& msidAttribute,
std::string* streamId,
std::string* trackId);
nsresult CreateOfferMSection(SdpMediaSection::MediaType type, nsresult CreateOfferMSection(SdpMediaSection::MediaType type,
SdpDirectionAttribute::Direction direction, SdpDirectionAttribute::Direction direction,
Sdp* sdp); Sdp* sdp);
@ -242,8 +263,15 @@ private:
const SdpMediaSection& remoteMsection, const SdpMediaSection& remoteMsection,
SdpMediaSection* msection, SdpMediaSection* msection,
Sdp* sdp); Sdp* sdp);
nsresult BindMatchingLocalTrackForAnswer(SdpMediaSection* msection);
nsresult DetermineAnswererSetupRole(const SdpMediaSection& remoteMsection, nsresult DetermineAnswererSetupRole(const SdpMediaSection& remoteMsection,
SdpSetupAttribute::Role* rolep); SdpSetupAttribute::Role* rolep);
nsresult MakeNegotiatedTrackPair(const SdpMediaSection& remote,
const SdpMediaSection& local,
const RefPtr<JsepTransport>& transport,
bool usingBundle,
size_t transportLevel,
JsepTrackPair* trackPairOut);
nsresult NegotiateTrack(const SdpMediaSection& remoteMsection, nsresult NegotiateTrack(const SdpMediaSection& remoteMsection,
const SdpMediaSection& localMsection, const SdpMediaSection& localMsection,
JsepTrack::Direction, JsepTrack::Direction,