[asterisk-commits] file: branch file/rtp_engine-mark2 r183313 - /team/file/rtp_engine-mark2/main/

[SVN commits to the Asterisk project]

Author: file
Date: Thu Mar 19 13:39:49 2009
New Revision: 183313

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=183313
Log:
Bring this a bit more up to date.

Modified:
    team/file/rtp_engine-mark2/main/rtp_engine.c

Modified: team/file/rtp_engine-mark2/main/rtp_engine.c
URL: http://svn.digium.com/svn-view/asterisk/team/file/rtp_engine-mark2/main/rtp_engine.c?view=diff&rev=183313&r1=183312&r2=183313
==============================================================================
--- team/file/rtp_engine-mark2/main/rtp_engine.c (original)
+++ team/file/rtp_engine-mark2/main/rtp_engine.c Thu Mar 19 13:39:49 2009
@@ -1258,6 +1258,12 @@
 	if (video_glue1_res != AST_RTP_GLUE_RESULT_FORBID && (audio_glue1_res != AST_RTP_GLUE_RESULT_REMOTE || video_glue1_res != AST_RTP_GLUE_RESULT_REMOTE)) {
 		audio_glue1_res = AST_RTP_GLUE_RESULT_FORBID;
 	}
+	if (audio_glue0_res == AST_RTP_GLUE_RESULT_REMOTE && (video_glue0_res == AST_RTP_GLUE_RESULT_FRBOID || video_glue0_res == AST_RTP_GLUE_RESULT_REMOTE) && glue0->get_codec(c0)) {
+		codec0 = glue0->get_codec(c0);
+	}
+	if (audio_glue1_res == AST_RTP_GLUE_RESULT_REMOTE && (video_glue1_res == AST_RTP_GLUE_RESULT_FRBOID || video_glue1_res == AST_RTP_GLUE_RESULT_REMOTE) && glue1->get_codec(c1)) {
+		codec1 = glue1->get_codec(c1);
+	}
 
 	/* If any sort of bridge is forbidden just completely bail out and go back to generic bridging */
 	if (audio_glue0_res != AST_RTP_GLUE_RESULT_REMOTE || audio_glue1_res != AST_RTP_GLUE_RESULT_REMOTE) {
@@ -1265,8 +1271,6 @@
 	}
 
 	/* Make sure we have matching codecs */
-	codec0 = glue0->get_codec(c0);
-	codec1 = glue1->get_codec(c1);
 	if (!(codec0 & codec1)) {
 		goto done;
 	}