Changes between Version 6 and Version 7 of pjsip-doc/media

Timestamp:

May 10, 2019 7:39:26 AM (6 years ago)

Author:

ming

Comment:

--

pjsip-doc/media

@@ -31 +31 @@
 
     AudioMediaPlayer player;
-    AudioMedia& play_med = Endpoint::instance().audDevManager().getPlaybackDevMedia();
+    AudioMedia& play_dev_med = Endpoint::instance().audDevManager().getPlaybackDevMedia();
     try {
         player.createPlayer("file.wav");
-        player.startTransmit(play_med);
+        player.startTransmit(play_dev_med);
     } catch(Error& err) {
     }
@@ -51 +51 @@
 
     try {
-        player.stopTransmit(play_med);
+        player.stopTransmit(play_dev_med);
     } catch(Error& err) {
     }
@@ -65 +65 @@
 
     AudioMediaRecorder recorder;
-    AudioMedia& cap_med = Endpoint::instance().audDevManager().getCaptureDevMedia();
+    AudioMedia& cap_dev_med = Endpoint::instance().audDevManager().getCaptureDevMedia();
     try {
         recorder.createRecorder("file.wav");
-        cap_med.startTransmit(recorder);
+        cap_dev_med.startTransmit(recorder);
     } catch(Error& err) {
     }
@@ -77 +77 @@
 
     try {
-       cap_med.stopTransmit(recorder);
+       cap_dev_med.stopTransmit(recorder);
     } catch(Error& err) {
     }
@@ -94 +94 @@
 .. code-block:: c++
 
-    cap_med.startTransmit(play_med);
+    cap_dev_med.startTransmit(play_dev_med);
 
 
@@ -104 +104 @@
 +++++++++++
 
-A single call can have more than one media (for example, audio and video). Application can retrieve the audio media by using the API Call.getMedia(). Then for a normal call, we would want to establish bidirectional audio with the remote person, which can be done easily by connecting the sound device and the call audio media and vice versa:
-
-.. code-block:: c++
-
-    CallInfo ci = call.getInfo();
-    AudioMedia *aud_med = NULL;
-
-    // Find out which media index is the audio
-    for (unsigned i=0; i<ci.media.size(); ++i) {
-        if (ci.media[i].type == PJMEDIA_TYPE_AUDIO) {
-            aud_med = (AudioMedia *)call.getMedia(i);
-            break;
+A single call can have more than one media (for example, audio and video). Application can retrieve the audio media by using the API Call.getAudioMedia(). Then for a normal call, we would want to establish bidirectional audio with the remote person, which can be done easily by connecting the sound device and the call audio media and vice versa:
+
+.. code-block:: c++
+
+    void MyCall::onCallMediaState(OnCallMediaStateParam &prm)
+    {
+        CallInfo ci = call.getInfo();
+        AudioMedia aud_med;
+
+        try {
+            // Get the first audio media
+            aud_med = getAudioMedia(-1);
+        } catch(...) {
+            return;
         }
-    }
-
-    if (aud_med) {
+
+        /* Deprecated: for PJSIP version 2.8 or earlier
+        AudioMedia *aud_med = NULL;
+
+        // Find out which media index is the audio
+        for (unsigned i=0; i<ci.media.size(); ++i) {
+            if (ci.media[i].type == PJMEDIA_TYPE_AUDIO) {
+                aud_med = (AudioMedia *)call.getMedia(i);
+                break;
+            }
+        }
+
+        if (!aud_med) return;
+        */
+
         // This will connect the sound device/mic to the call audio media
-        cap_med.startTransmit(*aud_med);
+        cap_dev_med.startTransmit(aud_med);
 
         // And this will connect the call audio media to the sound device/speaker
-        aud_med->startTransmit(play_med);
-    }
-
+        aud_med.startTransmit(play_dev_med);
+}
 
 
@@ -137 +150 @@
     AudioMedia *aud_med2 = (AudioMedia *)call2.getMedia(aud_idx);
     if (aud_med2) {
-        cap_med->startTransmit(*aud_med2);
-        aud_med2->startTransmit(play_med);
+        cap_dev_med->startTransmit(*aud_med2);
+        aud_med2->startTransmit(play_dev_med);
     }
 
@@ -161 +174 @@
 .. code-block:: c++
 
-    cap_med.startTransmit(recorder);
+    cap_dev_med.startTransmit(recorder);
     aud_med->startTransmit(recorder);
     aud_med2->startTransmit(recorder);