Changeset 4708 for pjproject

Timestamp:

Jan 21, 2014 10:59:25 AM (10 years ago)

Author:

nanang

Message:

Re #1519 [into SVN trunk]: AudioMedia? objects must not be destroyed before unregistered from conf bridge.

Location:

pjproject/trunk

Files:

• pjsip-apps/src/samples/pjsua2_demo.cpp (modified) (3 diffs)
• pjsip/src/pjsua2/media.cpp (modified) (5 diffs)

pjproject/trunk/pjsip-apps/src/samples/pjsua2_demo.cpp

@@ -92 +92 @@
 void MyCall::onCallState(OnCallStateParam &prm)
 {
+    PJ_UNUSED_ARG(prm);
+
     CallInfo ci = getInfo();
     std::cout << "*** Call: " <<  ci.remoteUri << " [" << ci.stateText
@@ -205 +207 @@
 }
 
+
+void mainProg3() throw(Error)
+{
+    Endpoint ep;
+
+    // Create library
+    ep.libCreate();
+
+    // Init library
+    EpConfig ep_cfg;
+    ep.libInit( ep_cfg );
+
+    // Start library
+    ep.libStart();
+    std::cout << "*** PJSUA2 STARTED ***" << std::endl;
+
+    // Create player and recorder
+    {
+        AudioMediaPlayer amp;
+        amp.createPlayer("../../tests/pjsua/wavs/input.16.wav");
+
+        AudioMediaRecorder amr;
+        amr.createRecorder("recorder_test_output.wav");
+
+        amp.startTransmit(ep.audDevManager().getPlaybackDevMedia());
+        amp.startTransmit(amr);
+
+        pj_thread_sleep(5000);
+    }
+
+    ep.libDestroy();
+}
+
+
 void mainProg() throw(Error)
 {
@@ -272 +308 @@
     {
         Endpoint ep;
-        ep.natDetectType();
-        {
-        }
     }
 
     try {
-        mainProg1();
+        mainProg3();
         std::cout << "Success" << std::endl;
     } catch (Error & err) {

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

@@ -248 +248 @@
 AudioMediaPlayer::~AudioMediaPlayer()
 {
-    if (playerId != PJSUA_INVALID_ID)
+    if (playerId != PJSUA_INVALID_ID) {
+        unregisterMediaPort();
         pjsua_player_destroy(playerId);
+    }
 }
 
@@ -256 +258 @@
                                     throw(Error)
 {
+    if (playerId != PJSUA_INVALID_ID) {
+        PJSUA2_RAISE_ERROR(PJ_EEXISTS);
+    }
+
     pj_str_t pj_name = str2Pj(file_name);
 
@@ -273 +279 @@
                                       throw(Error)
 {
+    if (playerId != PJSUA_INVALID_ID) {
+        PJSUA2_RAISE_ERROR(PJ_EEXISTS);
+    }
+
     pj_str_t pj_files[MAX_FILE_NAMES];
     unsigned i, count = 0;
@@ -318 +328 @@
 AudioMediaRecorder::~AudioMediaRecorder()
 {
-    if (recorderId != PJSUA_INVALID_ID)
+    if (recorderId != PJSUA_INVALID_ID) {
+        unregisterMediaPort();
         pjsua_recorder_destroy(recorderId);
+    }
 }
 
@@ -329 +341 @@
 {
     PJ_UNUSED_ARG(max_size);
+
+    if (recorderId != PJSUA_INVALID_ID) {
+        PJSUA2_RAISE_ERROR(PJ_EEXISTS);
+    }
 
     pj_str_t pj_name = str2Pj(file_name);