Changeset 1156:189d790f3854 in mediastreamer2

Timestamp:

Sep 26, 2010 1:01:34 PM (3 years ago)

Author:

Simon Morlat <simon.morlat@…>

Branch:

default

Message:

implement changing of camera source

Files:

• include/mediastreamer2/mediastream.h (modified) (1 diff)
• src/videostream.c (modified) (4 diffs)

include/mediastreamer2/mediastream.h

@@ -211 +211 @@
 void video_stream_set_relay_session_id(VideoStream *stream, const char *relay_session_id);
 void video_stream_set_rtcp_information(VideoStream *st, const char *cname, const char *tool);
+void video_stream_change_camera(VideoStream *stream, MSWebCam *cam);
 /*function to call periodically to handle various events */
 void video_stream_iterate(VideoStream *stream);

src/videostream.c

@@ -237 +237 @@
 }
 
+static void configure_video_source(VideoStream *stream){
+        MSVideoSize vsize,cam_vsize;
+        float fps=15;
+        MSPixFmt format;
+        
+        ms_filter_call_method(stream->encoder,MS_FILTER_GET_VIDEO_SIZE,&vsize);
+        vsize=ms_video_size_min(vsize,stream->sent_vsize);
+        ms_filter_call_method(stream->encoder,MS_FILTER_SET_VIDEO_SIZE,&vsize);
+        ms_filter_call_method(stream->encoder,MS_FILTER_GET_FPS,&fps);
+        ms_message("Setting sent vsize=%ix%i, fps=%f",vsize.width,vsize.height,fps);
+        /* configure the filters */
+        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);
+        /* get the output format for webcam reader */
+        ms_filter_call_method(stream->source,MS_FILTER_GET_PIX_FMT,&format);
+        if (format==MS_MJPEG){
+                stream->pixconv=ms_filter_new(MS_MJPEG_DEC_ID);
+        }else{
+                stream->pixconv = ms_filter_new(MS_PIX_CONV_ID);
+                /*set it to the pixconv */
+                ms_filter_call_method(stream->pixconv,MS_FILTER_SET_PIX_FMT,&format);
+                ms_filter_call_method(stream->source,MS_FILTER_GET_VIDEO_SIZE,&cam_vsize);
+                ms_filter_call_method(stream->pixconv,MS_FILTER_SET_VIDEO_SIZE,&cam_vsize);
+        }
+        stream->sizeconv=ms_filter_new(MS_SIZE_CONV_ID);
+        ms_filter_call_method(stream->sizeconv,MS_FILTER_SET_VIDEO_SIZE,&vsize);
+}
+
 int video_stream_start (VideoStream *stream, RtpProfile *profile, const char *remip, int remport,
         int rem_rtcp_port, int payload, int jitt_comp, MSWebCam *cam){
@@ -242 +272 @@
         RtpSession *rtps=stream->session;
         MSPixFmt format;
-        MSVideoSize vsize,cam_vsize,disp_size;
-        float fps=15;
+        MSVideoSize disp_size;
         int tmp;
         JBParameters jbp;
@@ -296 +325 @@
                         ms_filter_call_method(stream->encoder,MS_FILTER_ADD_FMTP,pt->send_fmtp);
                 }
-                ms_filter_call_method(stream->encoder,MS_FILTER_GET_VIDEO_SIZE,&vsize);
-                vsize=ms_video_size_min(vsize,stream->sent_vsize);
-                ms_filter_call_method(stream->encoder,MS_FILTER_SET_VIDEO_SIZE,&vsize);
-                ms_filter_call_method(stream->encoder,MS_FILTER_GET_FPS,&fps);
-                ms_message("Setting sent vsize=%ix%i, fps=%f",vsize.width,vsize.height,fps);
-                /* configure the filters */
-                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);
-                /* get the output format for webcam reader */
-                ms_filter_call_method(stream->source,MS_FILTER_GET_PIX_FMT,&format);
-                if (format==MS_MJPEG){
-                        stream->pixconv=ms_filter_new(MS_MJPEG_DEC_ID);
-                }else{
-                        stream->pixconv = ms_filter_new(MS_PIX_CONV_ID);
-                        /*set it to the pixconv */
-                        ms_filter_call_method(stream->pixconv,MS_FILTER_SET_PIX_FMT,&format);
-                        ms_filter_call_method(stream->source,MS_FILTER_GET_VIDEO_SIZE,&cam_vsize);
-                        ms_filter_call_method(stream->pixconv,MS_FILTER_SET_VIDEO_SIZE,&cam_vsize);
-                }
-                stream->sizeconv=ms_filter_new(MS_SIZE_CONV_ID);
-                ms_filter_call_method(stream->sizeconv,MS_FILTER_SET_VIDEO_SIZE,&vsize);
+                configure_video_source (stream);
                         /* and then connect all */
                 ms_filter_link (stream->source, 0, stream->pixconv, 0);
@@ -380 +387 @@
                 ms_ticker_attach (stream->ticker, stream->rtprecv);
         return 0;
+}
+
+void video_stream_change_camera(VideoStream *stream, MSWebCam *cam){
+        if (stream->ticker && stream->source){
+                ms_ticker_detach(stream->ticker,stream->source);
+                /*unlink source filters and subsequent post processin filters */
+                ms_filter_unlink (stream->source, 0, stream->pixconv, 0);
+                ms_filter_unlink (stream->pixconv, 0, stream->sizeconv, 0);
+                ms_filter_unlink (stream->sizeconv, 0, stream->tee, 0);
+                /*destroy the filters */
+                ms_filter_destroy(stream->source);
+                ms_filter_destroy(stream->pixconv);
+                ms_filter_destroy(stream->sizeconv);
+
+                /*re create new ones and configure them*/
+                stream->source = ms_web_cam_create_reader(cam);
+                configure_video_source(stream);
+                
+                ms_ticker_attach(stream->ticker,stream->source);
+        }
 }