Changeset 1172:e577e30d6f73 in mediastreamer2

Timestamp:

Oct 12, 2010 9:43:01 PM (3 years ago)

Author:

Simon Morlat <simon.morlat@…>

Branch:

default

Children:

1173:6b4faa54125b, 1188:27fdd2536b36

Message:

use 2 windows, bugfixes

Files:

• include/mediastreamer2/mediastream.h (modified) (1 diff)
• src/videostream.c (modified) (5 diffs)
• src/x11video.c (modified) (2 diffs)
• tests/Makefile.am (modified) (2 diffs)
• tests/test_x11window.c (added)
• tests/videodisplay.c (modified) (1 diff)

include/mediastreamer2/mediastream.h

@@ -238 +238 @@
 void video_stream_send_only_stop(VideoStream *vs);
 
-VideoStream * video_preview_start(MSWebCam *device, MSVideoSize disp_size, const char *displaytype);
-void video_preview_stop(VideoStream *stream);
+typedef VideoStream VideoPreview;
+
+VideoPreview * video_preview_new();
+#define video_preview_set_size(p,s)                                                     video_stream_set_sent_video_size(p,s)
+#define video_preview_set_display_filter_name(p,dt)     video_stream_set_display_filter_name(p,dt)
+#define video_preview_set_native_window_id(p,id)                video_stream_set_native_preview_window_id (p,id)
+#define video_preview_get_native_window_id(p)                   video_stream_get_native_preview_window_id (p)
+void video_preview_start(VideoPreview *stream, MSWebCam *device);
+void video_preview_stop(VideoPreview *stream);
 
 bool_t ms_is_ipv6(const char *address);

src/videostream.c

@@ -514 +514 @@
 
 unsigned long video_stream_get_native_preview_window_id(VideoStream *stream){
-        unsigned long id;
-        if (stream->output){
-                if (ms_filter_call_method(stream->output,MS_VIDEO_DISPLAY_GET_NATIVE_WINDOW_ID,&id)==0)
+        unsigned long id=0;
+        if (stream->output2){
+                if (ms_filter_call_method(stream->output2,MS_VIDEO_DISPLAY_GET_NATIVE_WINDOW_ID,&id)==0)
                         return id;
         }
@@ -526 +526 @@
 }
 
-
-VideoStream * video_preview_start(MSWebCam *device, MSVideoSize disp_size, const char *displaytype){
-        VideoStream *stream = (VideoStream *)ms_new0 (VideoStream, 1);
-        MSVideoSize vsize=disp_size;
+VideoPreview * video_preview_new(void){
+        VideoPreview *stream = (VideoPreview *)ms_new0 (VideoPreview, 1);
+        stream->sent_vsize.width=MS_VIDEO_SIZE_CIF_W;
+        stream->sent_vsize.height=MS_VIDEO_SIZE_CIF_H;
+        choose_display_name(stream);
+        return stream;
+}
+
+
+void video_preview_start(VideoPreview *stream, MSWebCam *device){
         MSPixFmt format;
         float fps=(float)29.97;
         int mirroring=1;
         int corner=-1;
-
-        /* creates the filters */
-        if(!displaytype)
-                choose_display_name(stream);
-        else
-                video_stream_set_display_filter_name(stream,displaytype);
+        MSVideoSize disp_size=stream->sent_vsize;
+        MSVideoSize vsize=disp_size;
+        const char *displaytype=stream->display_name;
+
         stream->source = ms_web_cam_create_reader(device);
 
-        stream->output=ms_filter_new_from_name (stream->display_name);
+        stream->output2=ms_filter_new_from_name (displaytype);
 
         /* configure the filters */
@@ -559 +563 @@
 
         format=MS_YUV420P;
-        ms_filter_call_method(stream->output,MS_FILTER_SET_PIX_FMT,&format);
-        ms_filter_call_method(stream->output,MS_FILTER_SET_VIDEO_SIZE,&disp_size);
-        ms_filter_call_method(stream->output,MS_VIDEO_DISPLAY_ENABLE_MIRRORING,&mirroring);
-        ms_filter_call_method(stream->output,MS_VIDEO_DISPLAY_SET_LOCAL_VIEW_MODE,&corner);
+        ms_filter_call_method(stream->output2,MS_FILTER_SET_PIX_FMT,&format);
+        ms_filter_call_method(stream->output2,MS_FILTER_SET_VIDEO_SIZE,&disp_size);
+        ms_filter_call_method(stream->output2,MS_VIDEO_DISPLAY_ENABLE_MIRRORING,&mirroring);
+        ms_filter_call_method(stream->output2,MS_VIDEO_DISPLAY_SET_LOCAL_VIEW_MODE,&corner);
+        if (stream->preview_window_id!=0){
+                ms_filter_call_method(stream->output2, MS_VIDEO_DISPLAY_SET_NATIVE_WINDOW_ID,&stream->preview_window_id);
+        }
         /* and then connect all */
 
         ms_filter_link(stream->source,0, stream->pixconv,0);
-        ms_filter_link(stream->pixconv, 0, stream->output, 0);
+        ms_filter_link(stream->pixconv, 0, stream->output2, 0);
 
         /* create the ticker */
@@ -572 +579 @@
         ms_ticker_set_name(stream->ticker,"Video MSTicker");
         ms_ticker_attach (stream->ticker, stream->source);
-        return stream;
 }
 
@@ -578 +584 @@
         ms_ticker_detach(stream->ticker, stream->source);
         ms_filter_unlink(stream->source,0,stream->pixconv,0);
-        ms_filter_unlink(stream->pixconv,0,stream->output,0);
+        ms_filter_unlink(stream->pixconv,0,stream->output2,0);
         
         video_stream_free(stream);

src/x11video.c

@@ -176 +176 @@
                 if (s->window_id==0) return;
                 s->own_window=TRUE;
+        }else if (s->own_window==FALSE){
+                /*we need to register for resize events*/
+                XSelectInput(s->display,s->window_id,StructureNotifyMask);
         }
         XGetWindowAttributes(s->display,s->window_id,&wa);
@@ -516 +519 @@
         unsigned long *id=(unsigned long*)arg;
         *id=s->window_id;
-        return -1;
+        return 0;
 }
 

tests/Makefile.am

@@ -4 +4 @@
 
 if BUILD_VIDEO
-noinst_PROGRAMS+=videodisplay
+noinst_PROGRAMS+=videodisplay test_x11window
 endif
+
+
 
 echo_SOURCES=echo.c
@@ -12 +14 @@
 mtudiscover_SOURCES=mtudiscover.c
 bench_SOURCES=bench.c
+test_x11window_SOURCES=test_x11window.c
+
 
 libexec_PROGRAMS=mediastream

tests/videodisplay.c

@@ -48 +48 @@
         for(i=0;i<1;++i){
                 int n;
-                vs=video_preview_start(cam,vsize,NULL);
+                vs=video_preview_new();
+                video_preview_set_size(vs,vsize);
+                video_preview_start(vs, cam);
 
         for(n=0;n<60000 && !stopped;++n){