RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity
44,298 Commits 41 Branches 86 Tags 130 MiB
Commit Graph

12 Commits

Author SHA1 Message Date
wm4 9e6b9d8a98 vo_image: move to global options 
This is a bit "special", because the config tree wants unique
m_sub_options pointers in the whole thing.
 2016-09-05 21:04:55 +02:00
wm4 d51dee093f screenshots: add option to prevent 16 bit output 
That's what it's usually about (again).
 2015-04-29 21:05:04 +02:00
wm4 f07c9b16f9 screenshots: add option to disable JPEG 4:4:4 output 
That's what it's usually about.
 2015-04-29 21:01:08 +02:00
wm4 2469cb5d1f image_writer: factor image conversion into a separate function 
Needed for a later commit.
 2015-04-20 23:04:34 +02:00
wm4 07678423fb image_writer: minor cleanup 
Instead of using int like bool, use bool directly.
 2015-04-20 23:03:32 +02:00
Marcin Kurczewski f43017bfe9 Update license headers 
Signed-off-by: wm4 <wm4@nowhere>
 2015-04-13 12:10:01 +02:00
Niklas Haas a76cc1dafc
Revert "Revert recent vo_opengl related commits" 
Omitted a simple, but devastasting check. Fixed the relevant commits
now.

This reverts commit 8d24e9d9b8.

diff --git a/video/out/gl_video.c b/video/out/gl_video.c
index 9c8a643..f1ea03e 100644
--- a/video/out/gl_video.c
+++ b/video/out/gl_video.c
@@ -1034,9 +1034,9 @@ static void compile_shaders(struct gl_video *p)
     shader_def_opt(&header_conv, "USE_CONV_GAMMA", use_conv_gamma);
     shader_def_opt(&header_conv, "USE_CONST_LUMA", use_const_luma);
     shader_def_opt(&header_conv, "USE_LINEAR_LIGHT_BT1886",
-                   gamma_fun == MP_CSP_TRC_BT_1886);
+                   use_linear_light && gamma_fun == MP_CSP_TRC_BT_1886);
     shader_def_opt(&header_conv, "USE_LINEAR_LIGHT_SRGB",
-                   gamma_fun == MP_CSP_TRC_SRGB);
+                   use_linear_light && gamma_fun == MP_CSP_TRC_SRGB);
     shader_def_opt(&header_conv, "USE_SIGMOID", use_sigmoid);
     if (p->opts.alpha_mode > 0 && p->has_alpha && p->plane_count > 3)
         shader_def(&header_conv, "USE_ALPHA_PLANE", "3");
 2015-02-28 20:23:47 +01:00
wm4 8d24e9d9b8 Revert recent vo_opengl related commits 
Breaks vo_opengl by default. I'm hot able to fix this myself, because I
have no clue about the overcomplicated color management logic. Also,
whilethis is apparently caused by commit fbacd5, the following commits
all depend on it, so revert them too.

This reverts the following commits:
 e141caa97d
 653b0dd529
 729c8b3f64
 fbacd5de31

Fixes #1636.
 2015-02-28 19:29:03 +01:00
Niklas Haas 729c8b3f64
screenshots: add support for csp tagging 
This relies on upstream support in lavc, and will hence basically not
work at all. The intent is to get support for writing this information
into ffmpeg's PNG encoders etc.
 2015-02-28 01:08:32 +01:00
wm4 5beedf1967 image_writer: mp_msg conversions 
Adds an awkward mp_log argument for error messages.
 2013-12-21 20:50:10 +01:00
Martin Herkt 9b5a98676d image_writer: Add PNG filter option (default "mixed") 
The use of filters prior to PNG compression can greatly improve
compression ratio, with "mixed" (ImageMagick calls it "adaptive")
typically achieving the best results.
 2013-06-15 15:48:52 +02:00
wm4 d4bdd0473d Rename directories, move files (step 1 of 2) (does not compile) 
Tis drops the silly lib prefixes, and attempts to organize the tree in
a more logical way. Make the top-level directory less cluttered as
well.

Renames the following directories:
    libaf -> audio/filter
    libao2 -> audio/out
    libvo -> video/out
    libmpdemux -> demux

Split libmpcodecs:
    vf* -> video/filter
    vd*, dec_video.* -> video/decode
    mp_image*, img_format*, ... -> video/
    ad*, dec_audio.* -> audio/decode

libaf/format.* is moved to audio/ - this is similar to how mp_image.*
is located in video/.

Move most top-level .c/.h files to core. (talloc.c/.h is left on top-
level, because it's external.) Park some of the more annoying files
in compat/. Some of these are relicts from the time mplayer used
ffmpeg internals.

sub/ is not split, because it's too much of a mess (subtitle code is
mixed with OSD display and rendering).

Maybe the organization of core is not ideal: it mixes playback core
(like mplayer.c) and utility helpers (like bstr.c/h). Should the need
arise, the playback core will be moved somewhere else, while core
contains all helper and common code.
 2012-11-12 20:06:14 +01:00