Changeset 4776

Timestamp:

Mar 4, 2014 4:25:31 AM (10 years ago)

Author:

ming

Message:

Fixed #1744: Codec and audio device enumeration problem in pjsua2

Location:

pjproject/trunk/pjsip/src/pjsua2

Files:

• endpoint.cpp (modified) (2 diffs)
• media.cpp (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsua2/endpoint.cpp

@@ -1562 +1562 @@
 {
     pjsua_codec_info pj_codec[MAX_CODEC_NUM];
-    unsigned count = 0;
+    unsigned count = MAX_CODEC_NUM;
 
     PJSUA2_CHECK_EXPR( pjsua_enum_codecs(pj_codec, &count) );
@@ -1568 +1568 @@
     pj_enter_critical_section();
     clearCodecInfoList();
-    for (unsigned i=0;(i<count && i<MAX_CODEC_NUM);++i) {
+    for (unsigned i=0; i<count; ++i) {
         CodecInfo *codec_info = new CodecInfo;
 

pjproject/trunk/pjsip/src/pjsua2/media.cpp

@@ -471 +471 @@
 {
     pjmedia_aud_dev_info pj_info[MAX_DEV_COUNT];
-    unsigned count;
+    unsigned count = MAX_DEV_COUNT;
 
     PJSUA2_CHECK_EXPR( pjsua_enum_aud_devs(pj_info, &count) );
@@ -477 +477 @@
     pj_enter_critical_section();
     clearAudioDevList();
-    for (unsigned i = 0; (i<count && i<MAX_DEV_COUNT) ;++i) {
+    for (unsigned i = 0; i<count ;++i) {
         AudioDevInfo *dev_info = new AudioDevInfo;
         dev_info->fromPj(pj_info[i]);