Changeset 1025:3ed6c7d0365d in mediastreamer2

Timestamp:

Jun 28, 2010 12:38:57 PM (3 years ago)

Author:

Simon Morlat <simon.morlat@…>

Branch:

default

Message:

allow overide of display filters, echo canceler in progress

Files:

• include/mediastreamer2/mediastream.h (modified) (2 diffs)
• src/speexec.c (modified) (3 diffs)
• src/videostream.c (modified) (7 diffs)

include/mediastreamer2/mediastream.h

@@ -182 +182 @@
         VideoStreamRenderCallback rendercb;
         void *render_pointer;
+        char *display_name;
         bool_t adapt_bitrate;
 };
@@ -190 +191 @@
 void video_stream_enable_adaptive_bitrate_control(VideoStream *s, bool_t yesno);
 void video_stream_set_render_callback(VideoStream *s, VideoStreamRenderCallback cb, void *user_pointer);
+void video_stream_set_display_filter_name(VideoStream *s, const char *fname);
 int video_stream_start(VideoStream * stream, RtpProfile *profile, const char *remip, int remport, int rem_rtcp_port,
                 int payload, int jitt_comp, MSWebCam *device);

src/speexec.c

@@ -113 +113 @@
         int nbytes=s->framesize*2;
         mblk_t *refm;
-        int ref_samples=0;
         uint8_t *ref,*echo;
         int size;
@@ -119 +118 @@
         if (f->inputs[0]!=NULL){
                 while((refm=ms_queue_get(f->inputs[0]))!=NULL){
-                        mblk_t *cp=copymsg(refm);
-                        ref_samples+=msgdsize(refm)/2;
+                        mblk_t *cp=dupmsg(refm);
                         ms_bufferizer_put(&s->ref,refm);
                         ms_bufferizer_put(&s->delayed_ref,cp);
@@ -133 +131 @@
                 }
         }
+
+        ms_message("echo bytes=%i, ref bytes=%i",ms_bufferizer_get_avail(&s->echo),
+                   ms_bufferizer_get_avail(&s->ref));
         
         ref=(uint8_t*)alloca(nbytes);

src/videostream.c

@@ -62 +62 @@
         if (stream->evq!=NULL)
                 ortp_ev_queue_destroy(stream->evq);
+        if (stream->display_name!=NULL)
+                ms_free(stream->display_name);
+        
         ms_free (stream);
 }
@@ -163 +166 @@
 }
 
+static void choose_display_name(VideoStream *stream){
+#ifdef WIN32
+        stream->display_name=ms_strdup("MSDrawDibDisplay");
+#else
+        stream->display_name=ms_strdup("MSVideoOut");
+#endif
+}
+
 VideoStream *video_stream_new(int locport, bool_t use_ipv6){
         VideoStream *stream = (VideoStream *)ms_new0 (VideoStream, 1);
@@ -171 +182 @@
         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_stream_set_sent_video_size(VideoStream *stream, MSVideoSize vsize){
-  ms_message("Setting video size %dx%d", vsize.width, vsize.height);
+        ms_message("Setting video size %dx%d", vsize.width, vsize.height);
         stream->sent_vsize=vsize;
 }
@@ -198 +211 @@
         s->rendercb=cb;
         s->render_pointer=user_pointer;
+}
+
+void video_stream_set_display_filter_name(VideoStream *s, const char *fname){
+        if (s->display_name!=NULL){
+                ms_free(s->display_name);
+                s->display_name=NULL;
+        }
+        if (fname!=NULL)
+                s->display_name=ms_strdup(fname);
 }
 
@@ -267 +289 @@
                 ms_filter_set_notify_callback (stream->output,ext_display_cb,stream);
         }else{
-#ifndef WIN32
-                stream->output=ms_filter_new(MS_VIDEO_OUT_ID);
-#else
-                stream->output=ms_filter_new(MS_DRAWDIB_DISPLAY_ID);
-#endif
+                stream->output=ms_filter_new_from_name (stream->display_name);
         }
 
@@ -398 +416 @@
 
         /* creates the filters */
+        choose_display_name(stream);
         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
-
+        stream->output=ms_filter_new_from_name (stream->display_name);
 
         /* configure the filters */
@@ -580 +594 @@
                 return -1;
         }
-#ifndef WIN32
-        stream->output=ms_filter_new(MS_VIDEO_OUT_ID);
-#else
-        stream->output=ms_filter_new(MS_DRAWDIB_DISPLAY_ID);
-#endif
+        stream->output=ms_filter_new_from_name (stream->display_name);
         /*force the decoder to output YUV420P */
         format=MS_YUV420P;