Changeset 961:3ff451d1b61b in mediastreamer2

Timestamp:

May 10, 2010 9:25:56 PM (3 years ago)

Author:

unknown <smorlat@…>

Branch:

default

Message:

make some generic interfaces for filters doing the same thing
and propose a new "MSVideoOut" implementation avoiding multiples copies.

Files:

• include/mediastreamer2/allfilters.h (modified) (1 diff)
• include/mediastreamer2/msfilter.h (modified) (1 diff)
• include/mediastreamer2/msinterfaces.h (added)
• src/Makefile.am (modified) (1 diff)
• src/drawdib-display.c (added)
• src/videostream.c (modified) (4 diffs)

include/mediastreamer2/allfilters.h

@@ -91 +91 @@
         MS_JPEG_ENC_ID,
         MS_PULSE_READ_ID,
-        MS_PULSE_WRITE_ID
+        MS_PULSE_WRITE_ID,
+        MS_DRAWDIB_DISPLAY_ID
 } MSFilterId;
 

include/mediastreamer2/msfilter.h

@@ -461 +461 @@
 
 
+enum _MSFilterInterfaceId{
+        MSFilterInterfaceBegin=16384,
+        MSFilterPlayerInterface,
+        MSFilterRecorderInterface,
+        MSFilterVideoDisplayInterface,
+};
+
+typedef enum _MSFilterInterfaceId MSFilterInterfaceId;
+
+
 /* more specific methods: to be moved into implementation specific header files*/
 #define MS_FILTER_SET_FRAMESIZE         MS_FILTER_BASE_METHOD(11,int)

src/Makefile.am

@@ -105 +105 @@
 
 if BUILD_WIN32
-libmediastreamer_la_SOURCES+=msdscap-mingw.cc
+libmediastreamer_la_SOURCES+=msdscap-mingw.cc drawdib-display.c
 endif
 

src/videostream.c

@@ -138 +138 @@
 
 void video_stream_iterate(VideoStream *stream){
-        
+        /*
         if (stream->output!=NULL)
                 ms_filter_call_method_noarg(stream->output,
                         MS_VIDEO_OUT_HANDLE_RESIZING);
-        
+        */
         if (stream->evq){
                 OrtpEvent *ev=ortp_ev_queue_get(stream->evq);
@@ -245 +245 @@
         stream->source = ms_web_cam_create_reader(cam);
         stream->tee = ms_filter_new(MS_TEE_ID);
+#ifndef WIN32
         stream->output=ms_filter_new(MS_VIDEO_OUT_ID);
+#else
+        stream->output=ms_filter_new(MS_DRAWDIB_DISPLAY_ID);
+#endif
         stream->sizeconv=ms_filter_new(MS_SIZE_CONV_ID);
         
@@ -371 +375 @@
         /* creates the filters */
         stream->source = ms_web_cam_create_reader(device);
+#ifndef WIN32
         stream->output = ms_filter_new(MS_VIDEO_OUT_ID);
+#else
+        stream->output = ms_filter_new(MS_DRAWDIB_DISPLAY_ID);
+#endif
 
 
@@ -391 +399 @@
         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_OUT_ENABLE_MIRRORING,&mirroring);
-        ms_filter_call_method(stream->output,MS_VIDEO_OUT_SET_CORNER,&corner);
+        //ms_filter_call_method(stream->output,MS_VIDEO_OUT_ENABLE_MIRRORING,&mirroring);
+        //ms_filter_call_method(stream->output,MS_VIDEO_OUT_SET_CORNER,&corner);
         /* and then connect all */