On Fri, Nov 28, 2008 at 08:45:24AM +0000, Jim Hauxwell wrote:
And again, another line slipped through. That's the problem when I've already started on some other improvements.
--- libvo/vo_direct3d.c (revision 28042) +++ libvo/vo_direct3d.c (working copy) @@ -71,8 +72,14 @@ + int is_osd_populated; /* has the OSD something on it */
That sounds Engrish. Are you a native speaker?
@@ -101,6 +108,23 @@ + +#define OSD_TEXTURE_SIZE 1024 /* as this is a texture, it can be + a different size to the movie */
I repeat: "than the movie".
@@ -264,6 +306,50 @@
+ /* create OSD */ + if (FAILED (IDirect3DDevice9_CreateTexture( + priv->d3d_device, OSD_TEXTURE_SIZE, OSD_TEXTURE_SIZE, 1, D3DUSAGE_DYNAMIC, + D3DFMT_A8L8, D3DPOOL_SYSTEMMEM, &priv->d3d_texture_system, NULL))) { + mp_msg(MSGT_VO,MSGL_ERR, + "<vo_direct3d><INFO>IDirect3DDevice9_CreateTexture Failed (d3d_texture_system).\n");
Please adapt your coding style to the rest of the file, i.e. no space between function name and opening parenthesis, space after the comma that separates function arguments, no random indentation. I already fixed the rest of the file.
+ memcpy(vertices, osd_quad_vb, sizeof(osd_quad_vb)); + aspect = (float)priv->src_width / priv->src_height; + /* populate the Y with the correct coordinate */
I repeat: What is "the Y" supposed to mean?
@@ -672,3 +751,138 @@ + +/** @brief Maps mplayer alpha to D3D
MPlayer
+ * other alphas reduce by one
alpha channels?
+ for (y=0; y < h; y++) { + for (x=0; x < w; x++) {
Please put spaces around the =, same below.
+ src += srcstride; + srca += srcstride; + dstbase += dststride;
This could be aligned.
+ if (FAILED (IDirect3DTexture9_LockRect(priv->d3d_texture_system, 0, + &locked_rect, NULL, 0))) {
indentation Diego