Changeset 331:cd96ea6c4f98 in verona

Timestamp:

Oct 13, 2011 7:34:57 PM (21 months ago)

Author:

laurent <laurent@…>

Branch:

default

Message:

add qos callback

Files:

• phapi/phapi.c (modified) (3 diffs)
• phapi/phapi.h (modified) (2 diffs)
• phapi/phms.h (modified) (1 diff)
• phapi/phms_audiostream.c (modified) (1 diff)
• phcpp/phapipp.cpp (modified) (3 diffs)
• phcpp/phapipp.h (modified) (2 diffs)

phapi/phapi.c

@@ -183 +183 @@
 
 static void ph_frame_display_cbk(void *ctx, void *event);
+static void ph_qos_info_cbk(void *ctx, void *info);
 
 static int ph_call_media_stop(phcall_t * ca);
@@ -946 +947 @@
 }
 
+void ph_qos_info_cbk(void *ctx, void * info)
+{
+        phcall_t *ca = (phcall_t *)ctx;
+        phcb->qosEvent(ca->cid, (phQosInfo_t*)info);
+}
+
 void ph_frame_display_cbk(void *ctx, void *event)
 {
@@ -5227 +5234 @@
                 s->dtmfCallback = ph_wegot_dtmf;
                 s->endCallback = ph_stream_ended;
+                s->qosInfoCbk = ph_qos_info_cbk;
 
                 if (phcfg.vad & 0x80000000)

phapi/phapi.h

@@ -959 +959 @@
 };
 typedef struct phPicture  phPicture_t;
+
+struct phQosInfo
+{
+        int total_losses;
+        int loss_fraction;
+        int rtt;
+};
+typedef struct phQosInfo phQosInfo_t;
         
 /**
@@ -1058 +1066 @@
   void  (*errorNotify) (enum phErrors error);
   void  (*soundFileStopped) (void *userdata , unsigned int _id, void *arg);
+  void  (*qosEvent)(int cid, const phQosInfo_t * info);
 };
 typedef struct phCallbacks phCallbacks_t;

phapi/phms.h

@@ -201 +201 @@
         void (*endCallback)(void  *info, int event);
         void (*frameDisplayCbk)(void *info, void *event);
+        void (*qosInfoCbk)(void* info, void *event);
 
     /*

phapi/phms_audiostream.c

@@ -374 +374 @@
                         qos->data[newx].seqnum, qos->data[newx].total_losses, qos->data[newx].remote_jitter,
                         qos->data[newx].interval_losses, qos->data[newx].interval_packets, qos->data[newx].loss_fraction, qos->data[newx].rtt);
+        
+        phQosInfo_t info;
+        
+        info.total_losses = qos->data[newx].total_losses;
+        info.loss_fraction = qos->data[newx].loss_fraction;
+        info.rtt = qos->data[newx].rtt;
+        
+        
+        s->qosInfoCbk(s->cbkInfo, &info);
 
 }

phcpp/phapipp.cpp

@@ -489 +489 @@
 void phapi::onSoundFileStopped(void *userdata , unsigned int _id, void *arg){}
         
+void phapi::onQosEvent(int cid, const phQosInfo_t * info){}
+        
 void phapi::callProgress(int cid, const phCallStateInfo_t *info)
 {
@@ -574 +576 @@
 }
         
+void phapi::qosEvent(int cid, const phQosInfo_t * info)
+{
+        if (uniqueobj)
+                uniqueobj->onQosEvent(cid, info);
+}
+
 phCallbacks_t phapi::callbacks = {
                 phapi::callProgress,
@@ -588 +596 @@
                 phapi::phLogCsl,
 #endif /*!HAVE_CSL*/
-                phapi::soundFileStopped
+                phapi::soundFileStopped,
+                phapi::qosEvent
 };
 

phcpp/phapipp.h

@@ -211 +211 @@
         virtual void onPhLogCsl(const char *msg);
         virtual void onSoundFileStopped(void *userdata , unsigned int _id, void *arg);
+        virtual void onQosEvent(int cid, const phQosInfo_t * info);
 
 
@@ -229 +230 @@
         static void  phLogCsl(const char *msg);
         static void  soundFileStopped(void *userdata , unsigned int _id, void *arg);
+        static void  qosEvent(int cid, const phQosInfo_t * info);
 #endif