Changeset 180:ecf35790a355 in mediastreamer2

Timestamp:

Nov 27, 2008 3:47:06 PM (4 years ago)

Author:

smorlat <smorlat@…>

Branch:

default

Message:

• allow setting of nowebcam and remote ring path

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

Location:

linphone

Files:

• coreapi/linphonecore.c (modified) (5 diffs)
• coreapi/linphonecore.h (modified) (1 diff)
• mediastreamer2/include/mediastreamer2/mswebcam.h (modified) (1 diff)
• mediastreamer2/src/nowebcam.c (modified) (7 diffs)
• oRTP/src/rtpsession.c (modified) (1 diff)

linphone/coreapi/linphonecore.c

@@ -51 +51 @@
 #define LOCAL_RING "rings/oldphone.wav"
 /* same for remote ring (ringback)*/
-#define REMOTE_RING_FR "ringback.wav"
-#define REMOTE_RING_US "ringback.wav"
+#define REMOTE_RING "ringback.wav" 
 
 
@@ -385 +384 @@
         linphone_core_set_ring(lc,tmpbuf);
         
-        tmpbuf=PACKAGE_SOUND_DIR "/" REMOTE_RING_FR;
+        tmpbuf=PACKAGE_SOUND_DIR "/" REMOTE_RING;
         tmpbuf=lp_config_get_string(lc->config,"sound","remote_ring",tmpbuf);
         if (access(tmpbuf,F_OK)==-1){
-                tmpbuf=PACKAGE_SOUND_DIR "/" REMOTE_RING_FR;
+                tmpbuf=PACKAGE_SOUND_DIR "/" REMOTE_RING;
         }
         if (strstr(tmpbuf,".wav")==NULL){
                 /* it currently uses old sound files, so replace them */
-                tmpbuf=PACKAGE_SOUND_DIR "/" REMOTE_RING_FR;
-        }
-        linphone_core_set_ringback(lc,0);
+                tmpbuf=PACKAGE_SOUND_DIR "/" REMOTE_RING;
+        }
+        linphone_core_set_ringback(lc,tmpbuf);
         check_sound_device(lc);
         lc->sound_conf.latency=0;
@@ -1763 +1762 @@
 }
 
-const char *linphone_core_get_ring(LinphoneCore *lc){
+const char *linphone_core_get_ring(const LinphoneCore *lc){
         return lc->sound_conf.local_ring;
 }
@@ -1787 +1786 @@
 
 
-void linphone_core_set_ringback(LinphoneCore *lc,RingBackType type){
-        switch(type){
-                case RINGBACK_TYPE_FR:
-                        lc->sound_conf.remote_ring=PACKAGE_SOUND_DIR "/" REMOTE_RING_FR;
-                break;
-                case RINGBACK_TYPE_US:
-                        lc->sound_conf.remote_ring=PACKAGE_SOUND_DIR "/" REMOTE_RING_US;
-                break;
-        }
-}
-RingBackType linphone_core_get_ringback(LinphoneCore *lc);
+void linphone_core_set_ringback(LinphoneCore *lc, const char *path){
+        if (lc->sound_conf.remote_ring!=0){
+                ms_free(lc->sound_conf.remote_ring);
+        }
+        lc->sound_conf.remote_ring=ms_strdup(path);
+}
+
+const char * linphone_core_get_ringback(const LinphoneCore *lc){
+        return lc->sound_conf.remote_ring;
+}
 
 void linphone_core_enable_echo_cancelation(LinphoneCore *lc, bool_t val){
@@ -2226 +2224 @@
         lp_config_set_int(lc->config,"sound","echocancelation",config->ec);
         if (config->local_ring) ms_free(config->local_ring);
+        if (config->remote_ring) ms_free(config->remote_ring);
 }
 

linphone/coreapi/linphonecore.h

@@ -653 +653 @@
 void linphone_core_set_sound_source(LinphoneCore *lc, char source);
 void linphone_core_set_ring(LinphoneCore *lc, const char *path);
-const char *linphone_core_get_ring(LinphoneCore *lc);
+const char *linphone_core_get_ring(const LinphoneCore *lc);
+void linphone_core_set_ringback(LinphoneCore *lc, const char *path);
+const char * linphone_core_get_ringback(const LinphoneCore *lc);
 int linphone_core_preview_ring(LinphoneCore *lc, const char *ring,LinphoneCoreCbFunc func,void * userdata);
-typedef enum {RINGBACK_TYPE_FR,RINGBACK_TYPE_US} RingBackType;
-void linphone_core_set_ringback(LinphoneCore *lc,RingBackType type);
-RingBackType linphone_core_get_ringback(LinphoneCore *lc);
 void linphone_core_enable_echo_cancelation(LinphoneCore *lc, bool_t val);
 bool_t linphone_core_echo_cancelation_enabled(LinphoneCore *lc);

linphone/mediastreamer2/include/mediastreamer2/mswebcam.h

@@ -218 +218 @@
 /** @} */
 
+
+/*specific methods for static image:*/
+
+void ms_static_image_set_default_image(const char *path);
+
 #ifdef __cplusplus
 }

linphone/mediastreamer2/src/nowebcam.c

@@ -97 +97 @@
 }
 
+
+
 #ifndef PACKAGE_DATA_DIR
 #define PACKAGE_DATA_DIR "."
@@ -104 +106 @@
 #define NOWEBCAM_JPG "nowebcamCIF"
 #endif
+
+static char *def_image=NULL;
+
+static const char *def_image_path=PACKAGE_DATA_DIR "/images/" NOWEBCAM_JPG ".jpg";
+
 
 mblk_t *ms_load_nowebcam(MSVideoSize *reqsize, int idx){
@@ -116 +123 @@
 typedef struct _SIData{
         MSVideoSize vsize;
-        char nowebcamimage[256];
-        int index;
+        char *nowebcamimage;
         uint64_t lasttime;
         mblk_t *pic;
@@ -126 +132 @@
         d->vsize.width=MS_VIDEO_SIZE_CIF_W;
         d->vsize.height=MS_VIDEO_SIZE_CIF_H;
-        memset(d->nowebcamimage, 0, sizeof(d->nowebcamimage));
-        d->index=-1;
+
+        if (def_image==NULL)
+                def_image=ms_strdup(def_image_path);
+
+        d->nowebcamimage=ms_strdup(def_image);
         d->lasttime=0;
         d->pic=NULL;
@@ -140 +149 @@
         SIData *d=(SIData*)f->data;
         if (d->pic==NULL){
-                if (d->nowebcamimage[0] != '\0')
-                        d->pic=ms_load_jpeg_as_yuv(d->nowebcamimage,&d->vsize);
-                else
-                        d->pic=ms_load_nowebcam(&d->vsize,d->index);
+                d->pic=ms_load_jpeg_as_yuv(d->nowebcamimage,&d->vsize);
         }
 }
@@ -190 +196 @@
 static int static_image_set_image(MSFilter *f, void *arg){
         SIData *d=(SIData*)f->data;
-        char *image = (char *)arg;
-        ms_mutex_lock(&f->lock);
+        const char *image = (const char *)arg;
+        ms_filter_lock(f);
+        if (d->nowebcamimage) ms_free(d->nowebcamimage);
         if (image!=NULL && image[0]!='\0')
-                snprintf(d->nowebcamimage, sizeof(d->nowebcamimage), "%s", image);
+                d->nowebcamimage=ms_strdup(image);
         else
-                d->nowebcamimage[0] = '\0';
-
-        if (d->pic!=NULL)
+                d->nowebcamimage = def_image;
+
+        if (d->pic!=NULL){
                 freemsg(d->pic);
-
-  //if (d->nowebcamimage[0] != '\0')
-         // d->pic=ms_load_jpeg_as_yuv(d->nowebcamimage,&d->vsize);
-  //else
-         // d->pic=ms_load_nowebcam(&d->vsize,d->index);
-        ms_mutex_unlock(&f->lock);
+                d->pic=NULL;
+        }
+
+        ms_filter_unlock(f);
         return 0;
 }
@@ -258 +263 @@
 }
 
+void ms_static_image_set_default_image(const char *path){
+        if (def_image!=NULL)
+                ms_free(def_image);
+        def_image=NULL;
+        if (path)
+                def_image=ms_strdup(path);
+}

linphone/oRTP/src/rtpsession.c

@@ -1365 +1365 @@
         rtp_stats_reset(&session->rtp.stats);
         rtp_session_resync(session);
+        session->ssrc_set=FALSE;
 }