Changeset 149:9cc01a01d84a in mediastreamer2

Timestamp:

Nov 3, 2008 2:42:53 PM (5 years ago)

Author:

smorlat <smorlat@…>

Branch:

default

Message:

fix tabs

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

Location:

linphone/mediastreamer2

Files:

• src/msv4l2.c (modified) (1 diff)
• src/nowebcam.c (modified) (5 diffs)
• tests/Makefile.am (modified) (1 diff)

linphone/mediastreamer2/src/msv4l2.c

@@ -129 +129 @@
                 return -1;
         }
+
+        ms_message("Driver is %s",cap.driver);
 
         if (v4lv2_try_format(s,V4L2_PIX_FMT_YUV420)){

linphone/mediastreamer2/src/nowebcam.c

@@ -139 +139 @@
 void static_image_preprocess(MSFilter *f){
         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);
-  }
+        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);
+        }
 }
 
@@ -152 +151 @@
         /*output a frame every second*/
         if ((f->ticker->time - d->lasttime>1000) || d->lasttime==0){
-    ms_mutex_lock(&f->lock);
+                ms_mutex_lock(&f->lock);
                 if (d->pic) {
                         mblk_t *o=dupb(d->pic);
@@ -159 +158 @@
                         ms_queue_put(f->outputs[0],o);
                 }
-    ms_mutex_unlock(&f->lock);
+                ms_mutex_unlock(&f->lock);
                 d->lasttime=f->ticker->time;
         }
@@ -194 +193 @@
         SIData *d=(SIData*)f->data;
         char *image = (char *)arg;
-  ms_mutex_lock(&f->lock);
+        ms_mutex_lock(&f->lock);
         if (image!=NULL && image[0]!='\0')
-          snprintf(d->nowebcamimage, sizeof(d->nowebcamimage), "%s", image);
+                snprintf(d->nowebcamimage, sizeof(d->nowebcamimage), "%s", image);
         else
-          d->nowebcamimage[0] = '\0';
-
-  if (d->pic!=NULL)
+                d->nowebcamimage[0] = '\0';
+
+        if (d->pic!=NULL)
                 freemsg(d->pic);
 
@@ -207 +206 @@
   //else
          // d->pic=ms_load_nowebcam(&d->vsize,d->index);
-  ms_mutex_unlock(&f->lock);
+        ms_mutex_unlock(&f->lock);
         return 0;
 }

linphone/mediastreamer2/tests/Makefile.am

@@ -23 +23 @@
         $(GSM_LIBS) \
         $(THEORA_LIBS) \
-        $(FFMPEG_LIBS)
+        $(VIDEO_LIBS)