Commit Graph
1558 Commits
Author SHA1 Message Date
James Ross-Gowan f5c19f29af w32_common: allow window resizing with --no-border
Conflicts:
	video/out/w32_common.c
2015-01-25 17:00:15 +09:00
Niklas Haas ca048e8d6d vo_opengl: Ignore approx-gamma for BT.2020-CL
The details of the non-linear transformation from/to BT.2020's constant
luminance system don't really make sense with any other gamma curve,
since changing the gamma curve completely breaks the chroma channels.
2015-01-25 17:00:15 +09:00
Stefano Pigozzi 4971ad9e17 cocoa: move the gl function loader to gl_cocoa.c 2015-01-25 17:00:15 +09:00
wm4 f24b8cbd47 Do not call strerror()
...because everything is terrible.

strerror() is not documented as having to be thread-safe by POSIX and
C11. (Which is pretty much bullshit, because both mandate threads and
some form of thread-local storage - so there's no excuse why
implementation couldn't implement this in a thread-safe way. Especially
with C11 this is ridiculous, because there is no way to use threads and
convert error numbers to strings at the same time!)

Since we heavily use threads now, we should avoid unsafe functions like
strerror().

strerror_r() is in POSIX, but GNU/glibc deliberately fucks it up and
gives the function different semantics than the POSIX one. It's a bit of
work to convince this piece of shit to expose the POSIX standard
function, and not the messed up GNU one.

strerror_l() is also in POSIX, but only since the 2008 standard, and
thus is not widespread.

The solution is using avlibc (libavutil, by its official name), which
handles the unportable details for us, mostly. We avoid some pain.
2015-01-25 17:00:14 +09:00
wm4 a9db58cc3b vo_opengl_old: fix OSD regression
Commit 0e8fbdbd removed the rg_texture requirement from vo_opengl;
commit 541f6731 changed to a more convenient method. Both commits broke
vo_opengl_old in some ways. vo_opengl_old always requires GL_ALPHA for
single-channel texture, because it draws the OSD without shaders and by
using certain blend modes.

So we need to explicitly distinguish between vo_opengl and vo_opengl_old
in the OSD renderer, and force fixed texture formats for vo_opengl_old.
The other logic is specific to the internals of vo_opengl. (Although it
might be possible to get the same result by playing with the old GL
fixed-function functions in vo_opengl_old. But seems like a waste of
time.)

Fixes #1370.

Conflicts:
	video/out/gl_osd.c
2015-01-25 17:00:14 +09:00
wm4 21c4c50ac6 vo_opengl: remove pointless glFinish calls 2015-01-25 17:00:13 +09:00
wm4 87e635e843 x11: fix mysterious issue with window embedding on OpenBox
For some reason, when using window embedding, and the window manager is
OpenBox, calling XSetWMNormalHints() before the window is mapped, the
initial window position will be off. It leaves some vertical space,
instead of placing it on the top/left corner. Suspiciously, the vertical
space is as much as a the height of normal window decoration.

I don't know what kind of issue this is. Possibly an OpenBox bug, but
then this happens even if the override-redirect flag is set. (This flag
basically tells the X server to ignore the window manager. Normally we
don't set it.) On other window managers, it works fine. So I don't know
why this is happening.

But this is easy to workaround. XSetWMNormalHints() isn't needed at all
if embedding.

Should fix #1235.
2015-01-25 17:00:13 +09:00
wm4 b0759abe9c x11: copy WinID option
For the purpose of making "--wid" setable at any time.
2015-01-25 17:00:13 +09:00
wm4 3d710630a4 vo_opengl: don't use 10 bit video on Intel GPUs
vo_opengl was originally written against OpenGL 3 core, and it seems
GPUs/drivers supporting this are mostly sane. Later, it was made to work
with OpenGL 2.1 too. Lately we removed the requirement for RG textures,
and look, someone reported a problem with "lesser" Intel GPUs.

This commit does the same in vo_opengl what was added to vo_opengl_old a
long time ago.

Fixes #1383.

Conflicts:
	video/out/gl_common.c
	video/out/gl_video.c
2015-01-25 17:00:13 +09:00
wm4 f83e28d893 vo_opengl: remove requirement for RG textures
Features not supported are disabled (although with a misleading error
message).

Conflicts:
	video/out/gl_video.c
	video/out/vo_opengl.c
	video/out/vo_opengl_cb.c
2015-01-25 17:00:12 +09:00
wm4 3f66dd82b1 vo_opengl: never use 1D textures for lookup textures
This was a microoptimization for small filters which need 4 or less
weights per sample point. When I originally wrote this code, using a 1D
texture seemed to give a slight speed gain, but now I couldn't measure
any difference.

Remove this to simplify the code.
2015-01-25 17:00:12 +09:00
wm4 c4c95f0dde vo_opengl: refactor: merge convolution function and sampler entrypoint
There's not much of a reason to have the actual convolution code in a
separate function. Merging them actually simplifies the code a bit, and
gets rid of the repetitious macro invocations to define the functions
for each filter size.

There should be no changes in behavior or output.
2015-01-25 17:00:12 +09:00
wm4 60c6307a97 vo_opengl: extend filter size to 64
For better downscaling.

Maybe the list of filter sizes shouldn't be static...
2015-01-25 17:00:12 +09:00
wm4 99f237beb9 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.)
2015-01-25 17:00:12 +09:00
wm4 6cf54d6bc0 gl_video: minor simplification
Not needed anymore.
2015-01-25 17:00:12 +09:00
wm4 d8455f34c1 player: respect --untimed on last frame
The last video frame is another case that has a separate code path,
although it's pretty similar to the one in commit 73e5aa87. Fix this
in a different way, which also takes care of the last frame case,
although without context the code becomes slightly more tricky.

As further cleanup, move the decision about framedropping itself to
the same place, so the check in vo.c becomes much simpler. The check
for the vo->driver->encode flag, which is remvoed completely, was
redundant too.

Fixes #1480.
2015-01-25 17:00:10 +09:00
wm4 ca34fd569d image_writer: check for conversion errors
This can happen when e.g. a VO returns a screenshot in an unsupported
format.
2015-01-25 17:00:09 +09:00
wm4 6d7eb8346a x11: always use glXGetProcAddressARB()
glXGetProcAddress() is outdated, and as far as I know doesn't give all
the guarantees the "new" ARB function gives.

Probably doesn't matter too much, because until now it always appeared
to work. On the other hand, since this function is (bogusly) used only
on the gl3 code path, it could have happened that users hit this, and
just reverted to vo_opengl_old instead.
2015-01-25 17:00:09 +09:00
Soeren D. Schulze cd99121185 video/out/win_state.c: fix --monitoraspect 2015-01-25 17:00:09 +09:00
wm4 fffd7e7a3a x11: make display-names property stricter
Returning the property before the window is mapped could lead to
confusing behavior, and in particular strange differences between
vo_vdpau and vo_opengl. (vo_opengl creates the window right at the
start, while vdpau waits until the first reconfigure event.) It might
even be possible that for vo_opengl random results were returned,
because the hidden window can have different placement than the actual,
final one on initial video reconfig.

Fix this by returning the property only if the window is considered
mapped. command.c handles this case specifically, and makes the property
unavailable, instead of returning an empty list.
2015-01-25 17:00:09 +09:00
wm4 74a3d29f21 command: make empty vf-metadata not an error
If a filter exists, but has no metadata, just return success. This
allows the user to distinguish between no metadata available, and filter
not inserted.

See #1408.
2015-01-25 17:00:09 +09:00
wm4 07acf5cb9a vf: fix crash if filter doesn't provide control entrypoint
This input command crashed:

    vf add @mf:format=yuv420p ; show_text "${vf-metadata/mf}"

Fixes #1408.
2015-01-25 17:00:09 +09:00
wm4 99cca56a99 vo_opengl, x11: make legacy context warning not an error
Really, this doesn't actually matter. It's printed as error only because
it was once thought to be an mostly unneeded fallback, but it turned out
this is still frequently needed, and users are getting confused.
2015-01-25 17:00:08 +09:00
wm4 676457256a vo_opengl: fix broken rejection of extended scaling
Possibly explains why some users got mysterious FBO errors on crappy
hardware.
2015-01-25 17:00:08 +09:00
wm4 faf561c4ec mp_image: reject invalid display aspect ratio
Having any of these set to 0 makes no sense.

I think some code might still be using 0/0 aspect ratio to signal unset
aspect ratio, but I didn't find it. If there is still code like this, it
should be fixed instead.

Fixes #1467.
2015-01-25 17:00:08 +09:00
xylosper 83d44a4f6a gl_video.c: invalidate image_params in uninit_video()
When the given mp_image_params does not match with that of gl_video,
gl_video_config() always calls uninit_video() but calls init_video()
only if valid format is given.

Since uninit_video() does not change image_params of gl_video,
when the same params as the previous one is given to gl_video_config()
after gl_video is unitialized with invalid format, gl_video_config()
never calls init_video().

To prevent this, invalidate image_params of gl_video in uninit_video().
2015-01-25 17:00:07 +09:00
James Ross-Gowan 6609f68691 dxva2: copy mp_image attributes to sw_img 2015-01-25 17:00:07 +09:00
James Ross-Gowan e2beeffb92 mp_image: copy missing attributes
This adds a couple of missing fields to mp_image_copy_attributes so
things like rotation metadata work.
2015-01-25 17:00:07 +09:00
Stefano Pigozzi 1eb4e90161 cocoa: fix build on 10.9
Use -isInFullScreenMode instead of the property introduced with the 10.10 SDK.
2015-01-25 17:00:07 +09:00
Stefano Pigozzi f3e515c790 cocoa: fix NSMapGet error
regression from 64b6b2ea45
2015-01-25 17:00:07 +09:00
Stefano Pigozzi 906448243c cocoa: fix uninitialization while in fullscreen
This is only needed for switching video track with `_`, since Cocoa
automatically handles cleaning up the application's presentation options when
quitting the process.

Fixes #1399
2015-01-25 17:00:06 +09:00
wm4 e0231926df screenshots: set AVFrame parameters
Currently, libavcodec is rather lenient, but it might get stricter in
the future.

Fixes #1398.
2015-01-25 17:00:06 +09:00
Stefano Pigozzi f88a86a936 cocoa: mark window for redraw after title change
This used to work correctly without the call to displayIfNeeded. I think this
may only be needed for Yosemite.

Fixes #1330
2015-01-14 16:17:05 +01:00
wm4 73eaadf6c3 vo_opengl: clamp filters to their size
This gives better results with fancy-downscaling. The issue here is that
fancy-downscalign "extends" the filter radius by some amount, which
requires using a larger filter size and shader. Then most of the filter
is "unused", but some filters still return non-0 coefficients, which
create heavy artifacts. Just clamp them off.

I'm not sure if this is the right solution, but at least it's better
than before.
2014-12-19 19:23:07 +01:00
Stefano Pigozzi 292f6f1904 cocoa: don't change app activation policy in libmpv
/cc @mpv-player/stable
2014-12-17 20:15:38 +01:00
wm4 3b6e063599 vo_x11: don't attempt to resize when unconfigured
Fixes #1347.

The previous commit actually fixes the crash.
2014-12-17 20:12:06 +01:00
wm4 015218f8c8 vo_x11: check allocation errors
Avoids a crash if allocation fails.
2014-12-17 20:11:41 +01:00
wm4 49c3cbfb4e vd_lavc: fix error handling path
The ctx->pic check must uninitialize the decoder.
2014-12-17 20:11:12 +01:00
wm4 925becfb15 mp_image: check for malloc failure
Or rather, the only reason av_buffer_create() can fail is a malloc
failure.
2014-12-17 20:11:03 +01:00
wm4 34e504bf93 Check some mallocs
Fixes #1337.
2014-12-17 20:09:24 +01:00
wm4 b062b54626 vo_opengl: fix linkage type
Can happen on Windows, I suppose.
2014-12-17 20:06:05 +01:00
wm4 9bee56cc67 vo_opengl: don't crash if framebuffers are not available
In theory, vo_opengl supports operation without framebuffers. But this
has been broken for a while now (commit cc00b3ff is a contender). It
crashed because it unconditionally called gl->BindFramebuffer() (which
is NULL if framebuffers are missing).

Since this function is actually only called to set the default
framebuffer, the simplest way to deal with this is to provide a dummy
function, insteas of uglifying the code with additional if branches.
2014-12-17 20:05:46 +01:00
James Ross-Gowan 9fb0180eb2 w32_common: fix GUID linking in Cygwin 2014-12-17 20:05:07 +01:00
Stefano Pigozzi 1e8dbf8212 cocoa: don't create Dock icon for audio only files
fixes #635
2014-12-08 00:03:34 +01:00
Stefano Pigozzi 8f847437a9 cocoa: don't async redraw when waiting for VO redraw
This fixes the very annoying glitch where the black bars disappear for
a single frame when going fullscreen.
2014-12-07 23:59:02 +01:00
Niklas Haas 863701391c vo_opengl: Linearize non-RGB sRGB files correctly (eg. JPEG)
Signed-off-by: wm4 <wm4@nowhere>
2014-12-01 21:07:26 +01:00
Niklas Haas 3803c14279 vo_opengl: Reword comment in shader
I didn't quite understand this comment after looking at the code again
months later, so I reworded it for better clarity.
2014-12-01 21:07:12 +01:00
wm4 39126c3828 vo_opengl: make operator precedence explicit
More readable.
2014-12-01 21:07:06 +01:00
wm4 9bf66294f8 vo_opengl: fix srgb with certain inputs
Sampling from the source texture and scaling must always be done
separately in this mode.

Fix suggested by haasn.

Still looks a bit wrong, though.
2014-12-01 21:05:20 +01:00
wm4 577378b827 vo_opengl: something
Insert explanation here.

Fixes #1023.
2014-12-01 21:05:15 +01:00