Changeset 4669 for pjproject/branches/projects/pjsua2/pjsip/src/pjsua2/media.cpp

Timestamp:

Dec 3, 2013 10:45:36 AM (11 years ago)

Author:

riza

Message:

Re #1519: Added codec management operations to Media API in pjsua2.

File:

• pjproject/branches/projects/pjsua2/pjsip/src/pjsua2/media.cpp (modified) (4 diffs)

pjproject/branches/projects/pjsua2/pjsip/src/pjsua2/media.cpp

@@ -386 +386 @@
     unsigned count;
 
+    PJSUA2_CHECK_EXPR( pjsua_enum_aud_devs(pj_info, &count) );
+
     clearAudioDevList();
 
-    PJSUA2_CHECK_EXPR( pjsua_enum_aud_devs(pj_info, &count) );
-
+    pj_enter_critical_section();
     for (unsigned i = 0; (i<count && i<MAX_DEV_COUNT) ;++i) {
         AudioDevInfo *dev_info = new AudioDevInfo;
@@ -395 +396 @@
         audioDevList.push_back(dev_info);
     }
+    pj_leave_critical_section();
     return audioDevList;
 }
@@ -691 +693 @@
 void AudDevManager::clearAudioDevList()
 {
+    pj_enter_critical_section();
     for(unsigned i=0;i<audioDevList.size();++i) {
         delete audioDevList[i];
     }
     audioDevList.clear();
+    pj_leave_critical_section();
 }
 
@@ -704 +708 @@
     return is_capture?capture_dev:playback_dev;
 }
+
+///////////////////////////////////////////////////////////////////////////////
+void CodecInfo::fromPj(const pjsua_codec_info &codec_info)
+{
+    codecId = pj2Str(codec_info.codec_id);
+    priority = codec_info.priority;
+    desc = pj2Str(codec_info.desc);
+}