From d63fd4c5b0ac3e60e4e1652f30375ac61dcf492d Mon Sep 17 00:00:00 2001 From: Yonit Halperin Date: Wed, 18 May 2011 17:28:20 +0300 Subject: client: fix flipped video in Linux guest on windows client, RHBZ #667689 Video streams from Linux guests are oriented top-down, where gdi_canvas_put_image always received display context for down-top oriented bitmap. I fixed create_bitmap to consider the stream orientation. --- client/display_channel.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'client/display_channel.cpp') diff --git a/client/display_channel.cpp b/client/display_channel.cpp index dbe7d0b8..3b8b91a4 100644 --- a/client/display_channel.cpp +++ b/client/display_channel.cpp @@ -217,7 +217,7 @@ public: #ifdef WIN32 static int create_bitmap(HDC *dc, HBITMAP *prev_bitmap, uint8_t **data, int *nstride, - int width, int height) + int width, int height, bool top_down) { HBITMAP bitmap; struct { @@ -228,7 +228,7 @@ static int create_bitmap(HDC *dc, HBITMAP *prev_bitmap, memset(&bitmap_info, 0, sizeof(bitmap_info)); bitmap_info.inf.bmiHeader.biSize = sizeof(bitmap_info.inf.bmiHeader); bitmap_info.inf.bmiHeader.biWidth = width; - bitmap_info.inf.bmiHeader.biHeight = height; + bitmap_info.inf.bmiHeader.biHeight = top_down ? -height : height; bitmap_info.inf.bmiHeader.biPlanes = 1; bitmap_info.inf.bmiHeader.biBitCount = 32; @@ -284,7 +284,7 @@ VideoStream::VideoStream(RedClient& client, Canvas& canvas, DisplayChannel& chan try { #ifdef WIN32 if (!create_bitmap(&_dc, &_prev_bitmap, &_uncompressed_data, &_stride, - stream_width, stream_height)) { + stream_width, stream_height, _top_down)) { THROW("create_bitmap failed"); } #else @@ -299,6 +299,8 @@ VideoStream::VideoStream(RedClient& client, Canvas& canvas, DisplayChannel& chan SetViewportOrgEx(_dc, 0, stream_height - src_height, NULL); #endif + // this doesn't have effect when using gdi_canvas. The sign of BITMAPINFO's biHeight + // determines the orientation (see create_bitmap). if (_top_down) { _pixmap.data = _uncompressed_data; _pixmap.stride = _stride; -- cgit