Changeset 924:570ec8455bb3 in mediastreamer2

Timestamp:

Mar 25, 2010 1:51:22 PM (3 years ago)

Author:

Simon Morlat <simon.morlat@…>

Branch:

default

Message:

allow dynamic change of nowebcam images.

File:

• src/nowebcam.c (modified) (3 diffs)

src/nowebcam.c

@@ -1752 +1752 @@
         /*output a frame every second*/
         if ((f->ticker->time - d->lasttime>1000) || d->lasttime==0){
-                ms_mutex_lock(&f->lock);
+                ms_filter_lock(f);
                 if (d->pic) {
                         mblk_t *o=dupb(d->pic);
@@ -1759 +1759 @@
                         ms_queue_put(f->outputs[0],o);
                 }
-                ms_mutex_unlock(&f->lock);
+                ms_filter_unlock(f);
                 d->lasttime=f->ticker->time;
         }
@@ -1800 +1800 @@
 
         if (d->pic!=NULL){
+                /* Get rid of the old image and force a new preprocess so that the
+                         new image is properly read. */
                 freemsg(d->pic);
                 d->pic=NULL;
+                static_image_preprocess(f);
         }