Changeset 964:5b7763190f86 in mediastreamer2

Timestamp:

May 12, 2010 6:37:38 PM (3 years ago)

Author:

unknown <smorlat@…>

Branch:

default

Message:

new display is now working

Location:

src

Files:

• drawdib-display.c (modified) (12 diffs)
• nowebcam.c (modified) (1 diff)
• videostream.c (modified) (4 diffs)

src/drawdib-display.c

@@ -27 +27 @@
 #include "ffmpeg-priv.h"
 
-#define SCALE_FACTOR 0.1f
+#define SCALE_FACTOR 0.16f
 #define SELVIEW_POS_INACTIVE -100.0
 #include <Vfw.h>
@@ -35 +35 @@
         size_t rgblen;
         MSVideoSize dsize;
+        MSVideoSize ssize;
         struct ms_SwsContext *sws;
 }Yuv2RgbCtx;
@@ -43 +44 @@
         ctx->dsize.width=0;
         ctx->dsize.height=0;
+        ctx->ssize.width=0;
+        ctx->ssize.height=0;
         ctx->sws=NULL;
 }
@@ -56 +59 @@
                 ctx->sws=NULL;
         }
+        ctx->dsize.width=0;
+        ctx->dsize.height=0;
+        ctx->ssize.width=0;
+        ctx->ssize.height=0;
 }
 
@@ -64 +71 @@
                         SWS_FAST_BILINEAR, NULL, NULL, NULL);
         ctx->dsize=dst;
+        ctx->ssize=src;
         ctx->rgblen=dst.width*dst.height*3;
-        ctx->rgb=ms_malloc0(ctx->rgblen);
+        ctx->rgb=ms_malloc0(ctx->rgblen+dst.width);
 }
 
 
 static void yuv2rgb_process(Yuv2RgbCtx *ctx, MSPicture *src, MSVideoSize dstsize){
-        if (!ms_video_size_equal(dstsize,ctx->dsize)){
-                MSVideoSize srcsize;
-                srcsize.width=src->w;
-                srcsize.height=src->h;
+        MSVideoSize srcsize;
+        
+        srcsize.width=src->w;
+        srcsize.height=src->h;
+        if (!ms_video_size_equal(dstsize,ctx->dsize) || !ms_video_size_equal(srcsize,ctx->ssize)){      
                 yuv2rgb_prepare(ctx,srcsize,dstsize);
         }
@@ -81 +90 @@
 
                 p=ctx->rgb+(dstsize.width*3*(dstsize.height-1));
-                
                 if (ms_sws_scale(ctx->sws,src->planes,src->strides, 0,
                                         src->h, &p, &rgb_stride)<0){
@@ -133 +141 @@
                                 
                                 if (wd!=NULL){
+                                        ms_message("Need repaint");
+                                        wd->need_repaint=TRUE;
                                         //wd->window_size.width=w;
                                         //wd->window_size.height=h;
@@ -240 +250 @@
 static void center_with_ratio(MSVideoSize wsize, MSVideoSize vsize, MSRect *rect){
         int w,h;
-        w=wsize.width & ~0x1;
+        w=wsize.width & ~0x3;
         h=((w*vsize.height)/vsize.width) & ~0x1;
         if (h>wsize.height){
                 /*the height doesn't fit, so compute the width*/
                 h=wsize.height & ~0x1;
-                w=((h*vsize.width)/vsize.height) & ~0x1;
+                w=((h*vsize.width)/vsize.height) & ~0x3;
         }
         rect->x=(wsize.width-w)/2;
@@ -260 +270 @@
         psize.height=wsize.height*SCALE_FACTOR;
         center_with_ratio(psize,orig_psize,localrect);
-        localrect->x=wsize.width-localrect->w;
-        localrect->y=wsize.height-localrect->h;
-
+        localrect->x=wsize.width-localrect->w-2;
+        localrect->y=wsize.height-localrect->h-2;
+/*
         ms_message("Compute layout result for\nwindow size=%ix%i\nvideo orig size=%ix%i\nlocal size=%ix%i\nlocal orig size=%ix%i\n"
                 "mainrect=%i,%i,%i,%i\tlocalrect=%i,%i,%i,%i",
@@ -268 +278 @@
                 mainrect->x,mainrect->y,mainrect->w,mainrect->h,
                 localrect->x,localrect->y,localrect->w,localrect->h);
+*/
+}
+
+static void draw_local_view_frame(HDC hdc, MSVideoSize wsize, MSRect localrect){
+        HGDIOBJ old_object = SelectObject(hdc, GetStockObject(WHITE_BRUSH)); 
+        Rectangle(hdc, localrect.x-2, localrect.y-2, localrect.x+localrect.w+2, localrect.y+localrect.h+2);
+        SelectObject(hdc,old_object);
 }
 
@@ -345 +362 @@
         lsize.width=localrect.w;
         lsize.height=localrect.h;
-
+        
         if (local_im!=NULL)
                 yuv2rgb_process(&obj->locview,&localpic,lsize);
+        
         if (main_im!=NULL)
                 yuv2rgb_process(&obj->mainview,&mainpic,vsize);
@@ -356 +374 @@
                 return;
         }
-        if (main_im){
-                yuv2rgb_draw(&obj->mainview,obj->ddh,hdc,mainrect.x,mainrect.y);
-        }
-        if (local_im){
-                yuv2rgb_draw(&obj->locview,obj->ddh,hdc,localrect.x,localrect.y);
-        }
+
         if (obj->need_repaint){
                 draw_background(hdc,wsize,mainrect);
                 obj->need_repaint=FALSE;
         }
+
+        if (main_im!=NULL){
+                yuv2rgb_draw(&obj->mainview,obj->ddh,hdc,mainrect.x,mainrect.y);
+        }
+        
+        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);
+        }
+
         ReleaseDC(NULL,hdc);
         if (main_im!=NULL)

src/nowebcam.c

@@ -1649 +1649 @@
         uint8_t *jpgbuf;
         int err;
+#ifndef WIN32
         int fd=open(jpgpath,O_RDONLY);
+#else
+        int fd=open(jpgpath,O_RDONLY|O_BINARY);
+#endif
         if (fd!=-1){
                 fstat(fd,&statbuf);

src/videostream.c

@@ -185 +185 @@
         stream->corner=val ? 0 : -1;
         if (out){
-                ms_filter_call_method(out,MS_VIDEO_OUT_SET_CORNER,&stream->corner);
+                ms_filter_call_method(out,MS_VIDEO_DISPLAY_SET_LOCAL_VIEW_CORNER,&stream->corner);
         }
 }
@@ -295 +295 @@
         tmp=1;
         ms_filter_call_method(stream->output,MS_FILTER_SET_VIDEO_SIZE,&disp_size);
-        ms_filter_call_method(stream->output,MS_VIDEO_OUT_AUTO_FIT,&tmp);
+        ms_filter_call_method(stream->output,MS_VIDEO_DISPLAY_ENABLE_AUTOFIT,&tmp);
         ms_filter_call_method(stream->output,MS_FILTER_SET_PIX_FMT,&format);
-        ms_filter_call_method(stream->output,MS_VIDEO_OUT_SET_CORNER,&stream->corner);
+        ms_filter_call_method(stream->output,MS_VIDEO_DISPLAY_SET_LOCAL_VIEW_CORNER,&stream->corner);
 
         if (pt->recv_fmtp!=NULL)
@@ -358 +358 @@
         unsigned long id;
         if (stream->output){
-                if (ms_filter_call_method(stream->output,MS_VIDEO_OUT_GET_NATIVE_WINDOW_ID,&id)==0)
+                if (ms_filter_call_method(stream->output,MS_VIDEO_DISPLAY_GET_NATIVE_WINDOW_ID,&id)==0)
                         return id;
         }
@@ -555 +555 @@
                 return -1;
         }
+#ifndef WIN32
         stream->output=ms_filter_new(MS_VIDEO_OUT_ID);
-
+#else
+        stream->output=ms_filter_new(MS_DRAWDIB_DISPLAY_ID);
+#endif
         /*force the decoder to output YUV420P */
         format=MS_YUV420P;