1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-19 13:21:13 +00:00
Command line video player
Go to file
Niklas Haas 34bf9be122 vo_opengl: Simplify and clarify color correction code
This commit:

- Changes some of the #define and variable names for clarification and
  adds comments where appropriate.
- Unifies :srgb and :icc-profile, making them fit into the same step of
  the decoding process and removing the weird interactions between both
  of them.
- Makes :icc-profile take precedence over :srgb (to significantly reduce
  the number of confusing and useless special cases)
- Moves BT709 decompanding (approximate or actual) to the shader in all
  cases, making it happen before upscaling (instead of the old 0.45
  gamma function). This is the simpler and more proper way to do it.
- Enables the approx gamma function to work with :srgb as well due to
  this (since they now share the gamma expansion code).
- Renames :icc-approx-gamma to :approx-gamma since it is no longer tied
  to the ICC options or LittleCMS.
- Uses gamma 2.4 as input space for the actual 3DLUT, this is now a
  pretty arbitrary factor but I picked 2.4 mainly because a higher pure
  power value here seems to produce visually better results with wide
  gamut profiles, rather then the previous 1.95 or BT.709.
- Adds the input gamma space to the 3dlut cache header in case we change
  it more in the future, or even make it user customizable (though I
  don't see why the latter would really be necessary).
- Fixes the OSD's gamma when using :srgb, which was previously still
  using the old (0.45) approximation in all cases.
- Updates documentation on :srgb, it was still mentioning the old
  behavior from circa a year ago.

This commit should serve to both open up and make the CMS/shader code much
more accessible and less confusing/error-prone and simultaneously also
improve the performance of 3DLUTs with wide gamut color spaces.

I would liked to have made it more modular but almost all of these
changes are interdependent, save for the documentation updates.

Note: Right now, the "3DLUT takes precedence over SRGB" logic is just
coded into gl_lcms.c's compile_shaders function. Ideally, this should be
done earlier, when parsing the options (by overriding the actual
opts.srgb flag) and output a warning to the user.

Note: I'm not sure how well this works together with real-world
subtitles that may need to be color corrected as well. I'm not sure
whether :approx-gamma needs to apply to subtitles as well. I'll need to
test this on proper files later.

Note: As of now, linear light scaling is still intrinsically tied to
either :srgb or :icc-profile. It would be thinkable to have this as an
extra option, :linear-scaling or similar, that could be used with or
without the two color management options.
2014-03-05 14:22:42 +01:00
audio audio: add enum name for speaker id 2014-02-28 20:54:15 +01:00
bstr bstr: add function for splitting UTF-8 2014-01-15 16:13:07 +01:00
common msg: add --msgtime option to add timestamps to each output message 2014-02-28 22:45:34 +01:00
compat build: make configure fail if both __atomic and __sync are not available 2014-01-01 20:52:54 +01:00
demux demux_lavf: fix typo in comment 2014-03-04 00:32:29 +01:00
DOCS vo_opengl: Simplify and clarify color correction code 2014-03-05 14:22:42 +01:00
etc input: allow input.conf bindings to be declared as builtin 2014-02-25 22:09:20 +01:00
input input: allow input.conf bindings to be declared as builtin 2014-02-25 22:09:20 +01:00
libmpv client APIs: fix some typos 2014-02-28 20:54:47 +01:00
misc charset_conv: mp_msg conversions 2013-12-21 21:43:16 +01:00
options m_property: allow setting string properties via M_PROPERTY_SET_STRING 2014-03-03 12:48:41 +01:00
osdep timer: add utility function to get relative time 2014-02-28 23:18:52 +01:00
player player: reformat some code 2014-03-03 23:58:19 +01:00
stream dvd: treat missing volume ID as "unsupported", not error 2014-02-23 18:16:33 +01:00
sub sub: use new FFmpeg API to check MicroDVD FPS 2014-03-04 00:28:10 +01:00
ta ta: fix comment 2014-02-23 16:51:00 +01:00
TOOLS Parse::Matroska::Reader: get rid of bigrat 2014-02-15 19:43:22 -03:00
video vo_opengl: Simplify and clarify color correction code 2014-03-05 14:22:42 +01:00
waftools build: syms: add support for Mach-O binaries 2014-02-19 21:56:39 +01:00
.gitignore Fix OSX build; remove all remaining mpvcore references 2013-12-17 08:44:21 +01:00
.travis.yml travis: disable e-mail notifications 2013-11-23 22:31:44 +01:00
bootstrap.py build: update waf 2014-03-04 12:08:40 +01:00
Copyright Copyright, LICENSE: switch to GPL version 2 or later 2013-10-13 01:36:10 +02:00
LICENSE Copyright, LICENSE: switch to GPL version 2 or later 2013-10-13 01:36:10 +02:00
old-configure old build: add a missing config.h define 2014-02-23 17:41:58 +01:00
old-makefile build: add option to build a library 2014-02-10 21:25:22 +01:00
README.md build: hide duplicate options from --help 2013-12-26 10:09:17 +01:00
talloc.h Replace talloc 2013-10-13 01:36:09 +02:00
travis-deps travis: remove --disable-doc from libav/ffmpeg configure 2013-11-24 14:47:33 +01:00
version.sh version.sh: don't use git tags for version output (again) 2013-10-14 20:14:17 +02:00
wscript configure: fix typo 2014-02-24 11:50:21 +01:00
wscript_build.py build: add SONAME to libmpv.so 2014-02-11 15:24:49 +01:00

mpv

Build Status

Overview

mpv is a movie player based on MPlayer and mplayer2. It supports a wide variety of video file formats, audio and video codecs, and subtitle types.

If you are wondering what's different from mplayer2 and MPlayer you can read more about the changes.

Compilation

Compiling with full features requires development files for several external libraries. Below is a list of some important requirements.

The mpv build system uses waf but we don't store it in your source tree. The script './bootstrap.py' will download the latest version of waf that was tested with the build system.

For a list of the available build options use ./waf configure --help. If you think you have support for some feature installed but configure fails to detect it, the file build/config.log may contain information about the reasons for the failure.

NOTE: To avoid cluttering the output with unreadable spam, --help only shows one of the two switches for each option. If the option is autodetected by default, the --disable-*** switch is printed; if the option is disabled by default, the --enable-*** switch is printed. Either way, you can use --enable-*** or --disable-** regardless of what is printed by --help.

To build the software you can use ./waf build: the result of the compilation will be located in build/mpv. You can use ./waf install to install mpv to the prefix after it is compiled.

NOTE: Using the old build system (with ./old-configure) should still work, but will be removed in a future version of mpv.

Essential dependencies (incomplete list):

  • gcc or clang
  • X development headers (xlib, X extensions, libvdpau, libGL, libXv, ...)
  • Audio output development headers (libasound, pulseaudio)
  • fribidi, freetype, fontconfig development headers (for libass)
  • libass
  • FFmpeg libraries (libavutil libavcodec libavformat libswscale libpostproc)
  • libjpeg
  • libquvi if you want to play Youtube videos directly
  • libx264/libmp3lame/libfdk-aac if you want to use encoding (has to be explicitly enabled when compiling ffmpeg)

Most of the above libraries are available in suitable versions on normal Linux distributions. However FFmpeg is an exception (distro versions may be too old to work at all or work well). For that reason you may want to use the separately available build wrapper (mpv-build) that first compiles FFmpeg libraries and libass, and then compiles the player statically linked against those.

If you are running Mac OSX and using homebrew we provide homebrew-mpv, an up to date formula that compiles mpv with sensible dependencies and defaults for OSX.

FFmpeg vs. Libav

Generally, mpv should work with the latest release as well as the git version of both FFmpeg and Libav. But FFmpeg is preferred, and some mpv features work with FFmpeg only. See the wiki article about the issue.

Bug reports

Please use the issue tracker provided by GitHub to send us bug reports or feature requests.

Contributing

For small changes you can just send us pull requests through GitHub. For bigger changes come and talk to us on IRC before you start working on them. It will make code review easier for both parties later on.

Contacts

These forms of contact are meant to ask questions about mpv usage, give feedback on mpv and discuss it's development.

If possible, please avoid posting bugs here and use the issue tracker instead.

  • Users IRC Channel: #mpv-player on irc.freenode.net
  • Users Mailing List: mpv-users@googlegroups.com (Archive / Subscribe).
  • Devel Mailing List: mpv-devel@googlegroups.com (Archive / Subscribe)

To contact the mpv team in private write to mpv-team@googlegroups.com.