Skip to content

Commit

Permalink
vo_opengl: remove nnedi3 prescaler
Browse files Browse the repository at this point in the history
  • Loading branch information
bjin authored and wm4 committed Jun 18, 2016
1 parent 47d9fbd commit 61bc965
Show file tree
Hide file tree
Showing 11 changed files with 1 addition and 413 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
/tags
/TAGS
/video/out/x11_icon.inc
/video/out/opengl/nnedi3_weights.inc
/demux/ebml_defs.c
/demux/ebml_types.h
/sub/osd_font.h
Expand Down
3 changes: 0 additions & 3 deletions Copyright
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ the code to LGPLv2.1+ at a later point without asking the contributor. (This
is a safeguard for making potential relicensing of the project to LGPLv2.1+
easier.) Using a more liberal license compatible to LGPLv2.1+ is also ok.

Some GPLv3 or LGPLv3 code in mpv can be enabled by building with --enable-gpl3,
and in this case, the resulting binaries must be distributed under GPLv3.

For information about authors and contributors, consult the git log, which
contains the complete SVN and CVS history as well.

Expand Down
32 changes: 1 addition & 31 deletions DOCS/man/vo.rst
Original file line number Diff line number Diff line change
Expand Up @@ -596,13 +596,6 @@ Available video output drivers are:
Some parameters can be tuned with ``superxbr-sharpness`` and
``superxbr-edge-strength`` options.

``nnedi3``
An artificial neural network based deinterlacer, which can be used
to upscale images.

Extremely slow and requires a recent mid or high end graphics card
to work smoothly (as of 2015).

``prescale-passes=<1..5>``
The number of passes to apply the prescaler (defaults to be 1). Setting
it to 2 will perform a 4x upscaling.
Expand All @@ -621,29 +614,6 @@ Available video output drivers are:

A value less than 1.0 will disable the check.

``nnedi3-neurons=<16|32|64|128>``
Specify the neurons for nnedi3 prescaling (defaults to be 32). The
rendering time is expected to be linear to the number of neurons.

``nnedi3-window=<8x4|8x6>``
Specify the size of local window for sampling in nnedi3 prescaling
(defaults to be ``8x4``). The ``8x6`` window produces sharper images,
but is also slower.

``nnedi3-upload=<ubo|shader>``
Specify how to upload the NN weights to GPU. Depending on the graphics
card, driver, shader compiler and nnedi3 settings, both method can be
faster or slower.

``ubo``
Upload these weights via uniform buffer objects. This is the
default. (requires OpenGL 3.1 / GLES 3.0)

``shader``
Hard code all the weights into the shader source code. (requires
OpenGL 3.3 / GLES 3.0)


``pre-shaders=<files>``, ``post-shaders=<files>``, ``scale-shader=<file>``
Custom GLSL fragment shaders.

Expand Down Expand Up @@ -954,7 +924,7 @@ Available video output drivers are:
angle
Direct3D11 through the OpenGL ES translation layer ANGLE. This
supports almost everything the ``win`` backend does (if the ANGLE
build is new enough), except the ``nnedi3`` prescaler.
build is new enough).
dxinterop (experimental)
Win32, using WGL for rendering and Direct3D 9Ex for presentation.
Works on Nvidia and AMD. Newer Intel chips with the latest drivers
Expand Down
1 change: 0 additions & 1 deletion TOOLS/appveyor-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ export PYTHON=/usr/bin/python3
--check-c-compiler=gcc \
--disable-cdda \
--enable-egl-angle \
--enable-gpl3 \
--enable-jpeg \
--enable-lcms2 \
--enable-libarchive \
Expand Down
248 changes: 0 additions & 248 deletions video/out/opengl/nnedi3.c

This file was deleted.

45 changes: 0 additions & 45 deletions video/out/opengl/nnedi3.h

This file was deleted.

Binary file removed video/out/opengl/nnedi3_weights.bin
Binary file not shown.
Loading

0 comments on commit 61bc965

Please sign in to comment.