Changeset 5185 for pjproject

Timestamp:

Oct 2, 2015 2:08:17 AM (9 years ago)

Author:

nanang

Message:

Close #1892: Add pjsua/pjsua2 callback on_call_tx_offer()/Call::onCallTxOffer() to notify incoming re-INVITE without offer.

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua.h (modified) (1 diff)
• include/pjsua2/call.hpp (modified) (2 diffs)
• include/pjsua2/endpoint.hpp (modified) (1 diff)
• src/pjsua-lib/pjsua_call.c (modified) (1 diff)
• src/pjsua2/endpoint.cpp (modified) (2 diffs)

pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

@@ -910 +910 @@
                              pjsip_status_code *code,
                              pjsua_call_setting *opt);
+
+
+    /**
+    * Notify application when call has received INVITE with no SDP offer.
+    * Application can update the call setting (e.g: add audio/video), or
+    * enable/disable codecs, or update other media session settings from
+    * within the callback, however, as mandated by the standard (RFC3261
+    * section 14.2), it must ensure that the update overlaps with the
+    * existing media session (in codecs, transports, or other parameters)
+    * that require support from the peer, this is to avoid the need for
+    * the peer to reject the offer.
+    *
+    * When this callback is not defined, the default behavior is to send
+    * SDP offer using current active media session (with all enabled codecs
+    * on each media type).
+    *
+    * @param call_id    The call index.
+    * @param reserved   Reserved param, currently not used.
+    * @param opt        The current call setting, application can update
+    *                   this setting for generating the offer.
+    */
+    void (*on_call_tx_offer)(pjsua_call_id call_id,
+                             void *reserved,
+                             pjsua_call_setting *opt);
+
 
     /**

pjproject/trunk/pjsip/include/pjsua2/call.hpp

@@ -852 +852 @@
 
 /**
+ * This structure contains parameters for Call::onCallTxOffer() callback.
+ */
+struct OnCallTxOfferParam
+{
+    /**
+     * The current call setting, application can update this setting for
+     * generating the offer. Note that application should maintain any
+     * active media to avoid the need for the peer to reject the offer.
+     */
+    CallSetting         opt;
+};
+
+/**
  * This structure contains parameters for Call::onCallRedirected() callback.
  */
@@ -1601 +1614 @@
      */
     virtual void onCallRxOffer(OnCallRxOfferParam &prm)
+    { PJ_UNUSED_ARG(prm); }
+    
+    /**
+     * Notify application when call has received INVITE with no SDP offer.
+     * Application can update the call setting (e.g: add audio/video), or
+     * enable/disable codecs, or update other media session settings from
+     * within the callback, however, as mandated by the standard (RFC3261
+     * section 14.2), it must ensure that the update overlaps with the
+     * existing media session (in codecs, transports, or other parameters)
+     * that require support from the peer, this is to avoid the need for
+     * the peer to reject the offer.
+     *
+     * When this callback is not implemented, the default behavior is to send
+     * SDP offer using current active media session (with all enabled codecs
+     * on each media type).
+     *
+     * @param prm       Callback parameter.
+     */
+    virtual void onCallTxOffer(OnCallTxOfferParam &prm)
     { PJ_UNUSED_ARG(prm); }
     

pjproject/trunk/pjsip/include/pjsua2/endpoint.hpp

@@ -1359 +1359 @@
                                  pjsip_status_code *code,
                                  pjsua_call_setting *opt);
+    static void on_call_tx_offer(pjsua_call_id call_id,
+                                 void *reserved,
+                                 pjsua_call_setting *opt);
     static pjsip_redirect_op on_call_redirected(pjsua_call_id call_id,
                                                 const pjsip_uri *target,

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

@@ -4182 +4182 @@
 #endif
 
+    if (pjsua_var.ua_cfg.cb.on_call_tx_offer) {
+        cleanup_call_setting_flag(&call->opt);
+        (*pjsua_var.ua_cfg.cb.on_call_tx_offer)(call->index, NULL,
+                                                &call->opt);
+    }
+
     /* We may need to re-initialize media before creating SDP */
-    if (call->med_prov_cnt == 0) {
+    if (call->med_prov_cnt == 0 || pjsua_var.ua_cfg.cb.on_call_tx_offer) {
         status = apply_call_setting(call, &call->opt, NULL);
         if (status != PJ_SUCCESS)

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

@@ -1074 +1074 @@
 }
 
+void Endpoint::on_call_tx_offer(pjsua_call_id call_id,
+                                void *reserved,
+                                pjsua_call_setting *opt)
+{
+    PJ_UNUSED_ARG(reserved);
+
+    Call *call = Call::lookup(call_id);
+    if (!call) {
+        return;
+    }
+
+    OnCallTxOfferParam prm;
+    prm.opt.fromPj(*opt);
+
+    call->onCallTxOffer(prm);
+
+    *opt = prm.opt.toPj();
+}
+
 pjsip_redirect_op Endpoint::on_call_redirected(pjsua_call_id call_id,
                                                const pjsip_uri *target,
@@ -1273 +1292 @@
     ua_cfg.cb.on_call_replaced          = &Endpoint::on_call_replaced;
     ua_cfg.cb.on_call_rx_offer          = &Endpoint::on_call_rx_offer;
+    ua_cfg.cb.on_call_tx_offer          = &Endpoint::on_call_tx_offer;
     ua_cfg.cb.on_call_redirected        = &Endpoint::on_call_redirected;
     ua_cfg.cb.on_call_media_transport_state =