November 2008 - MPlayer-dev-eng - lists.mplayerhq.hu

[PATCH] change all tabs to spaces in vf_screenshot
by Ruslan Savchenko 23 Nov '08

23 Nov '08

On Sat, Nov 22, 2008 at 12:56 AM, Michael Niedermayer <michaelni(a)gmx.at> wrote: > also a patch changing all tabs in vf_screenshot to spaces is probably > welcome, at least id approve it if noone objects. Attached patch changes every tab into 8 spaces. -- Regards, savrus

3 2

Re: [MPlayer-dev-eng] [PATCH] yadif SSE2/SSSE3 optimization
by Zhou, Zongyi 23 Nov '08

23 Nov '08

Hi Michael, Well I am getting confused. >please dont add tabs to vf_yadif.c whitespce should be just spaces There are tabs everywhere in vf_yadif.c. Should i replace other tabs with spaces in the patch? >also please split the cosmetic stuff like above into a seperate >patch from the additon of SSE2. This makes the code much easier to >review as first just needs to be checked for not "changing" anything >and the second patch likely will be rather small It is impossible. I cannot add SSE2 without such "cosmetic" stuff because all these modifications (e.g. "LOAD4" to "LOAD") are made to factorize duplicated codes to macros as you requested. They are to be used by both MMX2 and SSE2 so i cannot seperate them into two patches. Yes I know it is not easy to review this patch. Actually I don't like such way of coding either. I was simply following what you asked me to do. Regards, ZZ

3 2

update to the speedup patch
by Jim Hauxwell 22 Nov '08

22 Nov '08

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, So I had a think about the lock/unlock situation. 1) No resource conflict, its not like other threads are going to be grabbing the render surface. 2) Its an off screen buffer so it wont affect the display. I have concluded that it should be OK to lock it once in draw_slice() and then unlock it before doing the blit to get it onto the back buffer. Its also a little more flexible in the draw_slice() as my previous patch ignored the x offset for slice decoding, which would have broken for say mpeg2 with multiple slices per line. Its now reverted back to using the original calculations in this respect. Jim -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iEYEARECAAYFAkkmdWsACgkQhrNWoHjgI1DMHwCfcxbu7gdjg9OCwarwEL+aaDSq 7OMAoMHDGccjSEJyEb1t0t1OmBaMFh0l =tJHP -----END PGP SIGNATURE----- Index: libvo/vo_direct3d.c =================================================================== --- libvo/vo_direct3d.c (revision 27958) +++ libvo/vo_direct3d.c (working copy) @@ -52,8 +52,6 @@ static int gIsPaused; /**< 1 = Movie is paused, 0 = Movie is not paused */ -static int gIsD3DConfigFinished; /**< Synchronization "semaphore". 1 when - instance of D3DConfigure is finished */ static int gIsPanscan; /**< 1= Panscan enabled, 0 = Panscan disabled */ static RECT gFullScrMovieRect; /**< Rect (upscaled) of the movie when displayed in fullscreen */ @@ -72,6 +70,10 @@ the movie's codec) */ static D3DFORMAT gDesktopFmt; /**< Desktop (screen) colorspace format. Usually XRGB */ +static int gIsLocked; /* is the region locked */ +static D3DLOCKED_RECT gLockedRect; /**< Offscreen surface we lock in order + to copy MPlayer's frame inside it.*/ + typedef struct { const unsigned int MPlayerFormat; /**< Given by MPlayer */ @@ -191,6 +193,12 @@ mp_msg(MSGT_VO,MSGL_V,"<vo_direct3d>D3DDestroyContext called\r\n"); /* Let's destroy the old (if any) D3D Content */ + if (gIsLocked) + { + IDirect3DSurface9_UnlockRect(gpD3DSurface); + gIsLocked = 0; + } + if (gpD3DSurface != NULL) { IDirect3DSurface9_Release (gpD3DSurface); @@ -303,9 +311,6 @@ { mp_msg(MSGT_VO,MSGL_V,"<vo_direct3d>D3DUninit called\r\n"); - /* Block further calls to D3DConfigure(). */ - gIsD3DConfigFinished = 0; - /* Destroy D3D Context inside the window. */ D3DDestroyContext(); @@ -331,21 +336,14 @@ */ if (mpi->flags & MP_IMGFLAG_DRAW_CALLBACK) - return VO_TRUE; + goto skip_upload; if (mpi->flags & MP_IMGFLAG_PLANAR) { /* Copy a planar frame. */ draw_slice(mpi->planes,mpi->stride,mpi->w,mpi->h,0,0); - return VO_TRUE; + goto skip_upload; } - /* If the previous if failed, we should draw a packed frame */ - if (FAILED (IDirect3DDevice9_BeginScene(gpD3DDevice))) - { - mp_msg(MSGT_VO,MSGL_ERR,"<vo_direct3d>BeginScene failed\n"); - return VO_ERROR; - } - if (FAILED (IDirect3DSurface9_LockRect(gpD3DSurface, &stLockedRect, NULL, 0))) { @@ -356,12 +354,23 @@ memcpy_pic(stLockedRect.pBits, mpi->planes[0], mpi->stride[0], mpi->height, stLockedRect.Pitch, mpi->stride[0]); +skip_upload: + + /* this unlock is used for both slice_draw path and D3DRenderFrame path */ if (FAILED (IDirect3DSurface9_UnlockRect(gpD3DSurface))) { mp_msg(MSGT_VO,MSGL_V,"<vo_direct3d>Surface unlock failure\n"); return VO_ERROR; } + gIsLocked = 0; + /* If the previous if failed, we should draw a packed frame */ + if (FAILED (IDirect3DDevice9_BeginScene(gpD3DDevice))) + { + mp_msg(MSGT_VO,MSGL_ERR,"<vo_direct3d>BeginScene failed\n"); + return VO_ERROR; + } + if (FAILED (IDirect3DDevice9_StretchRect (gpD3DDevice, gpD3DSurface, gIsPanscan == 1 ? @@ -443,7 +452,8 @@ D3DDISPLAYMODE DisplayMode; /* Set to zero all global variables. */ gIsPaused = 0; - gIsD3DConfigFinished = 0; + //gIsD3DConfigFinished = 0; + gIsLocked = 0; gIsPanscan = 0; gpD3DHandle = NULL; gpD3DDevice = NULL; @@ -484,9 +494,6 @@ return -1; } - /* Allow the first call to D3DConfigure. */ - gIsD3DConfigFinished = 1; - return 0; } @@ -573,16 +580,11 @@ return VO_ERROR; } - if (gIsD3DConfigFinished == 1) - { - gIsD3DConfigFinished = 0; - if (D3DConfigure () == 0) - { - gIsD3DConfigFinished = 1; - return VO_ERROR; - } - gIsD3DConfigFinished = 1; - } + if (D3DConfigure () == 0) + { + return VO_ERROR; + } + return 0; /* Success */ } @@ -656,39 +658,36 @@ */ static int draw_slice(uint8_t *src[], int stride[], int w,int h,int x,int y ) { - D3DLOCKED_RECT stLockedRect; /**< Offscreen surface we lock in order - to copy MPlayer's frame inside it.*/ char *Src; /**< Pointer to the source image */ char *Dst; /**< Pointer to the destination image */ int UVstride; /**< Stride of the U/V planes */ - if (FAILED (IDirect3DDevice9_BeginScene(gpD3DDevice))) - { - mp_msg(MSGT_VO,MSGL_ERR,"<vo_direct3d>BeginScene failed\n"); - return VO_ERROR; - } + if (gIsLocked == 0) + { + if (FAILED (IDirect3DSurface9_LockRect(gpD3DSurface, + &gLockedRect, NULL, 0))) + { + mp_msg(MSGT_VO,MSGL_V,"<vo_direct3d>Surface lock failure\n"); + return VO_FALSE; + } - if (FAILED (IDirect3DSurface9_LockRect(gpD3DSurface, - &stLockedRect, NULL, 0))) - { - mp_msg(MSGT_VO,MSGL_V,"<vo_direct3d>Surface lock failure\n"); - return VO_FALSE; - } + gIsLocked = 1; /* Dont lock again! */ + } - UVstride = stLockedRect.Pitch / 2; + UVstride = gLockedRect.Pitch / 2; /* Copy Y */ - Dst = stLockedRect.pBits; - Dst = Dst + stLockedRect.Pitch * y + x; + Dst = gLockedRect.pBits; + Dst = Dst + gLockedRect.Pitch * y + x; Src=src[0]; - memcpy_pic(Dst, Src, w, h, stLockedRect.Pitch, stride[0]); + memcpy_pic(Dst, Src, w, h, gLockedRect.Pitch, stride[0]); w/=2;h/=2;x/=2;y/=2; /* Copy U */ - Dst = stLockedRect.pBits; - Dst = Dst + stLockedRect.Pitch * gSrcHeight - + UVstride * y + x; + Dst = gLockedRect.pBits; + Dst = Dst + gLockedRect.Pitch * gSrcHeight + + UVstride * y + x; if (gMovieSrcFmt == MAKEFOURCC('Y','V','1','2')) Src=src[2]; else @@ -697,9 +696,9 @@ memcpy_pic(Dst, Src, w, h, UVstride, stride[1]); /* Copy V */ - Dst = stLockedRect.pBits; - Dst = Dst + stLockedRect.Pitch * gSrcHeight - + UVstride * (gSrcHeight / 2) + UVstride * y + x; + Dst = gLockedRect.pBits; + Dst = Dst + gLockedRect.Pitch * gSrcHeight + + UVstride * (gSrcHeight / 2) + UVstride * y + x; if (gMovieSrcFmt == MAKEFOURCC('Y','V','1','2')) Src=src[1]; else @@ -707,32 +706,6 @@ memcpy_pic(Dst, Src, w, h, UVstride, stride[2]); - if (FAILED (IDirect3DSurface9_UnlockRect(gpD3DSurface))) - { - mp_msg(MSGT_VO,MSGL_V,"<vo_direct3d>Surface unlock failure\n"); - return VO_ERROR; - } - - if (FAILED (IDirect3DDevice9_StretchRect (gpD3DDevice, - gpD3DSurface, - gIsPanscan == 1 ? - &gPanScanSrcRect : NULL, - gpD3DBackBuf, - vo_fs == 1 ? - &gFullScrMovieRect : NULL, - D3DTEXF_LINEAR))) - { - mp_msg(MSGT_VO,MSGL_V, - "<vo_direct3d>Unable to copy the frame to the back buffer\n"); - return VO_ERROR; - } - - if (FAILED (IDirect3DDevice9_EndScene(gpD3DDevice))) - { - mp_msg(MSGT_VO,MSGL_ERR,"<vo_direct3d>EndScene failed\n"); - return VO_ERROR; - } - return 0; /* Success */ }

3 12

Re: [MPlayer-dev-eng] [PATCH] Direct3D vo performance increase
by Jim Hauxwell 22 Nov '08

22 Nov '08

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, > should me eliminated the "goto"? I Don't understand what you are asking. Do you want to eliminate the goto in favour of an if()? Jim -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iEYEARECAAYFAkkoSZ0ACgkQhrNWoHjgI1Bn8ACffyWGZfQi5f8CV/48Xz6OwdJq RtsAoMaB/oi8HQ6qUOJFMyBRlNoCCVnh =zzD2 -----END PGP SIGNATURE-----

2 1

[PATCH] panscan for vo_direct3d
by Reimar Döffinger 22 Nov '08

22 Nov '08

Hello, attached patch seems to work fine for me except for 1) very large negative -panscan values, but that is experimental anyway 2) even without this, the borders show funny colourful borders instead of black ones. I think there is at least one call to Clear() missing somewhere and/or the IDirect3DDevice9_ColorFill is not working right. Greetings, Reimar Döffinger

4 15

[PATCH] Fix unexpected flip on vo_x11
by kikuchan＠uranus.dti.ne.jp 21 Nov '08

21 Nov '08

Hello. I've found a bug on vo_x11 that flips video vertically sometimes, when I play multiple video files at once. I figured out why it happened, because one of the video files used flip-ed codec. Here is a simple patch. Regards, kikuchan Index: vo_x11.c =================================================================== --- vo_x11.c (revision 27958) +++ vo_x11.c (working copy) @@ -335,8 +335,7 @@ if (flags & VOFLAG_MODESWITCHING) vm = 1; #endif - if (flags & VOFLAG_FLIPPING) - Flip_Flag = 1; + Flip_Flag = flags & VOFLAG_FLIPPING; zoomFlag = flags & VOFLAG_SWSCALE; // if(!fullscreen) zoomFlag=1; //it makes no sense to avoid zooming on windowd mode

2 1

[PATCH] fix: FreeDB file not fully downloaded
by Mathieu SCHROETER 21 Nov '08

21 Nov '08

Hi, a problem exists since a long time with cddb://. The files returned by FreeDB are not always fully downloaded. Then, the files saved in ~/.cddb/ are truncated in most of cases. Today, I've found where is the problem but I'm not sure if that will not break something else. In http_read_response() "stream/network.c", do {} while (); line 267 is used to receive responses and it loop only one time in most of cases, because the "while" condition is that HTTP header must be entire. But, the header is entire with the first loop and data after the header are not fully downloaded (with my tests, I've about 1KB data with the first loop and it is not enough for a lot of FreeDB files). Then, the patch attached will read the socket until no more data are available instead of quit the loop because only the HTTP header is completed. With this patch, I've no more problem to retrieve all titles with `mplayer cddb://`. Regards, -- Mathieu SCHROETER

1 0

Update to vo_direct3d - saves ~2% CPU time
by Jim Hauxwell 20 Nov '08

20 Nov '08

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, I've made some updates to vo_direct3d.c which reduce the amount of data locked, now only locks the portion needed for update which should save DMA bandwidth. I've optimized away some begin_scene and end_scene combos as they are only needed for actual rendering, not the locking. I've attached the patch created against what was in svn today. I still think there will be some issue with lost surfaces, I'll look at that next. Jim -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iEYEARECAAYFAkkltYUACgkQhrNWoHjgI1BttgCgjSkG1hAAfmANdrZsO5Nl3tR7 t14AniOkna+4yE1GOT/IxcIiGhhB2W81 =KtW7 -----END PGP SIGNATURE----- Index: libvo/vo_direct3d.c =================================================================== --- libvo/vo_direct3d.c (revision 27958) +++ libvo/vo_direct3d.c (working copy) @@ -331,7 +331,7 @@ */ if (mpi->flags & MP_IMGFLAG_DRAW_CALLBACK) - return VO_TRUE; + goto skip_upload; if (mpi->flags & MP_IMGFLAG_PLANAR) { /* Copy a planar frame. */ @@ -339,13 +339,6 @@ return VO_TRUE; } - /* If the previous if failed, we should draw a packed frame */ - if (FAILED (IDirect3DDevice9_BeginScene(gpD3DDevice))) - { - mp_msg(MSGT_VO,MSGL_ERR,"<vo_direct3d>BeginScene failed\n"); - return VO_ERROR; - } - if (FAILED (IDirect3DSurface9_LockRect(gpD3DSurface, &stLockedRect, NULL, 0))) { @@ -362,6 +355,15 @@ return VO_ERROR; } +skip_upload: + + /* If the previous if failed, we should draw a packed frame */ + if (FAILED (IDirect3DDevice9_BeginScene(gpD3DDevice))) + { + mp_msg(MSGT_VO,MSGL_ERR,"<vo_direct3d>BeginScene failed\n"); + return VO_ERROR; + } + if (FAILED (IDirect3DDevice9_StretchRect (gpD3DDevice, gpD3DSurface, gIsPanscan == 1 ? @@ -658,18 +660,22 @@ { D3DLOCKED_RECT stLockedRect; /**< Offscreen surface we lock in order to copy MPlayer's frame inside it.*/ + RECT srcRect; char *Src; /**< Pointer to the source image */ - char *Dst; /**< Pointer to the destination image */ + char *Dst_y; /**< Pointer to the destination image */ + char *Dst_u; /**< Pointer to the destination image */ + char *Dst_v; /**< Pointer to the destination image */ int UVstride; /**< Stride of the U/V planes */ - if (FAILED (IDirect3DDevice9_BeginScene(gpD3DDevice))) - { - mp_msg(MSGT_VO,MSGL_ERR,"<vo_direct3d>BeginScene failed\n"); - return VO_ERROR; - } + srcRect.left = (LONG)x; + srcRect.right = (LONG)(x + w); + srcRect.top = (LONG)y; + srcRect.bottom = (LONG)(y + h); + //mp_msg(MSGT_VO,MSGL_ERR,"<vo_direct3d>draw_slice lock = %ld %ld %ld %ld\n", srcRect.left, srcRect.right, srcRect.top, srcRect.bottom); + if (FAILED (IDirect3DSurface9_LockRect(gpD3DSurface, - &stLockedRect, NULL, 0))) + &stLockedRect, &srcRect, 0))) { mp_msg(MSGT_VO,MSGL_V,"<vo_direct3d>Surface lock failure\n"); return VO_FALSE; @@ -677,35 +683,41 @@ UVstride = stLockedRect.Pitch / 2; + Dst_y = (char *)((unsigned int)stLockedRect.pBits - (y * stLockedRect.Pitch)); + Dst_u = Dst_y + (stLockedRect.Pitch * gSrcHeight); + Dst_v = Dst_u + ((stLockedRect.Pitch * gSrcHeight) / 4); + /* Copy Y */ - Dst = stLockedRect.pBits; - Dst = Dst + stLockedRect.Pitch * y + x; + //Dst_y = stLockedRect.pBits; + Dst_y = Dst_y + stLockedRect.Pitch * y + x; Src=src[0]; - memcpy_pic(Dst, Src, w, h, stLockedRect.Pitch, stride[0]); + memcpy_pic(Dst_y, Src, w, h, stLockedRect.Pitch, stride[0]); w/=2;h/=2;x/=2;y/=2; /* Copy U */ - Dst = stLockedRect.pBits; - Dst = Dst + stLockedRect.Pitch * gSrcHeight - + UVstride * y + x; + //Dst = stLockedRect.pBits; + //Dst = Dst + stLockedRect.Pitch * gSrcHeight + // + UVstride * y + x; + Dst_u = Dst_u + UVstride * y + x; if (gMovieSrcFmt == MAKEFOURCC('Y','V','1','2')) Src=src[2]; else Src=src[1]; - memcpy_pic(Dst, Src, w, h, UVstride, stride[1]); + memcpy_pic(Dst_u, Src, w, h, UVstride, stride[1]); /* Copy V */ - Dst = stLockedRect.pBits; - Dst = Dst + stLockedRect.Pitch * gSrcHeight - + UVstride * (gSrcHeight / 2) + UVstride * y + x; + //Dst = stLockedRect.pBits; + //Dst = Dst + stLockedRect.Pitch * gSrcHeight + // + UVstride * (gSrcHeight / 2) + UVstride * y + x; + Dst_v = Dst_v + UVstride * y + x; if (gMovieSrcFmt == MAKEFOURCC('Y','V','1','2')) Src=src[1]; else Src=src[2]; - memcpy_pic(Dst, Src, w, h, UVstride, stride[2]); + memcpy_pic(Dst_v, Src, w, h, UVstride, stride[2]); if (FAILED (IDirect3DSurface9_UnlockRect(gpD3DSurface))) { @@ -713,26 +725,6 @@ return VO_ERROR; } - if (FAILED (IDirect3DDevice9_StretchRect (gpD3DDevice, - gpD3DSurface, - gIsPanscan == 1 ? - &gPanScanSrcRect : NULL, - gpD3DBackBuf, - vo_fs == 1 ? - &gFullScrMovieRect : NULL, - D3DTEXF_LINEAR))) - { - mp_msg(MSGT_VO,MSGL_V, - "<vo_direct3d>Unable to copy the frame to the back buffer\n"); - return VO_ERROR; - } - - if (FAILED (IDirect3DDevice9_EndScene(gpD3DDevice))) - { - mp_msg(MSGT_VO,MSGL_ERR,"<vo_direct3d>EndScene failed\n"); - return VO_ERROR; - } - return 0; /* Success */ }

3 4

[PATCH] Direct3D libvo driver
by Georgi Petrov 20 Nov '08

20 Nov '08

This is my MPlayer Direct3D libvo driver. This is *VERY* preliminary release - just enough to be reviewed and commented for further corrections. Please, understand - this is the first patch in my life, so I could have done something wrong. WARNING!!! I did a checkout of the MPlayer SVN today (12.11.2008/13.11.2008) and current MPlayer doesn't play any movie at least under Windows. Please be careful, because applying this patch to current MPlayer HEAD doesn't change the fact that currently MPLAYER IS BROKEN UNDER WINDOWS. The problem is somewhere around libavcodec - waaay before the video driver is concerned at all. Every possible video dies with this line: Cannot find codec 'dca' in libavcodec... or Cannot find codec 'mpeg4' in libavcodec... ... and so on Until now I worked on previous MPlayer HEAD, which worked just fine. The Direct3D driver itself is just fine, but I can't correct the mistakes of others, so to test the driver with the current HEAD, somebody should fix his/her problem first. I'm sorry that people who evaluate the patch will face such a fault not related to the driver itself, but there's nothing I can do. Take care :)

10 103

[PATCH] Direct3D libvo driver
by Jim Hauxwell 19 Nov '08

19 Nov '08

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 So, I've done some more testing and written a small (2 file) example of the crash. Compile with VS = OK Compile with cygwin = Crash Compile with MinGW = OK Compile g++-4 -O0 -g3 -D_UNICODE -DUNICODE test_win.cpp paint.cpp -ld3d9 - -luser32 -o test_win.exe So it looks like it is a problem with cygwin. I'll report it to the cygwin mailing list Cheers Jim -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iEYEARECAAYFAkkkkrQACgkQhrNWoHjgI1ApNQCfaTcgCQowIkWoM81SjibuEjJg FfEAoMFJtNA7+N5CiiNJM+obpMX6xHVD =vYRQ -----END PGP SIGNATURE----- #include <windows.h> #include <d3d9.h> extern LPDIRECT3DDEVICE9 gpD3DDevice; /**< The Direct3D Adapter */ extern IDirect3DSurface9 *gpD3DSurface; /**< Offscreen Direct3D Surface. MPlayer renders inside it. Uses colorspace MovieSrcFmt */ void InitD3DState() { } void InitD3DViewPort(int width, int height) { } void PaintProc(HWND hWnd) { D3DLOCKED_RECT rect; IDirect3DSurface9 *pD3DBackBuf; /**< Video card's back buffer (used to display next frame) */ // rendering preamble HDC hDC; PAINTSTRUCT ps; // the actual painting code will go here hDC = BeginPaint(hWnd, &ps); if (FAILED (IDirect3DDevice9_GetBackBuffer (gpD3DDevice, 0, 0, D3DBACKBUFFER_TYPE_MONO, &(pD3DBackBuf)))) { goto out; } if (FAILED (IDirect3DSurface9_LockRect(gpD3DSurface, &rect, NULL, 0))) { goto out; } // memset for now if (FAILED (IDirect3DSurface9_UnlockRect(gpD3DSurface))) { goto out; } /* If the previous if failed, we should draw a packed frame */ if (FAILED (IDirect3DDevice9_BeginScene(gpD3DDevice))) { goto out; } if (FAILED (IDirect3DDevice9_StretchRect (gpD3DDevice, gpD3DSurface, NULL, pD3DBackBuf, NULL, D3DTEXF_LINEAR))) { goto out; } if (FAILED (IDirect3DDevice9_EndScene(gpD3DDevice))) { goto out; } if (FAILED (IDirect3DDevice9_Present (gpD3DDevice, 0, 0, 0, 0))) { goto out; } out: EndPaint(hWnd, &ps); } // test_win.cpp : Defines the entry point for the application. // #include <windows.h> #include <d3d9.h> LPDIRECT3D9 gpD3DHandle; /**< Direct3D Handle */ LPDIRECT3DDEVICE9 gpD3DDevice; /**< The Direct3D Adapter */ IDirect3DSurface9 *gpD3DSurface; /**< Offscreen Direct3D Surface. MPlayer renders inside it. Uses colorspace MovieSrcFmt */ void D3DInit(HWND hWnd, HDC * hDC, HGLRC * hRC); void InitD3DViewPort(int width, int height); void InitD3DState(); void ShutdownD3D(HWND hWnd, HDC hDC, HGLRC hRC); void PaintProc(HWND hWnd); // Forward declarations of functions included in this code module: LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam); int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { MSG msg; WNDCLASSEX wc; HWND hWnd; HDC hDC; HGLRC hRC; RECT wndRect = { 0, 0, 640, 480 }; wc.cbSize = sizeof(WNDCLASSEX); wc.style = CS_CLASSDC; wc.lpfnWndProc = (WNDPROC)WndProc; wc.cbClsExtra = 0; wc.cbWndExtra = 0; wc.hInstance = hInstance; wc.hIcon = LoadIcon(NULL, IDI_APPLICATION); wc.hCursor = LoadCursor(NULL, IDC_ARROW); wc.hbrBackground = NULL; wc.lpszMenuName = NULL; wc.lpszClassName = L"JIMBO"; wc.hIconSm = LoadIcon(NULL, IDI_APPLICATION); if(!RegisterClassEx(&wc)) return FALSE; AdjustWindowRect(&wndRect, WS_OVERLAPPEDWINDOW, false); hWnd = CreateWindow(L"JIMBO", L"Native HW Mode", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, wndRect.right - wndRect.left, wndRect.bottom - wndRect.top, NULL, NULL, wc.hInstance, NULL); if (!hWnd) return FALSE; /* enable D3D for the window */ D3DInit(hWnd, &hDC, &hRC); ShowWindow(hWnd, nCmdShow); UpdateWindow(hWnd); /* Main message loop: */ while (GetMessage(&msg, NULL, 0, 0)) { TranslateMessage(&msg); DispatchMessage(&msg); } /* shutdown OpenGL */ ShutdownD3D(hWnd, hDC, hRC); /* destroy the window explicitly */ DestroyWindow(hWnd); return (int) msg.wParam; } // // FUNCTION: WndProc(HWND, unsigned, WORD, LONG) // // PURPOSE: Processes messages for the main window. // // WM_COMMAND - process the application menu // WM_PAINT - Paint the main window // WM_DESTROY - post a quit message and return // // LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { switch (message) { case WM_KEYDOWN: switch(wParam) { case VK_ESCAPE: PostQuitMessage(0); break; } break; case WM_PAINT: PaintProc(hWnd); break; case WM_ERASEBKGND: // cause the redraw not to clear the area return 1; case WM_DESTROY: PostQuitMessage(0); break; case WM_SIZE: { // intercept int width = (unsigned int)lParam & 0xFFFF; int height = (unsigned int)lParam >> 16; InitD3DViewPort(width, height); InvalidateRect(hWnd, 0, FALSE); } break; default: return DefWindowProc(hWnd, message, wParam, lParam); } return 0; } /** @brief Destroy D3D Context related to the current window. */ void D3DDestroyContext (void) { /* Let's destroy the old (if any) D3D Content */ if (gpD3DSurface != NULL) { IDirect3DSurface9_Release (gpD3DSurface); gpD3DSurface = NULL; } if (gpD3DDevice != NULL) { IDirect3DDevice9_Release (gpD3DDevice); gpD3DDevice = NULL; } } void D3DInit(HWND hWnd, HDC * hDC, HGLRC * hRC) { D3DPRESENT_PARAMETERS PresentParams; D3DDISPLAYMODE DisplayMode; /* Set to zero all global variables. */ gpD3DHandle = 0; gpD3DDevice = 0; gpD3DSurface = 0; D3DDestroyContext(); /* FIXME > Please use subopt-helper.h for this, see vo_gl.c:preinit for > an example of how to use it. */ if ((gpD3DHandle = Direct3DCreate9 (D3D_SDK_VERSION)) == NULL) return; if (FAILED (IDirect3D9_GetAdapterDisplayMode (gpD3DHandle, D3DADAPTER_DEFAULT, &DisplayMode))) return; /* Prepare Direct3D initialization parameters. */ ZeroMemory(&PresentParams, sizeof(D3DPRESENT_PARAMETERS)); PresentParams.Windowed = TRUE; PresentParams.SwapEffect = D3DSWAPEFFECT_COPY; PresentParams.Flags = D3DPRESENTFLAG_VIDEO; PresentParams.hDeviceWindow = hWnd; /* w32_common var */ PresentParams.BackBufferWidth = 0; /* Fill up window Width */ PresentParams.BackBufferHeight = 0; /* Fill up window Height */ PresentParams.MultiSampleType = D3DMULTISAMPLE_NONE; /* D3DPRESENT_INTERVAL_ONE = vsync */ PresentParams.PresentationInterval = D3DPRESENT_INTERVAL_ONE; PresentParams.BackBufferFormat = DisplayMode.Format; PresentParams.BackBufferCount = 1; PresentParams.EnableAutoDepthStencil = FALSE; /* vo_w32_window is w32_common variable. It's a handle to the window. */ if (FAILED (IDirect3D9_CreateDevice(gpD3DHandle, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, NULL, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &PresentParams, &gpD3DDevice))) return; D3DFORMAT sf = (D3DFORMAT)MAKEFOURCC('Y','V','1','2'); if (FAILED (IDirect3DDevice9_CreateOffscreenPlainSurface( gpD3DDevice, 640, 480, sf, D3DPOOL_DEFAULT, &gpD3DSurface, NULL))) return; /* Fill the Surface with black color. */ IDirect3DDevice9_ColorFill(gpD3DDevice, gpD3DSurface, NULL, D3DCOLOR_ARGB(0xFF, 0, 0, 0) ); InitD3DState(); } // Disable D3D void ShutdownD3D(HWND hWnd, HDC hDC, HGLRC hRC) { /* Destroy D3D Context inside the window. */ D3DDestroyContext(); /* Stop the whole D3D. */ if (NULL != gpD3DHandle) { IDirect3D9_Release (gpD3DHandle); } ReleaseDC( hWnd, hDC ); }

1 0