Changeset 405:f33507802811 in mediastreamer2

Timestamp:

Apr 8, 2009 10:28:46 PM (4 years ago)

Author:

smorlat <smorlat@…>

Branch:

default

Message:

• merge patch to disable usage of REUSEADDR as a configure option
• implement reloading of soundcards and webcams.

git-svn-id: ​svn+ssh://svn.savannah.nongnu.org/linphone/trunk@408 3f6dc0c8-ddfe-455d-9043-3cd528dc4637

Location:

linphone

Files:

• mediastreamer2/include/mediastreamer2/mssndcard.h (modified) (2 diffs)
• mediastreamer2/include/mediastreamer2/mswebcam.h (modified) (7 diffs)
• mediastreamer2/src/mssndcard.c (modified) (3 diffs)
• mediastreamer2/src/mswebcam.c (modified) (4 diffs)
• oRTP/configure.ac (modified) (1 diff)
• oRTP/src/ortp-config-win32.h (modified) (1 diff)
• oRTP/src/rtpsession_inet.c (modified) (2 diffs)

linphone/mediastreamer2/include/mediastreamer2/mssndcard.h

@@ -40 +40 @@
 struct _MSSndCardManager{
         MSList *cards;
+        MSList *descs;
 };
 
@@ -207 +208 @@
 void ms_snd_card_manager_register_desc(MSSndCardManager *m, MSSndCardDesc *desc);
 
+/**
+ * Ask all registered MSSndCardDesc to re-detect their soundcards.
+ * @param m The sound card manager.
+**/
+void ms_snd_card_manager_reload(MSSndCardManager *m);
+
 /** @} */
 

linphone/mediastreamer2/include/mediastreamer2/mswebcam.h

@@ -40 +40 @@
 struct _MSWebCamManager{
         MSList *cams;
+        MSList *descs;
 };
 
@@ -95 +96 @@
 
 /**
- * Destroy a sound card manager object.
+ * Destroy the webcam manager object.
  *
  */
@@ -101 +102 @@
 
 /**
- * Retreive a sound card object based on its name.
- *
- * @param m    A sound card manager containing sound cards.
+ * Retreive a webcam object based on its name.
+ *
+ * @param m    A webcam manager containing webcam.
  * @param id   A name for card to search.
  *
@@ -111 +112 @@
 
 /**
- * Retreive the default sound card object.
- *
- * @param m    A sound card manager containing sound cards.
+ * Retreive the default webcam object.
+ *
+ * @param m    A webcam manager containing webcams.
  *
  * Returns: MSWebCam if successfull, NULL otherwise.
@@ -129 +130 @@
 
 /**
- * Add a sound card object in a webcam  manager's list.
+ * Add a webcam object in a webcam  manager's list.
  *
  * @param m    A webcam  manager containing webcams
@@ -138 +139 @@
 
 /**
- * Add a sound card object on top of list of the webcam  manager's list.
+ * Add a webcam object on top of list of the webcam  manager's list.
  *
  * @param m    A webcam  manager containing webcams
@@ -148 +149 @@
 
 /**
- * Register a sound card description in a sound card manager.
- *
- * @param m      A sound card manager containing sound cards.
- * @param desc   A sound card description object.
+ * Register a webcam descriptor in a webcam manager.
+ *
+ * @param m      A webcam manager containing sound cards.
+ * @param desc   A webcam descriptor object.
  *
  */
 void ms_web_cam_manager_register_desc(MSWebCamManager *m, MSWebCamDesc *desc);
 
+
+/**
+ * Ask all registered MSWebCamDesc to detect the webcams again.
+ *
+ * @param m A webcam manager
+**/
+void ms_web_cam_manager_reload(MSWebCamManager *m);
+
 /**
  * Create an INPUT filter based on the selected camera.
  *
- * @param obj      A sound card object.
+ * @param obj      A webcam object.
  *
  * Returns: A MSFilter if successfull, NULL otherwise.

linphone/mediastreamer2/src/mssndcard.c

@@ -28 +28 @@
         MSSndCardManager *obj=(MSSndCardManager *)ms_new(MSSndCardManager,1);
         obj->cards=NULL;
+        obj->descs=NULL;
         return obj;
 }
@@ -35 +36 @@
                 ms_list_for_each(scm->cards,(void (*)(void*))ms_snd_card_destroy);
                 ms_list_free(scm->cards);
+                ms_list_free(scm->descs);
         }
         ms_free(scm);
@@ -97 +99 @@
 }
 
-void ms_snd_card_manager_register_desc(MSSndCardManager *m, MSSndCardDesc *desc){
+static void card_detect(MSSndCardManager *m, MSSndCardDesc *desc){
         if (desc->detect!=NULL)
                 desc->detect(m);
+}
+
+void ms_snd_card_manager_register_desc(MSSndCardManager *m, MSSndCardDesc *desc){
+        m->descs=ms_list_append(m->descs,desc);
+        card_detect(m,desc);
+}
+
+void ms_snd_card_manager_reload(MSSndCardManager *m){
+        MSList *elem;
+        ms_list_for_each(m->cards,(void (*)(void*))ms_snd_card_destroy);
+        ms_list_free(m->cards);
+        m->cards=NULL;
+        for(elem=m->descs;elem!=NULL;elem=elem->next)
+                card_detect(m,(MSSndCardDesc*)elem->data);
 }
 

linphone/mediastreamer2/src/mswebcam.c

@@ -30 +30 @@
         MSWebCamManager *obj=(MSWebCamManager *)ms_new(MSWebCamManager,1);
         obj->cams=NULL;
+        obj->descs=NULL;
         return obj;
 }
@@ -37 +38 @@
                 ms_list_for_each(scm->cams,(void (*)(void*))ms_web_cam_destroy);
                 ms_list_free(scm->cams);
+                ms_list_free(scm->descs);
         }
         ms_free(scm);
@@ -59 +61 @@
 
 MSWebCam * ms_web_cam_manager_get_default_cam(MSWebCamManager *m){
-  if (m->cams!=NULL)
-        return (MSWebCam*)m->cams->data;
-  return NULL;
+        if (m->cams!=NULL)
+                return (MSWebCam*)m->cams->data;
+        return NULL;
 }
 
@@ -78 +80 @@
 }
 
-void ms_web_cam_manager_register_desc(MSWebCamManager *m, MSWebCamDesc *desc){
+static void cam_detect(MSWebCamManager *m, MSWebCamDesc *desc){
         if (desc->detect!=NULL)
                 desc->detect(m);
+}
+
+void ms_web_cam_manager_register_desc(MSWebCamManager *m, MSWebCamDesc *desc){
+        m->descs=ms_list_append(m->descs,desc);
+        cam_detect(m,desc);
+}
+
+void ms_web_cam_manager_reload(MSWebCamManager *m){
+        MSList *elem;
+        ms_list_for_each(m->cams,(void (*)(void*))ms_web_cam_destroy);
+        ms_list_free(m->cams);
+        m->cams=NULL;
+        for(elem=m->descs;elem!=NULL;elem=elem->next)
+                cam_detect(m,(MSWebCamDesc*)elem->data);
 }
 

linphone/oRTP/configure.ac

@@ -203 +203 @@
 fi
 
+AC_ARG_ENABLE(so-reuseaddr,
+                                [  --enable-so-reuseaddr=[yes/no]   enables SO_REUSEADDR socket option in the rtp_session_set_local_addr() function.],
+                                [case "${enableval}" in
+                                        yes) so_reuseaddr_enabled=yes;;
+                                        no) so_reuseaddr_enabled=no;;
+                                        *) AC_MSG_ERROR("Bad value for --enable-so-reuseaddr");;
+                                esac],
+                                [so_reuseaddr_enabled=yes])
+                                
+if test "$so_reuseaddr_enabled" = "yes" ; then
+        AC_DEFINE(SO_REUSE_ADDR,1,[Defined when SO_REUSEADDR socket option in the rtp_session_set_local_addr() function is enabled])
+fi
+
+
 dnl Checks for header files.
 AC_HEADER_STDC

linphone/oRTP/src/ortp-config-win32.h

@@ -30 +30 @@
 
 #define HAVE_SRTP 1
+
+/* enables SO_REUSEADDR socket option in the rtp_session_set_local_addr() function */
+#define SO_REUSE_ADDR 1

linphone/oRTP/src/rtpsession_inet.c

@@ -247 +247 @@
         ortp_socket_t sock;
         int sockfamily;
+        bool_t reuse_addr;
         if (session->rtp.socket>=0){
                 /* don't rebind, but close before*/
                 rtp_session_release_sockets(session);
         }
+#ifdef SO_REUSE_ADDR
+        reuse_addr=TRUE;
+#else
+        reuse_addr=FALSE;
+#endif
         /* try to bind the rtp port */
         if (port>0)
-                sock=create_and_bind(addr,port,&sockfamily,TRUE);
+                sock=create_and_bind(addr,port,&sockfamily,reuse_addr);
         else
                 sock=create_and_bind_random(addr,&sockfamily,&port);
@@ -262 +268 @@
                 session->rtp.loc_port=port;
                 /*try to bind rtcp port */
-                sock=create_and_bind(addr,port+1,&sockfamily,TRUE);
+                sock=create_and_bind(addr,port+1,&sockfamily,reuse_addr);
                 if (sock!=-1){
                         session->rtcp.sockfamily=sockfamily;