Changeset 3925 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

Timestamp:

Dec 27, 2011 12:47:52 PM (13 years ago)

Author:

bennylp

Message:

More re #1419: changed field names from video_count to vid_cnt and audio_cnt to aud_cnt for better consistency

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c (modified) (4 diffs)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -1735 +1735 @@
 
             /* Check if we need to add new audio */
-            if (maudcnt < call->opt.audio_cnt && 
-                mtotaudcnt < call->opt.audio_cnt)
+            if (maudcnt < call->opt.aud_cnt &&
+                mtotaudcnt < call->opt.aud_cnt)
             {
-                for (mi = 0; mi < call->opt.audio_cnt - mtotaudcnt; ++mi)
+                for (mi = 0; mi < call->opt.aud_cnt - mtotaudcnt; ++mi)
                     maudidx[maudcnt++] = (pj_uint8_t)call->med_cnt++;
                 
-                mtotaudcnt = call->opt.audio_cnt;
-            }
-            maudcnt = call->opt.audio_cnt;
+                mtotaudcnt = call->opt.aud_cnt;
+            }
+            maudcnt = call->opt.aud_cnt;
 
             /* Check if we need to add new video */
-            if (mvidcnt < call->opt.video_cnt && 
-                mtotvidcnt < call->opt.video_cnt)
+            if (mvidcnt < call->opt.vid_cnt &&
+                mtotvidcnt < call->opt.vid_cnt)
             {
-                for (mi = 0; mi < call->opt.video_cnt - mtotvidcnt; ++mi)
+                for (mi = 0; mi < call->opt.vid_cnt - mtotvidcnt; ++mi)
                     mvididx[mvidcnt++] = (pj_uint8_t)call->med_cnt++;
 
-                mtotvidcnt = call->opt.video_cnt;
-            }
-            mvidcnt = call->opt.video_cnt;
+                mtotvidcnt = call->opt.vid_cnt;
+            }
+            mvidcnt = call->opt.vid_cnt;
 
         } else {
 
-            maudcnt = mtotaudcnt = call->opt.audio_cnt;
+            maudcnt = mtotaudcnt = call->opt.aud_cnt;
             for (mi=0; mi<maudcnt; ++mi) {
                 maudidx[mi] = (pj_uint8_t)mi;
             }
-            mvidcnt = mtotvidcnt = call->opt.video_cnt;
+            mvidcnt = mtotvidcnt = call->opt.vid_cnt;
             for (mi=0; mi<mvidcnt; ++mi) {
                 mvididx[mi] = (pj_uint8_t)(maudcnt + mi);
@@ -1815 +1815 @@
         if (pj_memchr(maudidx, mi, mtotaudcnt * sizeof(maudidx[0]))) {
             media_type = PJMEDIA_TYPE_AUDIO;
-            if (call->opt.audio_cnt &&
+            if (call->opt.aud_cnt &&
                 pj_memchr(maudidx, mi, maudcnt * sizeof(maudidx[0])))
             {
@@ -1822 +1822 @@
         } else if (pj_memchr(mvididx, mi, mtotvidcnt * sizeof(mvididx[0]))) {
             media_type = PJMEDIA_TYPE_VIDEO;
-            if (call->opt.video_cnt &&
+            if (call->opt.vid_cnt &&
                 pj_memchr(mvididx, mi, mvidcnt * sizeof(mvididx[0])))
             {
@@ -2597 +2597 @@
      * would pass the SDP negotiation.
      */
-    if (maudcnt > call->opt.audio_cnt || mvidcnt > call->opt.video_cnt)
+    if (maudcnt > call->opt.aud_cnt || mvidcnt > call->opt.vid_cnt)
     {
         pjmedia_sdp_session *local_sdp2;
 
-        maudcnt = PJ_MIN(maudcnt, call->opt.audio_cnt);
-        mvidcnt = PJ_MIN(mvidcnt, call->opt.video_cnt);
+        maudcnt = PJ_MIN(maudcnt, call->opt.aud_cnt);
+        mvidcnt = PJ_MIN(mvidcnt, call->opt.vid_cnt);
         local_sdp2 = pjmedia_sdp_session_clone(tmp_pool, local_sdp);