Changeset 143:00dddccb0111 in mediastreamer2 for linphone/mediastreamer2/src/nowebcam.c

Timestamp:

Nov 3, 2008 12:04:28 AM (5 years ago)

Author:

aymeric <aymeric@…>

Branch:

default

Message:

make SET_IMAGE usable by all video source filter

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

File:

• linphone/mediastreamer2/src/nowebcam.c (modified) (7 diffs)

linphone/mediastreamer2/src/nowebcam.c

@@ -116 +116 @@
 typedef struct _SIData{
         MSVideoSize vsize;
+        char nowebcamimage[256];
         int index;
         uint64_t lasttime;
@@ -125 +126 @@
         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;
         d->lasttime=0;
@@ -137 +139 @@
 void static_image_preprocess(MSFilter *f){
         SIData *d=(SIData*)f->data;
-        d->pic=ms_load_nowebcam(&d->vsize,d->index);
+  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);
+  }
 }
 
@@ -144 +152 @@
         /*output a frame every second*/
         if ((f->ticker->time - d->lasttime>1000) || d->lasttime==0){
+    ms_mutex_lock(&f->lock);
                 if (d->pic) {
                         mblk_t *o=dupb(d->pic);
@@ -150 +159 @@
                         ms_queue_put(f->outputs[0],o);
                 }
+    ms_mutex_unlock(&f->lock);
                 d->lasttime=f->ticker->time;
         }
@@ -176 +186 @@
 int static_image_get_pix_fmt(MSFilter *f, void *data){
         *(MSPixFmt*)data=MS_YUV420P;
+        return 0;
+}
+
+static int static_image_set_image(MSFilter *f, void *arg){
+        SIData *d=(SIData*)f->data;
+        char *image = (char *)arg;
+  ms_mutex_lock(&f->lock);
+        if (image!=NULL && image[0]!='\0')
+          snprintf(d->nowebcamimage, sizeof(d->nowebcamimage), "%s", image);
+        else
+          d->nowebcamimage[0] = '\0';
+
+  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);
         return 0;
 }
@@ -183 +213 @@
         {       MS_FILTER_GET_VIDEO_SIZE, static_image_get_vsize },
         {       MS_FILTER_GET_PIX_FMT, static_image_get_pix_fmt },
+        {       MS_FILTER_SET_IMAGE, static_image_set_image },
         {       0,0 }
 };