Changeset 965:6aad7bf5ca29 in mediastreamer2

Timestamp:

May 12, 2010 8:08:14 PM (3 years ago)

Author:

unknown <smorlat@…>

Branch:

default

Message:

add mirroring feature

Files:

• include/mediastreamer2/msinterfaces.h (modified) (1 diff)
• include/mediastreamer2/msvideo.h (modified) (1 diff)
• src/drawdib-display.c (modified) (9 diffs)
• src/msvideo.c (modified) (1 diff)

include/mediastreamer2/msinterfaces.h

@@ -27 +27 @@
 /** whether the video window should be resized to the stream's resolution*/
 #define MS_VIDEO_DISPLAY_ENABLE_AUTOFIT \
-        MS_FILTER_METHOD(MSFilterVideoDisplayInterface,0,bool_t)
+        MS_FILTER_METHOD(MSFilterVideoDisplayInterface,0,int)
 
 /**position of the local view */

include/mediastreamer2/msvideo.h

@@ -150 +150 @@
                 uint8_t *dst_planes[], const int dst_strides[3], MSVideoSize roi);
 void ms_yuv_buf_mirror(YuvBuf *buf);
+void rgb24_mirror(uint8_t *buf, int w, int h, int linesize);
 void rgb24_revert(uint8_t *buf, int w, int h, int linesize);
 void rgb24_copy_revert(uint8_t *dstbuf, int dstlsz,

src/drawdib-display.c

@@ -77 +77 @@
 
 
-static void yuv2rgb_process(Yuv2RgbCtx *ctx, MSPicture *src, MSVideoSize dstsize){
+static void yuv2rgb_process(Yuv2RgbCtx *ctx, MSPicture *src, MSVideoSize dstsize, bool_t mirroring){
         MSVideoSize srcsize;
         
@@ -94 +94 @@
                         ms_error("Error in 420->rgb ms_sws_scale().");
                 }
+                if (mirroring) rgb24_mirror(ctx->rgb,dstsize.width,dstsize.height,dstsize.width*3);
         }
 }
@@ -108 +109 @@
                 bi.biCompression=BI_RGB;
                 bi.biSizeImage=ctx->rgblen;
-                DrawDibDraw(ddh,hdc,dstx,dsty,ctx->dsize.width,ctx->dsize.height,&bi,ctx->rgb,
+                DrawDibDraw(ddh,hdc,dstx,dsty,-1,-1,&bi,ctx->rgb,
                         0,0,ctx->dsize.width,ctx->dsize.height,0);
         }
@@ -121 +122 @@
         Yuv2RgbCtx locview;
         bool_t need_repaint;
+        bool_t autofit;
+        bool_t mirroring;
 }DDDisplay;
 
@@ -209 +212 @@
         yuv2rgb_init(&obj->locview);
         obj->need_repaint=FALSE;
+        obj->autofit=TRUE;
+        obj->mirroring=FALSE;
         f->data=obj;
 }
@@ -353 +358 @@
         if (f->inputs[0]!=NULL && (main_im=ms_queue_peek_last(f->inputs[0]))!=NULL) {
                 if (yuv_buf_init_from_mblk(&mainpic,main_im)==0){
+                        if (obj->autofit && (obj->vsize.width!=mainpic.w || obj->vsize.height!=mainpic.h)
+                                && (mainpic.w>wsize.width || mainpic.h>wsize.height)){
+                                RECT cur;
+                                ms_message("Detected video resolution changed, resizing window");
+                                GetWindowRect(obj->window,&cur);
+                                wsize.width=mainpic.w;
+                                wsize.height=mainpic.h;
+                                MoveWindow(obj->window,cur.left, cur.top, wsize.width, wsize.height,TRUE);
+                        }
                         obj->vsize.width=mainpic.w;
                         obj->vsize.height=mainpic.h;
@@ -364 +378 @@
         
         if (local_im!=NULL)
-                yuv2rgb_process(&obj->locview,&localpic,lsize);
-        
+                yuv2rgb_process(&obj->locview,&localpic,lsize,!mblk_get_precious_flag(local_im));
+
         if (main_im!=NULL)
-                yuv2rgb_process(&obj->mainview,&mainpic,vsize);
+                yuv2rgb_process(&obj->mainview,&mainpic,vsize,obj->mirroring && !mblk_get_precious_flag(main_im));
 
         hdc=GetDC(obj->window);
@@ -385 +399 @@
         
         if (local_im!=NULL || main_im!=NULL){
-                draw_local_view_frame(hdc,wsize,localrect);
-                yuv2rgb_draw(&obj->locview,obj->ddh,hdc,localrect.x,localrect.y);
+                if (obj->locview.rgb!=NULL){
+                        draw_local_view_frame(hdc,wsize,localrect);
+                        yuv2rgb_draw(&obj->locview,obj->ddh,hdc,localrect.x,localrect.y);
+                }
         }
 
@@ -402 +418 @@
 }
 
+static int enable_autofit(MSFilter *f, void *data){
+        DDDisplay *obj=(DDDisplay*)f->data;
+        obj->autofit=*(int*)data;
+        return 0;
+}
+
+static int enable_mirroring(MSFilter *f, void *data){
+        DDDisplay *obj=(DDDisplay*)f->data;
+        obj->mirroring=*(int*)data;
+        return 0;
+}
+
 static MSFilterMethod methods[]={
         {       MS_VIDEO_DISPLAY_GET_NATIVE_WINDOW_ID, get_native_window_id },
+        {       MS_VIDEO_DISPLAY_ENABLE_AUTOFIT         ,       enable_autofit  },
+        {       MS_VIDEO_DISPLAY_ENABLE_MIRRORING       ,       enable_mirroring},
         {       0       ,NULL}
 };

src/msvideo.c

@@ -198 +198 @@
 }
 
+void rgb24_mirror(uint8_t *buf, int w, int h, int linesize){
+        int i,j;
+        int r,g,b;
+        int end=w*3;
+        for(i=0;i<h;++i){
+                for(j=0;j<end/2;j+=3){
+                        r=buf[j];
+                        g=buf[j+1];
+                        b=buf[j+2];
+                        buf[j]=buf[end-j-3];
+                        buf[j+1]=buf[end-j-2];
+                        buf[j+2]=buf[end-j-1];
+                        buf[end-j-3]=r;
+                        buf[end-j-2]=g;
+                        buf[end-j-1]=b;
+                }
+                buf+=linesize;
+        }
+}
+
 void rgb24_revert(uint8_t *buf, int w, int h, int linesize){
         uint8_t *p,*pe;