RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-03 04:37:54 +00:00
Code Issues Releases Wiki Activity

vo_gl: add noise filter

Browse Source 
Add disabled feature: noise filter for vo_gl.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34014 b3059339-0415-0410-9bf9-f77b7e298cf2

Hook up -vo gl noise support.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34015 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2011-08-26 18:51:51 +00:00 committed by wm4
parent bbdff34d69
commit 8767c060cf
4 changed files with 84 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
DOCS/man/en/mplayer.1
View File

@ -3894,6 +3894,9 @@ Select the scaling function to use for chrominance scaling.
For details see lscale.
.IPs filter-strength=<value>
Set the effect strength for the lscale/cscale filters that support it.
.IPs noise-strength=<value>
Set how much noise to add. 0 to disable (default), 1.0 for level suitable
for dithering to 6 bit.
.IPs stereo=<value>
Select a method for stereo display.
You may have to use \-aspect to fix the aspect value.

86
libvo/gl_common.c
View File

@ -861,6 +861,36 @@ static void gen_spline_lookup_tex(GL *gl, GLenum unit)
free(tex);
}
#define NOISE_RES 2048
/**
* \brief creates the 1D lookup texture needed to generate pseudo-random numbers.
* \param unit texture unit to attach texture to
*/
static void gen_noise_lookup_tex(GL *gl, GLenum unit) {
GLfloat *tex = calloc(NOISE_RES, sizeof(*tex));
uint32_t lcg = 0x79381c11;
int i;
for (i = 0; i < NOISE_RES; i++)
tex[i] = (double)i / (NOISE_RES - 1);
for (i = 0; i < NOISE_RES - 1; i++) {
int remain = NOISE_RES - i;
int idx = i + (lcg >> 16) % remain;
GLfloat tmp = tex[i];
tex[i] = tex[idx];
tex[idx] = tmp;
lcg = lcg * 1664525 + 1013904223;
}
gl->ActiveTexture(unit);
gl->TexImage1D(GL_TEXTURE_1D, 0, 1, NOISE_RES, 0, GL_RED, GL_FLOAT, tex);
gl->TexParameterf(GL_TEXTURE_1D, GL_TEXTURE_PRIORITY, 1.0);
gl->TexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
gl->TexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
gl->TexParameteri(GL_TEXTURE_1D, GL_TEXTURE_WRAP_S, GL_REPEAT);
gl->ActiveTexture(GL_TEXTURE0);
free(tex);
}
#define SAMPLE(dest, coord, texture) \
"TEX textemp, " coord ", " texture ", $tex_type;\n" \
"MOV " dest ", textemp.r;\n"
@ -994,8 +1024,7 @@ static const char *yuv_prog_template =
"TEMP res;\n"
"MAD res.rgb, yuv.rrrr, ycoef, offsets;\n"
"MAD res.rgb, yuv.gggg, ucoef, res;\n"
"MAD result.color.rgb, yuv.bbbb, vcoef, res;\n"
"END";
"MAD res.rgb, yuv.bbbb, vcoef, res;\n";
static const char *yuv_pow_prog_template =
"PARAM ycoef = {$cm11, $cm21, $cm31};\n"
@ -1007,10 +1036,9 @@ static const char *yuv_pow_prog_template =
"MAD res.rgb, yuv.rrrr, ycoef, offsets;\n"
"MAD res.rgb, yuv.gggg, ucoef, res;\n"
"MAD_SAT res.rgb, yuv.bbbb, vcoef, res;\n"
"POW result.color.r, res.r, gamma.r;\n"
"POW result.color.g, res.g, gamma.g;\n"
"POW result.color.b, res.b, gamma.b;\n"
"END";
"POW res.r, res.r, gamma.r;\n"
"POW res.g, res.g, gamma.g;\n"
"POW res.b, res.b, gamma.b;\n";
static const char *yuv_lookup_prog_template =
"PARAM ycoef = {$cm11, $cm21, $cm31, 0};\n"
@ -1021,16 +1049,23 @@ static const char *yuv_lookup_prog_template =
"MAD res, yuv.rrrr, ycoef, offsets;\n"
"MAD res.rgb, yuv.gggg, ucoef, res;\n"
"MAD res.rgb, yuv.bbbb, vcoef, res;\n"
"TEX result.color.r, res.raaa, texture[$conv_tex0], 2D;\n"
"TEX res.r, res.raaa, texture[$conv_tex0], 2D;\n"
"ADD res.a, res.a, 0.25;\n"
"TEX result.color.g, res.gaaa, texture[$conv_tex0], 2D;\n"
"TEX res.g, res.gaaa, texture[$conv_tex0], 2D;\n"
"ADD res.a, res.a, 0.25;\n"
"TEX result.color.b, res.baaa, texture[$conv_tex0], 2D;\n"
"END";
"TEX res.b, res.baaa, texture[$conv_tex0], 2D;\n";
static const char *yuv_lookup3d_prog_template =
"TEX result.color, yuv, texture[$conv_tex0], 3D;\n"
"END";
"TEMP res;\n"
"TEX res, yuv, texture[$conv_tex0], 3D;\n";
static const char *noise_filt_template =
"MUL coord.xy, fragment.texcoord[0], {$noise_sx, $noise_sy};\n"
"TEMP rand;\n"
"TEX rand.r, coord.x, texture[$noise_filt_tex], 1D;\n"
"ADD rand.r, rand.r, coord.y;\n"
"TEX rand.r, rand.r, texture[$noise_filt_tex], 1D;\n"
"MAD res.rgb, rand.rrrr, {$noise_str, $noise_str, $noise_str}, res;\n";
/**
* \brief creates and initializes helper textures needed for scaling texture read
@ -1275,10 +1310,12 @@ static void glSetupYUVFragprog(GL *gl, gl_conversion_params_t *params)
char lum_scale_texs[1];
char chrom_scale_texs[1];
char conv_texs[1];
char filt_texs[1] = {0};
GLint i;
// this is the conversion matrix, with y, u, v factors
// for red, green, blue and the constant offsets
float yuv2rgb[3][4];
int noise = params->noise_strength != 0;
create_conv_textures(gl, params, &cur_texu, conv_texs);
create_scaler_textures(gl, YUV_LUM_SCALER(type), &cur_texu, lum_scale_texs);
if (YUV_CHROM_SCALER(type) == YUV_LUM_SCALER(type))
@ -1286,6 +1323,12 @@ static void glSetupYUVFragprog(GL *gl, gl_conversion_params_t *params)
else
create_scaler_textures(gl, YUV_CHROM_SCALER(type), &cur_texu,
chrom_scale_texs);
if (noise) {
gen_noise_lookup_tex(gl, cur_texu);
filt_texs[0] = '0' + cur_texu++;
}
gl->GetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &i);
if (i < cur_texu)
mp_msg(MSGT_VO, MSGL_ERR,
@ -1334,6 +1377,25 @@ static void glSetupYUVFragprog(GL *gl, gl_conversion_params_t *params)
replace_var_float(prog, "gamma_g", (float)1.0 / params->csp_params.ggamma);
replace_var_float(prog, "gamma_b", (float)1.0 / params->csp_params.bgamma);
replace_var_char(prog, "conv_tex0", conv_texs[0]);
if (noise) {
// 1.0 strength is suitable for dithering 8 to 6 bit
double str = params->noise_strength * (1.0 / 64);
double scale_x = (double)NOISE_RES / texw;
double scale_y = (double)NOISE_RES / texh;
if (rect) {
scale_x /= texw;
scale_y /= texh;
}
append_template(prog, noise_filt_template);
replace_var_float(prog, "noise_sx", scale_x);
replace_var_float(prog, "noise_sy", scale_y);
replace_var_char(prog, "noise_filt_tex", filt_texs[0]);
replace_var_float(prog, "noise_str", str);
}
append_template(prog, "MOV result.color.rgb, res;\nEND");
mp_msg(MSGT_VO, MSGL_DBG2, "[gl] generated fragment program:\n%s\n",
yuv_prog);
loadGPUProgram(gl, GL_FRAGMENT_PROGRAM, yuv_prog);

1
libvo/gl_common.h
View File

@ -335,6 +335,7 @@ typedef struct {
int chrom_texw;
int chrom_texh;
float filter_strength;
float noise_strength;
} gl_conversion_params_t;
int glAutodetectYUVConversion(GL *gl);

7
libvo/vo_gl.c
View File

@ -93,6 +93,7 @@ struct gl_priv {
int lscale;
int cscale;
float filter_strength;
float noise_strength;
int yuvconvtype;
int use_rectangle;
int err_shown;
@ -214,7 +215,8 @@ static void update_yuvconv(struct vo *vo)
mp_csp_copy_equalizer_values(&cparams, &p->video_eq);
gl_conversion_params_t params = {
p->target, p->yuvconvtype, cparams,
p->texture_width, p->texture_height, 0, 0, p->filter_strength
p->texture_width, p->texture_height, 0, 0, p->filter_strength,
p->noise_strength
};
mp_get_chroma_shift(p->image_format, &xs, &ys, &depth);
params.chrom_texw = params.texw >> xs;
@ -1221,6 +1223,7 @@ static int preinit_internal(struct vo *vo, const char *arg, int allow_sw,
{"lscale", OPT_ARG_INT, &p->lscale, int_non_neg},
{"cscale", OPT_ARG_INT, &p->cscale, int_non_neg},
{"filter-strength", OPT_ARG_FLOAT, &p->filter_strength, NULL},
{"noise-strength", OPT_ARG_FLOAT, &p->noise_strength, NULL},
{"ati-hack", OPT_ARG_BOOL, &p->ati_hack, NULL},
{"force-pbo", OPT_ARG_BOOL, &p->force_pbo, NULL},
{"glfinish", OPT_ARG_BOOL, &p->use_glFinish, NULL},
@ -1288,6 +1291,8 @@ static int preinit_internal(struct vo *vo, const char *arg, int allow_sw,
" as lscale but for chroma (2x slower with little visible effect).\n"
" filter-strength=<value>\n"
" set the effect strength for some lscale/cscale filters\n"
" noise-strength=<value>\n"
" set how much noise to add. 1.0 is suitable for dithering to 6 bit.\n"
" customprog=<filename>\n"
" use a custom YUV conversion program\n"
" customtex=<filename>\n"