[MPlayer-cvslog] r25786 - in trunk: DOCS/man/en/mplayer.1 libvo/gl_common.c libvo/gl_common.h

[reimar]

Author: reimar
Date: Fri Jan 18 20:05:29 2008
New Revision: 25786

Log:
Add a fragment program for 5x5 unsharp masking


Modified:
   trunk/libvo/gl_common.c
   trunk/libvo/gl_common.h

Changes in other areas also in this revision:
Modified:
   trunk/DOCS/man/en/mplayer.1

Modified: trunk/libvo/gl_common.c
==============================================================================
--- trunk/libvo/gl_common.c	(original)
+++ trunk/libvo/gl_common.c	Fri Jan 18 20:05:29 2008
@@ -770,6 +770,30 @@ static const char *unsharp_filt_template
   "SUB b.r, a.r, b.r;"
   "MAD yuv.%c, b.r, %s, a.r;";
 
+static const char *unsharp_filt_template2 =
+  "PARAM dcoord = {%f, %f, %f, %f};"
+  "PARAM dcoord2 = {%f, 0, 0, %f};"
+  "ADD coord, fragment.texcoord[%c].xyxy, dcoord;"
+  "SUB coord2, fragment.texcoord[%c].xyxy, dcoord;"
+  "TEX a.r, fragment.texcoord[%c], texture[%c], %s;"
+  "TEX b.r, coord.xyxy, texture[%c], %s;"
+  "TEX b.g, coord.zwzw, texture[%c], %s;"
+  "ADD b.r, b.r, b.g;"
+  "TEX b.b, coord2.xyxy, texture[%c], %s;"
+  "TEX b.g, coord2.zwzw, texture[%c], %s;"
+  "ADD b.r, b.r, b.b;"
+  "ADD b.a, b.r, b.g;"
+  "ADD coord, fragment.texcoord[%c].xyxy, dcoord2;"
+  "SUB coord2, fragment.texcoord[%c].xyxy, dcoord2;"
+  "TEX b.r, coord.xyxy, texture[%c], %s;"
+  "TEX b.g, coord.zwzw, texture[%c], %s;"
+  "ADD b.r, b.r, b.g;"
+  "TEX b.b, coord2.xyxy, texture[%c], %s;"
+  "TEX b.g, coord2.zwzw, texture[%c], %s;"
+  "DP4 b.r, b, {-0.1171875, -0.1171875, -0.1171875, -0.01953125};"
+  "MAD b.r, a.r, {0.859375}, b.r;"
+  "MAD yuv.%c, b.r, %s, a.r;";
+
 static const char *yuv_prog_template =
   "PARAM ycoef = {%.4f, %.4f, %.4f};"
   "PARAM ucoef = {%.4f, %.4f, %.4f};"
@@ -827,6 +851,7 @@ static void create_scaler_textures(int s
     case YUV_SCALER_BILIN:
     case YUV_SCALER_BICUB_NOTEX:
     case YUV_SCALER_UNSHARP:
+    case YUV_SCALER_UNSHARP2:
       break;
     case YUV_SCALER_BICUB:
     case YUV_SCALER_BICUB_X:
@@ -1055,6 +1080,15 @@ static void add_scaler(int scaler, char 
                in_tex, ttype, in_tex, ttype, in_tex, ttype, in_tex, ttype,
                in_tex, ttype, out_comp, "{0.5}");
       break;
+    case YUV_SCALER_UNSHARP2:
+      snprintf(*prog_pos, *remain, unsharp_filt_template2,
+               1.2 * ptw, 1.2 * pth, 1.2 * ptw, -1.2 * pth,
+               1.5 * ptw, 1.5 * pth,
+               in_tex, in_tex, in_tex,
+               in_tex, ttype, in_tex, ttype, in_tex, ttype, in_tex, ttype,
+               in_tex, ttype, in_tex, in_tex, in_tex, ttype, in_tex, ttype, in_tex, ttype,
+               in_tex, ttype, out_comp, "{0.5}");
+      break;
   }
   *remain -= strlen(*prog_pos);
   *prog_pos += strlen(*prog_pos);

Modified: trunk/libvo/gl_common.h
==============================================================================
--- trunk/libvo/gl_common.h	(original)
+++ trunk/libvo/gl_common.h	Fri Jan 18 20:05:29 2008
@@ -244,6 +244,7 @@ int loadGPUProgram(GLenum target, char *
 //! use cubic scaling without additional lookup texture
 #define YUV_SCALER_BICUB_NOTEX 3
 #define YUV_SCALER_UNSHARP 4
+#define YUV_SCALER_UNSHARP2 5
 //! mask for conversion type
 #define YUV_CONVERSION_MASK 0xF
 //! mask for scaler type