summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.com>2012-02-28 22:13:43 (GMT)
committerOlivier CrĂȘte <olivier.crete@collabora.com>2012-02-28 22:14:01 (GMT)
commitd9fa44186200e1cd17d69a1ae5b0dead202f7a58 (patch)
tree3c9f261bf418effb95a9008570b437adc94e62b9
parentd01dc756827235d0caa6f6e067994cf117387708 (diff)
downloadfarstream-d9fa44186200e1cd17d69a1ae5b0dead202f7a58.tar.gz
farstream-d9fa44186200e1cd17d69a1ae5b0dead202f7a58.tar.xz
rtpcodecnego: Ignore config while comparing send codecs
-rw-r--r--gst/fsrtpconference/fs-rtp-codec-negotiation.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/gst/fsrtpconference/fs-rtp-codec-negotiation.c b/gst/fsrtpconference/fs-rtp-codec-negotiation.c
index 12f498f..a63faa0 100644
--- a/gst/fsrtpconference/fs-rtp-codec-negotiation.c
+++ b/gst/fsrtpconference/fs-rtp-codec-negotiation.c
@@ -1393,17 +1393,24 @@ lookup_codec_association_by_codec_for_sending (GList *codec_associations,
FsCodec *codec)
{
GList *item;
+ CodecAssociation *res = NULL;
+ FsCodec *tmpcodec = codec_copy_filtered (codec, FS_PARAM_TYPE_CONFIG);
for (item = codec_associations; item; item = g_list_next (item))
{
CodecAssociation *ca = item->data;
if (codec_association_is_valid_for_sending (ca, FALSE) &&
- fs_codec_are_equal (ca->codec, codec))
- return ca;
+ fs_codec_are_equal (ca->send_codec, tmpcodec))
+ {
+ res = ca;
+ break;
+ }
}
- return NULL;
+ fs_codec_destroy (tmpcodec);
+
+ return res;
}
FsRtpHeaderExtension *