modules/video_output/win32/wingdi.c

@@ -61,21 +61,21 @@ typedef struct vout_display_sys_t
 {
     display_win32_area_t     area;
 
-    int  i_depth;
-
     /* Our offscreen bitmap and its framebuffer */
     HDC        off_dc;
     HBITMAP    off_bitmap;
 
-    void    *p_pic_buffer;
-    int     i_pic_pitch;
-
-    struct
-    {
-        BITMAPINFO bitmapinfo;
-        RGBQUAD    red;
-        RGBQUAD    green;
-        RGBQUAD    blue;
+    plane_t    pic_buf;
+
+    union {
+        BITMAPINFO bmiInfo;
+        struct
+        {
+            BITMAPINFOHEADER bmiHeader;
+            RGBQUAD          red;
+            RGBQUAD          green;
+            RGBQUAD          blue;
+        } bi_rgb;
     };
 } vout_display_sys_t;
 
@@ -84,15 +84,68 @@ static void           Display(vout_display_t *, picture_t *);
 static int            Init(vout_display_t *, video_format_t *);
 static void           Clean(vout_display_t *);
 
+static int ChangeSize(vout_display_t *vd, HDC hdc)
+{
+    vout_display_sys_t *sys = vd->sys;
+
+    // clear the background, even if creating the writable buffer fails
+    RECT display = {
+        .left   = 0,
+        .right  = vd->cfg->display.width,
+        .top    = 0,
+        .bottom = vd->cfg->display.height,
+    };
+    FillRect(hdc, &display, GetStockObject(BLACK_BRUSH));
+
+    BITMAPINFOHEADER *bih = &sys->bi_rgb.bmiHeader;
+    if (bih->biWidth  != (LONG)sys->area.src_fmt->i_visible_width ||
+        bih->biHeight != -(LONG)sys->area.src_fmt->i_visible_height)
+    {
+        if (sys->off_bitmap)
+            DeleteObject(sys->off_bitmap);
+
+        bih->biWidth     = sys->area.src_fmt->i_visible_width;
+        bih->biHeight    = -(LONG)sys->area.src_fmt->i_visible_height;
+        void *p_pic_buffer;
+        sys->off_bitmap = CreateDIBSection(hdc,
+                                           &sys->bmiInfo,
+                                           DIB_RGB_COLORS,
+                                           &p_pic_buffer, NULL, 0);
+        if (unlikely(sys->off_bitmap == NULL))
+            return VLC_EINVAL;
+        sys->pic_buf.p_pixels = p_pic_buffer;
+        sys->pic_buf.i_pixel_pitch = (bih->biBitCount + 7) / 8;
+        sys->pic_buf.i_pitch = sys->pic_buf.i_visible_pitch =
+            sys->area.src_fmt->i_visible_width * sys->pic_buf.i_pixel_pitch;
+        sys->pic_buf.i_lines = sys->pic_buf.i_visible_lines =
+            sys->area.src_fmt->i_visible_height;
+    }
+    return VLC_SUCCESS;
+}
+
 static void Prepare(vout_display_t *vd, picture_t *picture, subpicture_t *subpic,
                     vlc_tick_t date)
 {
     VLC_UNUSED(subpic);
     VLC_UNUSED(date);
     vout_display_sys_t *sys = vd->sys;
-    picture_t fake_pic = *picture;
-    picture_UpdatePlanes(&fake_pic, sys->p_pic_buffer, sys->i_pic_pitch);
-    picture_CopyPixels(&fake_pic, picture);
+
+    if (sys->area.place_changed)
+    {
+        HDC hdc = GetDC(CommonVideoHWND(&sys->area));
+        int err = ChangeSize(vd, hdc);
+        ReleaseDC(CommonVideoHWND(&sys->area), hdc);
+
+        if (unlikely(err != VLC_SUCCESS))
+            return;
+
+        sys->area.place_changed = false;
+    }
+
+    assert((LONG)picture->format.i_visible_width  == sys->bmiInfo.bmiHeader.biWidth &&
+           (LONG)picture->format.i_visible_height == -sys->bmiInfo.bmiHeader.biHeight);
+
+    plane_CopyPixels(&sys->pic_buf, picture->p);
 }
 
 static int Control(vout_display_t *vd, int query)
@@ -162,19 +215,6 @@ static void Display(vout_display_t *vd, picture_t *picture)
 
     HDC hdc = GetDC(CommonVideoHWND(&sys->area));
 
-    if (sys->area.place_changed)
-    {
-        /* clear the background */
-        RECT display = {
-            .left   = 0,
-            .right  = vd->cfg->display.width,
-            .top    = 0,
-            .bottom = vd->cfg->display.height,
-        };
-        FillRect(hdc, &display, GetStockObject(BLACK_BRUSH));
-        sys->area.place_changed = false;
-    }
-
     SelectObject(sys->off_dc, sys->off_bitmap);
 
     if (sys->area.place.width  != vd->source->i_visible_width ||
@@ -209,12 +249,12 @@ static int Init(vout_display_t *vd, video_format_t *fmt)
     HDC window_dc = GetDC(CommonVideoHWND(&sys->area));
 
     /* */
-    sys->i_depth = GetDeviceCaps(window_dc, PLANES) *
-                   GetDeviceCaps(window_dc, BITSPIXEL);
+    int i_depth = GetDeviceCaps(window_dc, PLANES) *
+                  GetDeviceCaps(window_dc, BITSPIXEL);
 
     /* */
-    msg_Dbg(vd, "GDI depth is %i", sys->i_depth);
-    switch (sys->i_depth) {
+    msg_Dbg(vd, "GDI depth is %i", i_depth);
+    switch (i_depth) {
     case 8:
         fmt->i_chroma = VLC_CODEC_RGB8;
         break;
@@ -243,45 +283,35 @@ static int Init(vout_display_t *vd, video_format_t *fmt)
         fmt->i_bmask  = 0x000000ff;
         break;
     default:
-        msg_Err(vd, "screen depth %i not supported", sys->i_depth);
+        msg_Err(vd, "screen depth %i not supported", i_depth);
+        ReleaseDC(CommonVideoHWND(&sys->area), window_dc);
         return VLC_EGENERIC;
     }
 
     /* Initialize offscreen bitmap */
-    BITMAPINFO *bi = &sys->bitmapinfo;
-    memset(bi, 0, sizeof(BITMAPINFO) + 3 * sizeof(RGBQUAD));
-    if (sys->i_depth > 8) {
-        ((DWORD*)bi->bmiColors)[0] = fmt->i_rmask;
-        ((DWORD*)bi->bmiColors)[1] = fmt->i_gmask;
-        ((DWORD*)bi->bmiColors)[2] = fmt->i_bmask;
-    }
+    sys->bmiInfo.bmiHeader = (BITMAPINFOHEADER) {
+        .biSize         = sizeof(BITMAPINFOHEADER),
+        .biPlanes       = 1,
+        .biBitCount     = i_depth,
+        .biCompression  = (i_depth == 15 ||
+                           i_depth == 16) ? BI_BITFIELDS : BI_RGB,
+    };
 
-    BITMAPINFOHEADER *bih = &sys->bitmapinfo.bmiHeader;
-    bih->biSize = sizeof(BITMAPINFOHEADER);
-    bih->biSizeImage     = 0;
-    bih->biPlanes        = 1;
-    bih->biCompression   = (sys->i_depth == 15 ||
-                            sys->i_depth == 16) ? BI_BITFIELDS : BI_RGB;
-    bih->biBitCount      = sys->i_depth;
-    bih->biWidth         = fmt->i_width;
-    bih->biHeight        = -fmt->i_height;
-    bih->biClrImportant  = 0;
-    bih->biClrUsed       = 0;
-    bih->biXPelsPerMeter = 0;
-    bih->biYPelsPerMeter = 0;
-
-    sys->i_pic_pitch = bih->biBitCount * bih->biWidth / 8;
-    sys->off_bitmap = CreateDIBSection(window_dc,
-                                       (BITMAPINFO *)bih,
-                                       DIB_RGB_COLORS,
-                                       &sys->p_pic_buffer, NULL, 0);
+    if (i_depth > 8) {
+        *((DWORD*)&sys->bi_rgb.red)   = fmt->i_rmask;
+        *((DWORD*)&sys->bi_rgb.green) = fmt->i_gmask;
+        *((DWORD*)&sys->bi_rgb.blue)  = fmt->i_bmask;
+    }
 
     sys->off_dc = CreateCompatibleDC(window_dc);
 
-    SelectObject(sys->off_dc, sys->off_bitmap);
+    int err = ChangeSize(vd, window_dc);
+    if (err != VLC_SUCCESS)
+        DeleteDC(sys->off_dc);
+
     ReleaseDC(CommonVideoHWND(&sys->area), window_dc);
 
-    return VLC_SUCCESS;
+    return err;
 }
 
 static void Clean(vout_display_t *vd)