Merge pull request #142 from stazio/fix-sdp-media

Move comon lines before m= lines

src/description.cpp

@@ -223,6 +223,18 @@ string Description::generateSdp(const string &eol) const {
 
 	sdp << "a=msid-semantic: WMS" << eol;
 
+    // Common
+    if (!mEnded)
+        sdp << "a=ice-options:trickle" << eol;
+
+    sdp << "a=ice-ufrag:" << mIceUfrag << eol;
+    sdp << "a=ice-pwd:" << mIcePwd << eol;
+    sdp << "a=setup:" << roleToString(mRole) << eol;
+    sdp << "a=tls-id:1" << eol;
+
+    if (mFingerprint)
+        sdp << "a=fingerprint:sha-256 " << *mFingerprint << eol;
+
 	// Non-data media
 	if (!mMedia.empty()) {
 		// Lip-sync
@@ -257,20 +269,6 @@ string Description::generateSdp(const string &eol) const {
 			if (mData.maxMessageSize)
 				sdp << "a=max-message-size:" << *mData.maxMessageSize << eol;
 		}
-
-		if (i == 0) {
-			// Common
-			if (!mEnded)
-				sdp << "a=ice-options:trickle" << eol;
-
-			sdp << "a=ice-ufrag:" << mIceUfrag << eol;
-			sdp << "a=ice-pwd:" << mIcePwd << eol;
-			sdp << "a=setup:" << roleToString(mRole) << eol;
-			sdp << "a=tls-id:1" << eol;
-
-			if (mFingerprint)
-				sdp << "a=fingerprint:sha-256 " << *mFingerprint << eol;
-		}
 	}
 
 	// Candidates