[farsight2/master] Add option to codec negotiation to prefer local codec ids

[Olivier Crête]

---
 gst/fsrtpconference/fs-rtp-codec-negotiation.c |    3 +++
 gst/fsrtpconference/fs-rtp-codec-negotiation.h |    1 +
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/gst/fsrtpconference/fs-rtp-codec-negotiation.c b/gst/fsrtpconference/fs-rtp-codec-negotiation.c
index a04b7f1..ab96f74 100644
--- a/gst/fsrtpconference/fs-rtp-codec-negotiation.c
+++ b/gst/fsrtpconference/fs-rtp-codec-negotiation.c
@@ -462,6 +462,7 @@ GHashTable *
 negotiate_codecs (const GList *remote_codecs,
     GHashTable *negotiated_codec_associations,
     GHashTable *local_codec_associations, GList *local_codecs,
+    gboolean use_local_ids,
     GList **negotiated_codecs_out)
 {
   GHashTable *new_codec_associations = NULL;
@@ -510,6 +511,8 @@ negotiate_codecs (const GList *remote_codecs,
       if (tmpdata.local_ca && tmpdata.nego_codec) {
         local_ca = tmpdata.local_ca;
         nego_codec = tmpdata.nego_codec;
+        if (use_local_ids)
+          nego_codec->id = local_ca->codec->id;
       }
     }
 
diff --git a/gst/fsrtpconference/fs-rtp-codec-negotiation.h b/gst/fsrtpconference/fs-rtp-codec-negotiation.h
index 4da310a..d6a0c5b 100644
--- a/gst/fsrtpconference/fs-rtp-codec-negotiation.h
+++ b/gst/fsrtpconference/fs-rtp-codec-negotiation.h
@@ -45,6 +45,7 @@ GHashTable *create_local_codec_associations (FsMediaType media_type,
 GHashTable *negotiate_codecs (const GList *remote_codecs,
     GHashTable *current_negotiated_codec_associations,
     GHashTable *local_codec_associations, GList *local_codecs,
+    gboolean use_local_ids,
     GList **new_negotiated_codecs);
 
 CodecAssociation *lookup_codec_association_by_pt (
-- 
1.5.6.5