diff options
author | Martin Herkt <lachs0r@srsfckn.biz> | 2015-09-23 01:12:42 +0200 |
---|---|---|
committer | Martin Herkt <lachs0r@srsfckn.biz> | 2015-09-23 01:12:42 +0200 |
commit | ead2933792d6ad958c8ac2d50a0169c3c093ff2b (patch) | |
tree | 682e71897c514d537df387e30dc758b8e1bae044 | |
parent | 181e1377b24498f1a335a5eeecf46907edae092a (diff) | |
parent | 79f8ee2808ebdf100d1a3aba9a853f801698a2ad (diff) | |
download | mpv-ead2933792d6ad958c8ac2d50a0169c3c093ff2b.tar.bz2 mpv-ead2933792d6ad958c8ac2d50a0169c3c093ff2b.tar.xz |
Merge branch 'master' into release/current
-rw-r--r-- | DOCS/client-api-changes.rst | 17 | ||||
-rw-r--r-- | DOCS/client_api_examples/sdl/main.c | 3 | ||||
-rw-r--r-- | DOCS/interface-changes.rst | 6 | ||||
-rw-r--r-- | DOCS/man/af.rst | 191 | ||||
-rw-r--r-- | DOCS/man/input.rst | 7 | ||||
-rw-r--r-- | DOCS/man/options.rst | 4 | ||||
-rw-r--r-- | DOCS/man/vf.rst | 72 | ||||
-rw-r--r-- | DOCS/man/vo.rst | 77 | ||||
-rw-r--r-- | DOCS/release-policy.md | 96 | ||||
-rwxr-xr-x | TOOLS/idet.sh | 12 | ||||
-rwxr-xr-x | TOOLS/old-configure | 13 | ||||
-rw-r--r-- | TOOLS/old-makefile | 42 | ||||
-rwxr-xr-x | TOOLS/zsh.pl | 4 | ||||
-rw-r--r-- | audio/audio.c | 7 | ||||
-rw-r--r-- | audio/audio.h | 1 | ||||
-rw-r--r-- | audio/filter/af.c | 53 | ||||
-rw-r--r-- | audio/filter/af.h | 21 | ||||
-rw-r--r-- | audio/filter/af_bs2b.c | 168 | ||||
-rw-r--r-- | audio/filter/af_center.c | 104 | ||||
-rw-r--r-- | audio/filter/af_drc.c | 1 | ||||
-rw-r--r-- | audio/filter/af_equalizer.c | 1 | ||||
-rw-r--r-- | audio/filter/af_export.c | 237 | ||||
-rw-r--r-- | audio/filter/af_extrastereo.c | 132 | ||||
-rw-r--r-- | audio/filter/af_hrtf.c | 670 | ||||
-rw-r--r-- | audio/filter/af_hrtf.h | 510 | ||||
-rw-r--r-- | audio/filter/af_karaoke.c | 86 | ||||
-rw-r--r-- | audio/filter/af_ladspa.c | 851 | ||||
-rw-r--r-- | audio/filter/af_lavfi.c | 23 | ||||
-rw-r--r-- | audio/filter/af_lavrresample.c | 73 | ||||
-rw-r--r-- | audio/filter/af_sinesuppress.c | 117 | ||||
-rw-r--r-- | audio/filter/af_sub.c | 148 | ||||
-rw-r--r-- | audio/filter/af_surround.c | 246 | ||||
-rw-r--r-- | audio/filter/af_sweep.c | 92 | ||||
-rw-r--r-- | audio/filter/af_volume.c | 1 | ||||
-rw-r--r-- | audio/filter/dsp.h | 31 | ||||
-rw-r--r-- | audio/filter/filter.c | 359 | ||||
-rw-r--r-- | audio/filter/filter.h | 74 | ||||
-rw-r--r-- | audio/filter/window.c | 212 | ||||
-rw-r--r-- | audio/filter/window.h | 42 | ||||
-rw-r--r-- | audio/format.c | 56 | ||||
-rw-r--r-- | audio/format.h | 2 | ||||
-rw-r--r-- | audio/out/ao_alsa.c | 37 | ||||
-rw-r--r-- | audio/out/ao_lavc.c | 35 | ||||
-rw-r--r-- | audio/out/ao_oss.c | 3 | ||||
-rw-r--r-- | input/cmd_list.c | 2 | ||||
-rw-r--r-- | input/cmd_parse.c | 7 | ||||
-rw-r--r-- | input/event.c | 2 | ||||
-rw-r--r-- | input/input.c | 2 | ||||
-rw-r--r-- | options/options.c | 2 | ||||
-rw-r--r-- | options/path.c | 8 | ||||
-rw-r--r-- | player/command.c | 37 | ||||
-rw-r--r-- | player/configfiles.c | 2 | ||||
-rw-r--r-- | player/core.h | 2 | ||||
-rw-r--r-- | player/external_files.c (renamed from sub/find_subfiles.c) | 4 | ||||
-rw-r--r-- | player/external_files.h (renamed from sub/find_subfiles.h) | 0 | ||||
-rw-r--r-- | player/loadfile.c | 4 | ||||
-rw-r--r-- | player/lua.c | 2 | ||||
-rw-r--r-- | player/main.c | 18 | ||||
-rw-r--r-- | player/playloop.c | 58 | ||||
-rw-r--r-- | player/video.c | 7 | ||||
-rw-r--r-- | stream/cache.c | 2 | ||||
-rw-r--r-- | sub/osd_libass.c | 14 | ||||
-rw-r--r-- | video/decode/dec_video.c | 10 | ||||
-rw-r--r-- | video/filter/vf.c | 10 | ||||
-rw-r--r-- | video/filter/vf_delogo.c | 76 | ||||
-rw-r--r-- | video/filter/vf_hqdn3d.c | 64 | ||||
-rw-r--r-- | video/filter/vf_lavfi.c | 22 | ||||
-rw-r--r-- | video/filter/vf_noise.c | 71 | ||||
-rw-r--r-- | video/filter/vf_unsharp.c | 85 | ||||
-rw-r--r-- | video/filter/vf_vdpaurb.c | 15 | ||||
-rw-r--r-- | video/filter/vf_yadif.c | 15 | ||||
-rw-r--r-- | video/img_format.c | 20 | ||||
-rw-r--r-- | video/out/opengl/cocoa.c (renamed from video/out/gl_cocoa.c) | 4 | ||||
-rw-r--r-- | video/out/opengl/common.c (renamed from video/out/gl_common.c) | 2 | ||||
-rw-r--r-- | video/out/opengl/common.h (renamed from video/out/gl_common.h) | 4 | ||||
-rw-r--r-- | video/out/opengl/header_fixes.h (renamed from video/out/gl_header_fixes.h) | 0 | ||||
-rw-r--r-- | video/out/opengl/hwdec.c (renamed from video/out/gl_hwdec.c) | 2 | ||||
-rw-r--r-- | video/out/opengl/hwdec.h (renamed from video/out/gl_hwdec.h) | 2 | ||||
-rw-r--r-- | video/out/opengl/hwdec_dxva2.c (renamed from video/out/gl_hwdec_dxva2.c) | 4 | ||||
-rw-r--r-- | video/out/opengl/hwdec_vaglx.c (renamed from video/out/gl_hwdec_vaglx.c) | 4 | ||||
-rw-r--r-- | video/out/opengl/hwdec_vda.c (renamed from video/out/gl_hwdec_vda.c) | 2 | ||||
-rw-r--r-- | video/out/opengl/hwdec_vdpau.c (renamed from video/out/gl_hwdec_vdpau.c) | 4 | ||||
-rw-r--r-- | video/out/opengl/lcms.c (renamed from video/out/gl_lcms.c) | 4 | ||||
-rw-r--r-- | video/out/opengl/lcms.h (renamed from video/out/gl_lcms.h) | 0 | ||||
-rw-r--r-- | video/out/opengl/osd.c (renamed from video/out/gl_osd.c) | 6 | ||||
-rw-r--r-- | video/out/opengl/osd.h (renamed from video/out/gl_osd.h) | 2 | ||||
-rw-r--r-- | video/out/opengl/rpi.c (renamed from video/out/gl_rpi.c) | 6 | ||||
-rw-r--r-- | video/out/opengl/rpi.h (renamed from video/out/gl_rpi.h) | 0 | ||||
-rw-r--r-- | video/out/opengl/utils.c (renamed from video/out/gl_utils.c) | 33 | ||||
-rw-r--r-- | video/out/opengl/utils.h (renamed from video/out/gl_utils.h) | 5 | ||||
-rw-r--r-- | video/out/opengl/video.c (renamed from video/out/gl_video.c) | 857 | ||||
-rw-r--r-- | video/out/opengl/video.h (renamed from video/out/gl_video.h) | 38 | ||||
-rw-r--r-- | video/out/opengl/video_shaders.c | 429 | ||||
-rw-r--r-- | video/out/opengl/video_shaders.h | 52 | ||||
-rw-r--r-- | video/out/opengl/w32.c (renamed from video/out/gl_w32.c) | 4 | ||||
-rw-r--r-- | video/out/opengl/wayland.c (renamed from video/out/gl_wayland.c) | 4 | ||||
-rw-r--r-- | video/out/opengl/x11.c (renamed from video/out/gl_x11.c) | 6 | ||||
-rw-r--r-- | video/out/opengl/x11egl.c (renamed from video/out/gl_x11egl.c) | 4 | ||||
-rw-r--r-- | video/out/vo_opengl.c | 12 | ||||
-rw-r--r-- | video/out/vo_opengl_cb.c | 6 | ||||
-rw-r--r-- | video/out/vo_rpi.c | 4 | ||||
-rw-r--r-- | video/out/w32_common.c | 7 | ||||
-rw-r--r-- | wscript | 29 | ||||
-rw-r--r-- | wscript_build.py | 54 |
104 files changed, 1402 insertions, 5686 deletions
diff --git a/DOCS/client-api-changes.rst b/DOCS/client-api-changes.rst index 8af045d633..2a97fd29e1 100644 --- a/DOCS/client-api-changes.rst +++ b/DOCS/client-api-changes.rst @@ -32,14 +32,15 @@ API changes :: - ... - add "GL_MP_D3D_interfaces" pseudo extension to make it possible to + --- mpv 0.11.0 --- + 1.19 - add "GL_MP_D3D_interfaces" pseudo extension to make it possible to use DXVA2 in OpenGL fullscreen mode in some situations - 1.19 - mpv_request_log_messages() now accepts "terminal-default" as parameter + - mpv_request_log_messages() now accepts "terminal-default" as parameter 1.18 - add MPV_END_FILE_REASON_REDIRECT, and change behavior of MPV_EVENT_END_FILE accordingly - a bunch of interface-changes.rst changes 1.17 - mpv_initialize() now blocks SIGPIPE (details see client.h) - --- mpv 0.9.0 is released --- + --- mpv 0.9.0 --- 1.16 - add mpv_opengl_cb_report_flip() - introduce mpv_opengl_cb_draw() and deprecate mpv_opengl_cb_render() - add MPV_FORMAT_BYTE_ARRAY @@ -48,7 +49,7 @@ API changes mpv.conf. - minor backwards-compatible change to the "seek" and "screenshot" commands (new flag syntax, old additional args deprecated) - --- mpv 0.8.0 is released --- + --- mpv 0.8.0 --- 1.14 - add mpv_wait_async_requests() - the --msg-level option changes its native type from a flat string to a key-value list (setting/reading the option as string still works) @@ -61,7 +62,7 @@ API changes its own and mpv's OpenGL rendering Warning: this API is not stable yet - anything in opengl_cb.h might be changed in completely incompatible ways in minor API bumps - --- mpv 0.7.0 is released --- + --- mpv 0.7.0 --- 1.10 - deprecate/disable everything directly related to script_dispatch (most likely affects nobody) 1.9 - add enum mpv_end_file_reason for mpv_event_end_file.reason @@ -84,7 +85,7 @@ API changes 1.6 - modify "core-idle" property behavior - MPV_EVENT_LOG_MESSAGE now always sends complete lines - introduce numeric log levels (mpv_log_level) - --- mpv 0.6.0 is released --- + --- mpv 0.6.0 --- 1.5 - change in X11 and "--wid" behavior again. The previous change didn't work as expected, and now the behavior can be explicitly controlled with the "input-x11-keyboard" option. This is only a temporary @@ -93,7 +94,7 @@ API changes although the old option name still works. 1.4 - subtle change in X11 and "--wid" behavior (this change was added to 0.5.2, and broke some things, see #1090) - --- mpv 0.5.0 is released --- + --- mpv 0.5.0 --- 1.3 - add MPV_MAKE_VERSION() 1.2 - remove "stream-time-pos" property (no replacement) 1.1 - remap dvdnav:// to dvd:// @@ -105,6 +106,6 @@ API changes insignificant is now significant - add "cache-free" and "cache-used" properties - OSX: the "coreaudio" AO spdif code is split into a separate AO - --- mpv 0.4.0 is released --- + --- mpv 0.4.0 --- 1.0 - the API is declared stable diff --git a/DOCS/client_api_examples/sdl/main.c b/DOCS/client_api_examples/sdl/main.c index ae4b2b25b0..b3b5952668 100644 --- a/DOCS/client_api_examples/sdl/main.c +++ b/DOCS/client_api_examples/sdl/main.c @@ -52,7 +52,8 @@ int main(int argc, char *argv[]) SDL_Window *window = SDL_CreateWindow("hi", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, - 1000, 500, SDL_WINDOW_OPENGL | SDL_WINDOW_SHOWN); + 1000, 500, SDL_WINDOW_OPENGL | SDL_WINDOW_SHOWN | + SDL_WINDOW_RESIZABLE); if (!window) die("failed to create SDL window"); diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst index 2d103ebfb3..713dea8038 100644 --- a/DOCS/interface-changes.rst +++ b/DOCS/interface-changes.rst @@ -19,7 +19,9 @@ Interface changes :: - --- mpv 0.10.0 will be released --- + --- mpv 0.11.0 --- + - add "af-metadata" property + --- mpv 0.10.0 --- - add --video-aspect-method option - add --playlist-pos option - add --video-sync* options @@ -85,4 +87,4 @@ Interface changes - add --screenshot-high-bit-depth - add --screenshot-jpeg-source-chroma - default action for "rescan_external_files" command changes - --- mpv 0.9.0 is released --- + --- mpv 0.9.0 --- diff --git a/DOCS/man/af.rst b/DOCS/man/af.rst index 15bc3050e6..1ff5859d70 100644 --- a/DOCS/man/af.rst +++ b/DOCS/man/af.rst @@ -11,6 +11,10 @@ syntax is: To get a full list of available audio filters, see ``--af=help``. + Also, keep in mind that most actual filters are available via the ``lavfi`` + wrapper, which gives you access to most of libavfilter's filters. This + includes all filters that have been ported from MPlayer to libavfilter. + You can also set defaults for each filter. The defaults are applied before the normal filter parameters. @@ -59,6 +63,13 @@ Available filters are: (If you just want to set defaults for this filter that will be used even by automatically inserted lavrresample instances, you should prefer setting them with ``--af-defaults=lavrresample:...``.) + ``normalize=<yes|no>`` + Whether to normalize when remixing channel layouts (default: yes). This + is e.g. applied when downmixing surround audio to stereo. The advantage + is that this guarantees that no clipping can happen. Unfortunately, + this can also lead to too low volume levels. Whether you enable or + disable this is essentially a matter of taste, but the default uses + the safer choice. ``o=<string>`` Set AVOptions on the SwrContext or AVAudioResampleContext. These should be documented by FFmpeg or Libav. @@ -96,59 +107,6 @@ Available filters are: If the input channel number is less than ``<minch>``, the filter will detach itself (default: 3). -``sweep[=speed]`` - Produces a sine sweep. - - ``<0.0-1.0>`` - Sine function delta, use very low values to hear the sweep. - -``sinesuppress[=freq:decay]`` - Remove a sine at the specified frequency. Useful to get rid of the 50/60 Hz - noise on low quality audio equipment. It only works on mono input. - - ``<freq>`` - The frequency of the sine which should be removed (in Hz) (default: - 50) - ``<decay>`` - Controls the adaptivity (a larger value will make the filter adapt to - amplitude and phase changes quicker, a smaller value will make the - adaptation slower) (default: 0.0001). Reasonable values are around - 0.001. - -``bs2b[=option1:option2:...]`` - Bauer stereophonic to binaural transformation using libbs2b. Improves the - headphone listening experience by making the sound similar to that from - loudspeakers, allowing each ear to hear both channels and taking into - account the distance difference and the head shadowing effect. It is - applicable only to 2-channel audio. - - ``fcut=<300-1000>`` - Set cut frequency in Hz. - ``feed=<10-150>`` - Set feed level for low frequencies in 0.1*dB. - ``profile=<value>`` - Several profiles are available for convenience: - - :default: will be used if nothing else was specified (fcut=700, - feed=45) - :cmoy: Chu Moy circuit implementation (fcut=700, feed=60) - :jmeier: Jan Meier circuit implementation (fcut=650, feed=95) - - If ``fcut`` or ``feed`` options are specified together with a profile, they - will be applied on top of the selected profile. - -``hrtf[=flag]`` - Head-related transfer function: Converts multichannel audio to 2-channel - output for headphones, preserving the spatiality of the sound. - - ==== =================================== - Flag Meaning - ==== =================================== - m matrix decoding of the rear channel - s 2-channel matrix decoding - 0 no matrix decoding (default) - ==== =================================== - ``equalizer=g1:g2:g3:...:g10`` 10 octave band graphic equalizer, implemented using 10 IIR band-pass filters. This means that it works regardless of what type of audio is @@ -354,64 +312,6 @@ Available filters are: ``mpv '--af=format=channels=5.1' '--audio-channels=5.1'`` would always force remixing audio to 5.1 and output it like this. -``sub[=fc:ch]`` |