Merge pull request #35 from intermedia-net/bugfix/APPS-13362-nack-issue

Bugfix/apps 13362 nack issue
intermedia-net · Oct 20, 2023 · 836d251 · 836d251
2 parents c97ad38 + 1e911a1
commit 836d251
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/ios_framework/.gitignore b/ios_framework/.gitignore
@@ -3,6 +3,7 @@ openssl/
 opus/
 Sources/lib
 tmp/
+artifact/
 
 !opus/opus.sh
 !openssl/openssl.sh

diff --git a/pjlib/include/pj/config.h b/pjlib/include/pj/config.h
@@ -1415,7 +1415,7 @@ PJ_BEGIN_DECL
  * Extra suffix for the version (e.g. "-trunk"), or empty for
  * web release version.
  */
-#define PJ_VERSION_NUM_EXTRA	"-2"
+#define PJ_VERSION_NUM_EXTRA	"-3"
 
 /**
  * PJLIB version number consists of three bytes with the following format:

diff --git a/pjmedia/src/pjmedia/sdp_neg.c b/pjmedia/src/pjmedia/sdp_neg.c
@@ -1467,18 +1467,28 @@ static pj_status_t create_answer( pj_pool_t *pool,
         const pjmedia_sdp_media *om;    /* offer */
         const pjmedia_sdp_media *im;    /* initial media */
         pjmedia_sdp_media *am = NULL;   /* answer/result */
+        pj_uint32_t om_tp;
         unsigned j;
 
         om = offer->media[i];
 
+        om_tp = pjmedia_sdp_transport_get_proto(&om->desc.transport);
+        PJMEDIA_TP_PROTO_TRIM_FLAG(om_tp, PJMEDIA_TP_PROFILE_RTCP_FB);
+
         /* Find media description in our initial capability that matches
          * the media type and transport type of offer's media, has
          * matching codec, and has not been used to answer other offer.
          */
         for (im=NULL, j=0; j<initial->media_count; ++j) {
+            pj_uint32_t im_tp;
+
             im = initial->media[j];
+
+            im_tp = pjmedia_sdp_transport_get_proto(&im->desc.transport);
+            PJMEDIA_TP_PROTO_TRIM_FLAG(im_tp, PJMEDIA_TP_PROFILE_RTCP_FB);
+
             if (pj_strcmp(&om->desc.media, &im->desc.media)==0 &&
-                pj_strcmp(&om->desc.transport, &im->desc.transport)==0 &&
+                om_tp == im_tp &&
                 media_used[j] == 0)
             {
                 pj_status_t status2;

diff --git a/version.mak b/version.mak
@@ -2,7 +2,7 @@
 export PJ_VERSION_MAJOR  := 2
 export PJ_VERSION_MINOR  := 13
 export PJ_VERSION_REV    := 1
-export PJ_VERSION_SUFFIX := -2
+export PJ_VERSION_SUFFIX := -3
 
 export PJ_VERSION := $(PJ_VERSION_MAJOR).$(PJ_VERSION_MINOR)