Changeset 875:df84c755d2d3 in mediastreamer2

Timestamp:

Feb 8, 2010 6:13:21 PM (3 years ago)

Author:

Aymeric Moizard <jack@…>

Branch:

default

Children:

876:90fbe2af7437, 878:192a99c1b51e, 884:599504ee6fa1

Message:

improve performance for msdisplay with selfview

Files:

• include/mediastreamer2/msvideoout.h (modified) (2 diffs)
• src/videoout.c (modified) (10 diffs)

include/mediastreamer2/msvideoout.h

@@ -43 +43 @@
         void (*lock)(struct _MSDisplay *);/*lock before writing to the framebuffer*/
         void (*unlock)(struct _MSDisplay *);/*unlock after writing to the framebuffer*/
-        void (*update)(struct _MSDisplay *); /*display the picture to the screen*/
+        void (*update)(struct _MSDisplay *, int new_image, int new_selfview); /*display the picture to the screen*/
         void (*uninit)(struct _MSDisplay *);
         bool_t (*pollevent)(struct _MSDisplay *, MSDisplayEvent *ev);
@@ -60 +60 @@
 #define ms_display_lock(d)      if ((d)->desc->lock) (d)->desc->lock(d)
 #define ms_display_unlock(d)    if ((d)->desc->unlock) (d)->desc->unlock(d)
-#define ms_display_update(d)    if ((d)->desc->update) (d)->desc->update(d)
+#define ms_display_update(d, A, B)      if ((d)->desc->update) (d)->desc->update(d, A, B)
+
 bool_t ms_display_poll_event(MSDisplay *d, MSDisplayEvent *ev);
 

src/videoout.c

@@ -201 +201 @@
 }
 
-static void sdl_display_update(MSDisplay *obj){
+static void sdl_display_update(MSDisplay *obj, int new_image, int new_selfview){
         SdlDisplay *wd = (SdlDisplay*)obj->data;
         SDL_Rect rect;
@@ -531 +531 @@
 }
 
-static void win_display_update(MSDisplay *obj){
+static void win_display_update(MSDisplay *obj, int new_image, int new_selfview){
         WinDisplay *wd=(WinDisplay*)obj->data;
         HDC hdc;
@@ -555 +555 @@
                 return;
         }
-        yuv420p_to_rgb(wd, &wd->fb, wd->rgb);
+        if (new_image>0)
+                yuv420p_to_rgb(wd, &wd->fb, wd->rgb);
         memset(&bi,0,sizeof(bi));
         bi.biSize=sizeof(bi);
@@ -656 +657 @@
                                 int x_sv;
                                 int y_sv;
-                                yuv420p_to_rgb_selfview(wd, &wd->fb_selfview, wd->rgb_selfview);
+                                if (new_selfview>0)
+                                        yuv420p_to_rgb_selfview(wd, &wd->fb_selfview, wd->rgb_selfview);
 
                                 //HPEN hpenDot;
@@ -709 +711 @@
                         reduce(&ratiow, &ratioh);
 
-                        yuv420p_to_rgb_selfview(wd, &wd->fb_selfview, wd->rgb_selfview);
+                        if (new_selfview>0)
+                                yuv420p_to_rgb_selfview(wd, &wd->fb_selfview, wd->rgb_selfview);
                         if (w_selfview >= w/sv_scalefactor)
                         {
@@ -1024 +1027 @@
         VideoOut *obj=(VideoOut*)f->data;
         mblk_t *inm;
+        int update=0;
+        int update_selfview=0;
 
         ms_filter_lock(f);
@@ -1058 +1063 @@
                                 if (!mblk_get_precious_flag(inm)) yuv_buf_mirror(&obj->fbuf_selfview);
                                 ms_display_unlock(obj->display);
+                                update_selfview=1;
                         }
                 }else{
@@ -1079 +1085 @@
                                         }
                                         if (!mblk_get_precious_flag(inm)) yuv_buf_mirror(&obj->local_pic);
+                                        update=1;
                                 }
                         }
@@ -1123 +1130 @@
                         ms_display_unlock(obj->display);
                 }
+                update=1;
                 ms_queue_flush(f->inputs[0]);
         }
@@ -1144 +1152 @@
         }
 
-        ms_display_update(obj->display);
+        ms_display_update(obj->display, update, update_selfview);
         ms_filter_unlock(f);
 }