diff options
| author | wm4 <wm4@nowhere> | 2014-12-06 01:45:39 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-12-06 01:45:39 +0100 |
| commit | 115b165b98c02646c81f8562e2f8e315ee4a7388 (patch) | |
| tree | 6fd8d6b14eb61d94f539c095b946c788169f1b8e /video/out/gl_video.c | |
| parent | df3647061174a3375bf112b6eb4a1ddd572900fa (diff) | |
| download | mpv-115b165b98c02646c81f8562e2f8e315ee4a7388.tar.bz2 mpv-115b165b98c02646c81f8562e2f8e315ee4a7388.tar.xz | |
vo_opengl: extend filter size to 32
Also replace the weights calculations for 8/12/16 with the generic
weight function definition macro. (The weights 2/4/6 follow slightly
different rules.)
Diffstat (limited to 'video/out/gl_video.c')
| -rw-r--r-- | video/out/gl_video.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/video/out/gl_video.c b/video/out/gl_video.c index 07ba0bd602..c3bd88a21c 100644 --- a/video/out/gl_video.c +++ b/video/out/gl_video.c @@ -81,10 +81,11 @@ const struct lut_tex_format lut_tex_formats[] = { [8] = {2, GL_RGBA16F, GL_RGBA}, [12] = {3, GL_RGBA16F, GL_RGBA}, [16] = {4, GL_RGBA16F, GL_RGBA}, + [32] = {8, GL_RGBA16F, GL_RGBA}, }; // must be sorted, and terminated with 0 -static const int filter_sizes[] = {2, 4, 6, 8, 12, 16, 0}; +static const int filter_sizes[] = {2, 4, 6, 8, 12, 16, 32, 0}; struct vertex { float position[2]; @@ -335,8 +336,8 @@ const struct m_sub_options gl_video_conf = { OPT_FLOAT("lparam2", scaler_params[0][1], 0), OPT_FLOAT("cparam1", scaler_params[1][0], 0), OPT_FLOAT("cparam2", scaler_params[1][1], 0), - OPT_FLOATRANGE("lradius", scaler_radius[0], 0, 1.0, 8.0), - OPT_FLOATRANGE("cradius", scaler_radius[1], 0, 1.0, 8.0), + OPT_FLOATRANGE("lradius", scaler_radius[0], 0, 1.0, 16.0), + OPT_FLOATRANGE("cradius", scaler_radius[1], 0, 1.0, 16.0), OPT_FLAG("scaler-resizes-only", scaler_resizes_only, 0), OPT_FLAG("fancy-downscaling", fancy_downscaling, 0), OPT_FLAG("indirect", indirect, 0), |