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

Side by Side Diff: talk/app/webrtc/webrtcsdp.h

Issue 1688383002: Implementing unified plan encoding of msid. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fixing a comment. Created 4 years, 10 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2011 Google Inc. 3 * Copyright 2011 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 43
44 class IceCandidateInterface; 44 class IceCandidateInterface;
45 class JsepIceCandidate; 45 class JsepIceCandidate;
46 class JsepSessionDescription; 46 class JsepSessionDescription;
47 struct SdpParseError; 47 struct SdpParseError;
48 48
49 // Serializes the passed in JsepSessionDescription. 49 // Serializes the passed in JsepSessionDescription.
50 // Serialize SessionDescription including candidates if 50 // Serialize SessionDescription including candidates if
51 // JsepSessionDescription has candidates. 51 // JsepSessionDescription has candidates.
52 // jdesc - The JsepSessionDescription object to be serialized. 52 // jdesc - The JsepSessionDescription object to be serialized.
53 // unified_plan_sdp - If set to true, include "a=msid" lines where appropriate.
53 // return - SDP string serialized from the arguments. 54 // return - SDP string serialized from the arguments.
54 std::string SdpSerialize(const JsepSessionDescription& jdesc); 55 std::string SdpSerialize(const JsepSessionDescription& jdesc,
56 bool unified_plan_sdp = false);
pthatcher1 2016/02/12 03:54:35 Rather than have a default variable, can we make i
Taylor Brandstetter 2016/02/12 20:44:57 Done.
55 57
56 // Serializes the passed in IceCandidateInterface to a SDP string. 58 // Serializes the passed in IceCandidateInterface to a SDP string.
57 // candidate - The candidate to be serialized. 59 // candidate - The candidate to be serialized.
58 std::string SdpSerializeCandidate(const IceCandidateInterface& candidate); 60 std::string SdpSerializeCandidate(const IceCandidateInterface& candidate);
59 61
60 // Deserializes the passed in SDP string to a JsepSessionDescription. 62 // Deserializes the passed in SDP string to a JsepSessionDescription.
61 // message - SDP string to be Deserialized. 63 // message - SDP string to be Deserialized.
62 // jdesc - The JsepSessionDescription deserialized from the SDP string. 64 // jdesc - The JsepSessionDescription deserialized from the SDP string.
63 // error - The detail error information when parsing fails. 65 // error - The detail error information when parsing fails.
64 // return - true on success, false on failure. 66 // return - true on success, false on failure.
65 bool SdpDeserialize(const std::string& message, 67 bool SdpDeserialize(const std::string& message,
66 JsepSessionDescription* jdesc, 68 JsepSessionDescription* jdesc,
67 SdpParseError* error); 69 SdpParseError* error);
68 70
69 // Deserializes the passed in SDP string to one JsepIceCandidate. 71 // Deserializes the passed in SDP string to one JsepIceCandidate.
70 // The first line must be a=candidate line and only the first line will be 72 // The first line must be a=candidate line and only the first line will be
71 // parsed. 73 // parsed.
72 // message - The SDP string to be Deserialized. 74 // message - The SDP string to be Deserialized.
73 // candidates - The JsepIceCandidate from the SDP string. 75 // candidates - The JsepIceCandidate from the SDP string.
74 // error - The detail error information when parsing fails. 76 // error - The detail error information when parsing fails.
75 // return - true on success, false on failure. 77 // return - true on success, false on failure.
76 bool SdpDeserializeCandidate(const std::string& message, 78 bool SdpDeserializeCandidate(const std::string& message,
77 JsepIceCandidate* candidate, 79 JsepIceCandidate* candidate,
78 SdpParseError* error); 80 SdpParseError* error);
79 } // namespace webrtc 81 } // namespace webrtc
80 82
81 #endif // TALK_APP_WEBRTC_WEBRTCSDP_H_ 83 #endif // TALK_APP_WEBRTC_WEBRTCSDP_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698