From: <kak...@us...> - 2009-04-08 17:27:41
|
Revision: 11123 http://amsn.svn.sourceforge.net/amsn/?rev=11123&view=rev Author: kakaroto Date: 2009-04-08 17:27:39 +0000 (Wed, 08 Apr 2009) Log Message: ----------- set remote candidates before remote codecs this way we don't loose the first keyframe for video Modified Paths: -------------- trunk/amsn/utils/farsight/src/tcl_farsight.c Modified: trunk/amsn/utils/farsight/src/tcl_farsight.c =================================================================== --- trunk/amsn/utils/farsight/src/tcl_farsight.c 2009-04-02 22:12:59 UTC (rev 11122) +++ trunk/amsn/utils/farsight/src/tcl_farsight.c 2009-04-08 17:27:39 UTC (rev 11123) @@ -367,7 +367,6 @@ } -/* TODO */ static void _notify_active (char *msg, const char *local, const char *remote) { @@ -2752,26 +2751,6 @@ } } - /* Set audio codecs */ - if (audio_remote_codecs) { - if (!fs_stream_set_remote_codecs (audio_stream, audio_remote_codecs, &error)) { - Tcl_AppendResult (interp, "Could not set the audio remote codecs", - (char *) NULL); - goto error; - } - fs_codec_list_destroy (audio_remote_codecs); - audio_remote_codecs = NULL; - } - /* Set video codecs */ - if (video_remote_codecs && video_stream) { - if (!fs_stream_set_remote_codecs (video_stream, video_remote_codecs, &error)) { - Tcl_AppendResult (interp, "Could not set the video remote codecs", - (char *) NULL); - goto error; - } - fs_codec_list_destroy (video_remote_codecs); - video_remote_codecs = NULL; - } /* Set audio candidates */ if (audio_remote_candidates) { @@ -2796,6 +2775,27 @@ video_remote_candidates = NULL; } + /* Set audio codecs */ + if (audio_remote_codecs) { + if (!fs_stream_set_remote_codecs (audio_stream, audio_remote_codecs, &error)) { + Tcl_AppendResult (interp, "Could not set the audio remote codecs", + (char *) NULL); + goto error; + } + fs_codec_list_destroy (audio_remote_codecs); + audio_remote_codecs = NULL; + } + /* Set video codecs */ + if (video_remote_codecs && video_stream) { + if (!fs_stream_set_remote_codecs (video_stream, video_remote_codecs, &error)) { + Tcl_AppendResult (interp, "Could not set the video remote codecs", + (char *) NULL); + goto error; + } + fs_codec_list_destroy (video_remote_codecs); + video_remote_codecs = NULL; + } + return TCL_OK; error: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |