Changeset 704:ca4d7f83b4c0 in mediastreamer2

Timestamp:

Oct 2, 2009 5:02:24 PM (4 years ago)

Author:

aymeric <aymeric@…>

Branch:

default

Message:

fix windows display to keep ratio and fill with black.

git-svn-id: ​svn+ssh://svn.savannah.nongnu.org/linphone/trunk@692 3f6dc0c8-ddfe-455d-9043-3cd528dc4637

File:

• linphone/mediastreamer2/src/videoout.c (modified) (8 diffs)

linphone/mediastreamer2/src/videoout.c

@@ -255 +255 @@
         MSDisplayEvent last_rsz;
         uint8_t *rgb;
+        uint8_t *black;
+        int last_rect_w;
+        int last_rect_h;
         int rgb_len;
         struct SwsContext *sws;
@@ -347 +350 @@
                 wd->fb.planes[3]=NULL;
                 if (wd->rgb) ms_free(wd->rgb);
+                if (wd->black) ms_free(wd->black);
                 wd->rgb=NULL;
+                wd->black=NULL;
                 wd->rgb_len=0;
                 sws_freeContext(wd->sws);
                 wd->sws=NULL;
+                wd->last_rect_w=0;
+                wd->last_rect_h=0;
         }
         else
@@ -390 +397 @@
         if (wd->fb.planes[0]) ms_free(wd->fb.planes[0]);
         if (wd->rgb) ms_free(wd->rgb);
+        if (wd->black) ms_free(wd->black);
         ysize=wd->fb.w*wd->fb.h;
         usize=ysize/4;
@@ -403 +411 @@
         wd->rgb_len=ysize*3;
         wd->rgb=(uint8_t*)ms_malloc0(wd->rgb_len);
+        wd->black = (uint8_t*)ms_malloc0(wd->rgb_len);
+        wd->last_rect_w=0;
+        wd->last_rect_h=0;
         return TRUE;
 }
@@ -430 +441 @@
                 ms_error("Error in 420->rgb sws_scale().");
         }
+}
+
+int gcd(int m, int n)
+{
+   if(n == 0)
+     return m;
+   else
+     return gcd(n, m % n);
+}
+   
+void reduce(int *num, int *denom)
+{
+   int divisor = gcd(*num, *denom);
+   *num /= divisor;
+   *denom /= divisor;
 }
 
@@ -448 +474 @@
         bi.biSize=sizeof(bi);
         GetClientRect(wd->window,&rect);
-        /*
-        bi.biWidth=wd->fb.w;
-        bi.biHeight=wd->fb.h;
-        bi.biPlanes=3;
-        bi.biBitCount=12;
-        bi.biCompression=MAKEFOURCC('I','4','2','0');
-        bi.biSizeImage=(wd->fb.w*wd->fb.h*3)/2;
-        */
+
         bi.biWidth=wd->fb.w;
         bi.biHeight=wd->fb.h;
@@ -463 +482 @@
         bi.biSizeImage=wd->rgb_len;
 
-        //if (bi.biHeight>rect.bottom)
-        //      bi.biHeight=rect.bottom;
-        //bi.biSizeImage=(bi.biWidth*bi.biHeight)*3;
-
-        ret=DrawDibDraw(wd->ddh,hdc,0,0,
-                //bi.biWidth,bi.biHeight,
-                rect.right,rect.bottom,
+        if (wd->last_rect_w!=rect.right || wd->last_rect_h!=rect.bottom)
+        {
+                ret=DrawDibDraw(wd->ddh,hdc,00,00,
+                        rect.right,rect.bottom,
+                        &bi,wd->black,
+                        0,0,bi.biWidth,bi.biHeight,0);
+                wd->last_rect_w=rect.right;
+                wd->last_rect_h=rect.bottom;
+        }
+
+        int ratiow=wd->fb.w;
+        int ratioh=wd->fb.h;
+        reduce(&ratiow, &ratioh);
+        int w = rect.right/ratiow*ratiow;
+        int h = rect.bottom/ratioh*ratioh;
+
+        if (h*ratiow>w*ratioh)
+        {
+                w = w;
+                h = w*ratioh/ratiow;
+        }
+        else
+        {
+                h = h;
+                w = h*ratiow/ratioh;
+        }
+
+        if (h*wd->fb.w!=w*wd->fb.h)
+                ms_error("wrong ratio");
+
+        ret=DrawDibDraw(wd->ddh,hdc,
+                rect.right/2-(w/2),
+                rect.bottom/2-(h/2),
+                w,
+                h,
                 &bi,wd->rgb,
-                //0,0,rect.right,rect.bottom,0);
                 0,0,bi.biWidth,bi.biHeight,0);
+
         
         if (!ret) ms_error("DrawDibDraw failed.");
@@ -486 +533 @@
         if (wd->fb.planes[0]) ms_free(wd->fb.planes[0]);
         if (wd->rgb) ms_free(wd->rgb);
+        if (wd->black) ms_free(wd->black);
         if (wd->sws) sws_freeContext(wd->sws);
         ms_free(wd);