Changeset 959:e3d6dc21f753 in mediastreamer2

Timestamp:

May 10, 2010 3:30:31 PM (3 years ago)

Author:

unknown <smorlat@…>

Branch:

default

Children:

960:c7db549fdf08, 961:3ff451d1b61b

Message:

don't set fps when static image is used

Location:

src

Files:

• nowebcam.c (modified) (1 diff)
• videostream.c (modified) (2 diffs)

src/nowebcam.c

@@ -1669 +1669 @@
                 err=read(fd,jpgbuf,statbuf.st_size);
                 if (err!=statbuf.st_size){
-                          ms_error("Could not read as much as wanted !");
+                        ms_error("Could not read as much as wanted: %i<>%i !",err,statbuf.st_size);
                 }
                 m=jpeg2yuv(jpgbuf,statbuf.st_size,reqsize);

src/videostream.c

@@ -263 +263 @@
         ms_message("Setting vsize=%ix%i, fps=%f",vsize.width,vsize.height,fps);
         /* configure the filters */
-        ms_filter_call_method(stream->source,MS_FILTER_SET_FPS,&fps);
+        if (ms_filter_get_id(stream->source)!=MS_STATIC_IMAGE_ID)
+                ms_filter_call_method(stream->source,MS_FILTER_SET_FPS,&fps);
         ms_filter_call_method(stream->source,MS_FILTER_SET_VIDEO_SIZE,&vsize);
 
@@ -375 +376 @@
         /* configure the filters */
         ms_filter_call_method(stream->source,MS_FILTER_SET_VIDEO_SIZE,&vsize);
-        ms_filter_call_method(stream->source,MS_FILTER_SET_FPS,&fps);
+        if (ms_filter_get_id(stream->source)!=MS_STATIC_IMAGE_ID)
+                ms_filter_call_method(stream->source,MS_FILTER_SET_FPS,&fps);
         ms_filter_call_method(stream->source,MS_FILTER_GET_PIX_FMT,&format);
         ms_filter_call_method(stream->source,MS_FILTER_GET_VIDEO_SIZE,&vsize);