2014-03-11 23:40:55 +00:00
|
|
|
import re
|
2014-11-19 17:51:53 +00:00
|
|
|
import os
|
2014-03-11 23:40:55 +00:00
|
|
|
|
2013-07-16 11:28:28 +00:00
|
|
|
def _add_rst_manual_dependencies(ctx):
|
|
|
|
manpage_sources_basenames = """
|
|
|
|
options.rst ao.rst vo.rst af.rst vf.rst encode.rst
|
2017-10-09 15:30:41 +00:00
|
|
|
input.rst osc.rst stats.rst lua.rst ipc.rst changes.rst""".split()
|
2013-07-16 11:28:28 +00:00
|
|
|
|
2014-06-20 21:01:12 +00:00
|
|
|
manpage_sources = ['DOCS/man/'+x for x in manpage_sources_basenames]
|
2013-07-16 11:28:28 +00:00
|
|
|
|
|
|
|
for manpage_source in manpage_sources:
|
|
|
|
ctx.add_manual_dependency(
|
2014-06-20 21:01:12 +00:00
|
|
|
ctx.path.find_node('DOCS/man/mpv.rst'),
|
2013-07-16 11:28:28 +00:00
|
|
|
ctx.path.find_node(manpage_source))
|
|
|
|
|
2015-12-29 19:57:09 +00:00
|
|
|
def _build_html(ctx):
|
|
|
|
ctx(
|
|
|
|
name = 'rst2html',
|
|
|
|
target = 'DOCS/man/mpv.html',
|
|
|
|
source = 'DOCS/man/mpv.rst',
|
|
|
|
rule = '${RST2HTML} ${SRC} ${TGT}',
|
2016-07-26 06:55:54 +00:00
|
|
|
install_path = ctx.env.HTMLDIR)
|
2015-12-29 19:57:09 +00:00
|
|
|
|
|
|
|
_add_rst_manual_dependencies(ctx)
|
|
|
|
|
2013-07-16 11:28:28 +00:00
|
|
|
def _build_man(ctx):
|
|
|
|
ctx(
|
|
|
|
name = 'rst2man',
|
2014-06-20 21:01:12 +00:00
|
|
|
target = 'DOCS/man/mpv.1',
|
|
|
|
source = 'DOCS/man/mpv.rst',
|
2016-12-14 00:21:30 +00:00
|
|
|
rule = '${RST2MAN} --strip-elements-with-class=contents ${SRC} ${TGT}',
|
2013-11-23 10:35:16 +00:00
|
|
|
install_path = ctx.env.MANDIR + '/man1')
|
2013-07-16 11:28:28 +00:00
|
|
|
|
|
|
|
_add_rst_manual_dependencies(ctx)
|
|
|
|
|
|
|
|
def _build_pdf(ctx):
|
2014-01-08 15:43:33 +00:00
|
|
|
ctx(
|
|
|
|
name = 'rst2pdf',
|
2014-06-20 21:01:12 +00:00
|
|
|
target = 'DOCS/man/mpv.pdf',
|
|
|
|
source = 'DOCS/man/mpv.rst',
|
2016-12-11 00:01:42 +00:00
|
|
|
rule = '${RST2PDF} -c -b 1 --repeat-table-rows ${SRC} -o ${TGT}',
|
2014-01-08 15:43:33 +00:00
|
|
|
install_path = ctx.env.DOCDIR)
|
2013-07-16 11:28:28 +00:00
|
|
|
|
|
|
|
_add_rst_manual_dependencies(ctx)
|
|
|
|
|
2014-12-28 08:38:22 +00:00
|
|
|
def _all_includes(ctx):
|
|
|
|
return [ctx.bldnode.abspath(), ctx.srcnode.abspath()] + \
|
|
|
|
ctx.dependencies_includes()
|
|
|
|
|
2013-07-16 11:28:28 +00:00
|
|
|
def build(ctx):
|
|
|
|
ctx.load('waf_customizations')
|
|
|
|
ctx.load('generators.sources')
|
|
|
|
|
2016-12-17 16:12:56 +00:00
|
|
|
ctx(
|
|
|
|
features = "file2string",
|
2014-01-14 07:18:05 +00:00
|
|
|
source = "TOOLS/osxbundle/mpv.app/Contents/Resources/icon.icns",
|
2016-12-17 16:12:56 +00:00
|
|
|
target = "osdep/macosx_icon.inc",
|
|
|
|
)
|
2014-01-14 07:18:05 +00:00
|
|
|
|
2016-12-17 16:12:56 +00:00
|
|
|
ctx(
|
|
|
|
features = "file2string",
|
2017-07-01 13:56:12 +00:00
|
|
|
source = "etc/mpv-icon-8bit-16x16.png",
|
|
|
|
target = "video/out/x11_icon_16.inc",
|
|
|
|
)
|
|
|
|
|
|
|
|
ctx(
|
|
|
|
features = "file2string",
|
|
|
|
source = "etc/mpv-icon-8bit-32x32.png",
|
|
|
|
target = "video/out/x11_icon_32.inc",
|
|
|
|
)
|
|
|
|
|
|
|
|
ctx(
|
|
|
|
features = "file2string",
|
|
|
|
source = "etc/mpv-icon-8bit-64x64.png",
|
|
|
|
target = "video/out/x11_icon_64.inc",
|
2016-12-17 16:12:56 +00:00
|
|
|
)
|
2013-07-16 11:28:28 +00:00
|
|
|
|
2017-07-02 03:04:20 +00:00
|
|
|
ctx(
|
|
|
|
features = "file2string",
|
|
|
|
source = "etc/mpv-icon-8bit-128x128.png",
|
|
|
|
target = "video/out/x11_icon_128.inc",
|
|
|
|
)
|
|
|
|
|
2016-12-17 16:12:56 +00:00
|
|
|
ctx(
|
|
|
|
features = "file2string",
|
2013-07-16 11:28:28 +00:00
|
|
|
source = "etc/input.conf",
|
2016-12-17 16:12:56 +00:00
|
|
|
target = "input/input_conf.h",
|
|
|
|
)
|
2013-07-16 11:28:28 +00:00
|
|
|
|
2016-12-17 16:12:56 +00:00
|
|
|
ctx(
|
|
|
|
features = "file2string",
|
2016-09-15 11:45:23 +00:00
|
|
|
source = "etc/builtin.conf",
|
2016-12-17 16:12:56 +00:00
|
|
|
target = "player/builtin_conf.inc",
|
|
|
|
)
|
2016-09-15 11:45:23 +00:00
|
|
|
|
2016-12-17 16:12:56 +00:00
|
|
|
ctx(
|
|
|
|
features = "file2string",
|
2013-07-16 11:28:28 +00:00
|
|
|
source = "sub/osd_font.otf",
|
2016-12-17 16:12:56 +00:00
|
|
|
target = "sub/osd_font.h",
|
|
|
|
)
|
2013-07-16 11:28:28 +00:00
|
|
|
|
2014-11-19 17:51:53 +00:00
|
|
|
lua_files = ["defaults.lua", "assdraw.lua", "options.lua", "osc.lua",
|
2017-09-26 23:17:47 +00:00
|
|
|
"ytdl_hook.lua", "stats.lua"]
|
2016-12-17 16:12:56 +00:00
|
|
|
|
2014-11-19 17:51:53 +00:00
|
|
|
for fn in lua_files:
|
|
|
|
fn = "player/lua/" + fn
|
2016-12-17 16:12:56 +00:00
|
|
|
ctx(
|
|
|
|
features = "file2string",
|
|
|
|
source = fn,
|
|
|
|
target = os.path.splitext(fn)[0] + ".inc",
|
|
|
|
)
|
2013-07-16 11:28:28 +00:00
|
|
|
|
2014-12-13 16:27:47 +00:00
|
|
|
ctx(
|
|
|
|
features = "file2string",
|
|
|
|
source = "player/javascript/defaults.js",
|
|
|
|
target = "player/javascript/defaults.js.inc",
|
|
|
|
)
|
|
|
|
|
2017-10-01 20:16:49 +00:00
|
|
|
if ctx.dependency_satisfied('wayland'):
|
|
|
|
ctx.wayland_protocol_code(proto_dir = ctx.env.WL_PROTO_DIR,
|
|
|
|
protocol = "unstable/xdg-shell/xdg-shell-unstable-v6",
|
|
|
|
target = "video/out/wayland/xdg-shell-v6.c")
|
|
|
|
ctx.wayland_protocol_header(proto_dir = ctx.env.WL_PROTO_DIR,
|
|
|
|
protocol = "unstable/xdg-shell/xdg-shell-unstable-v6",
|
|
|
|
target = "video/out/wayland/xdg-shell-v6.h")
|
|
|
|
ctx.wayland_protocol_code(proto_dir = ctx.env.WL_PROTO_DIR,
|
|
|
|
protocol = "unstable/idle-inhibit/idle-inhibit-unstable-v1",
|
|
|
|
target = "video/out/wayland/idle-inhibit-v1.c")
|
|
|
|
ctx.wayland_protocol_header(proto_dir = ctx.env.WL_PROTO_DIR,
|
|
|
|
protocol = "unstable/idle-inhibit/idle-inhibit-unstable-v1",
|
|
|
|
target = "video/out/wayland/idle-inhibit-v1.h")
|
|
|
|
ctx.wayland_protocol_code(proto_dir = "../video/out/wayland",
|
|
|
|
protocol = "server-decoration",
|
|
|
|
target = "video/out/wayland/srv-decor.c")
|
|
|
|
ctx.wayland_protocol_header(proto_dir = "../video/out/wayland",
|
|
|
|
protocol = "server-decoration",
|
|
|
|
target = "video/out/wayland/srv-decor.h")
|
|
|
|
|
2017-01-07 13:59:30 +00:00
|
|
|
ctx(features = "ebml_header", target = "ebml_types.h")
|
|
|
|
ctx(features = "ebml_definitions", target = "ebml_defs.c")
|
2013-07-16 11:28:28 +00:00
|
|
|
|
2017-08-22 09:40:39 +00:00
|
|
|
if ctx.dependency_satisfied('cplayer'):
|
|
|
|
main_fn_c = ctx.pick_first_matching_dep([
|
|
|
|
( "osdep/main-fn-cocoa.c", "cocoa" ),
|
|
|
|
( "osdep/main-fn-unix.c", "posix" ),
|
|
|
|
( "osdep/main-fn-win.c", "win32-desktop" ),
|
|
|
|
])
|
2017-06-27 11:47:46 +00:00
|
|
|
|
|
|
|
getch2_c = ctx.pick_first_matching_dep([
|
|
|
|
( "osdep/terminal-unix.c", "posix" ),
|
|
|
|
( "osdep/terminal-win.c", "win32-desktop" ),
|
|
|
|
( "osdep/terminal-dummy.c" ),
|
|
|
|
])
|
|
|
|
|
|
|
|
timer_c = ctx.pick_first_matching_dep([
|
|
|
|
( "osdep/timer-win2.c", "os-win32" ),
|
|
|
|
( "osdep/timer-darwin.c", "os-darwin" ),
|
|
|
|
( "osdep/timer-linux.c", "posix" ),
|
|
|
|
])
|
|
|
|
|
|
|
|
ipc_c = ctx.pick_first_matching_dep([
|
|
|
|
( "input/ipc-unix.c", "posix" ),
|
|
|
|
( "input/ipc-win.c", "win32-desktop" ),
|
|
|
|
( "input/ipc-dummy.c" ),
|
|
|
|
])
|
|
|
|
|
|
|
|
subprocess_c = ctx.pick_first_matching_dep([
|
|
|
|
( "osdep/subprocess-posix.c", "posix-spawn" ),
|
|
|
|
( "osdep/subprocess-win.c", "win32-desktop" ),
|
|
|
|
( "osdep/subprocess-dummy.c" ),
|
|
|
|
])
|
2013-07-16 11:28:28 +00:00
|
|
|
|
|
|
|
sources = [
|
|
|
|
## Audio
|
2017-09-21 09:07:02 +00:00
|
|
|
( "audio/aconverter.c" ),
|
2017-09-21 10:48:30 +00:00
|
|
|
( "audio/audio.c", "libaf" ),
|
2013-07-16 11:28:28 +00:00
|
|
|
( "audio/audio_buffer.c" ),
|
|
|
|
( "audio/chmap.c" ),
|
|
|
|
( "audio/chmap_sel.c" ),
|
|
|
|
( "audio/fmt-conversion.c" ),
|
|
|
|
( "audio/format.c" ),
|
audio: introduce a new type to hold audio frames
This is pretty pointless, but I believe it allows us to claim that the
new code is not affected by the copyright of the old code. This is
needed, because the original mp_audio struct was written by someone who
has disagreed with LGPL relicensing (it was called af_data at the time,
and was defined in af.h).
The "GPL'ed" struct contents that surive are pretty trivial: just the
data pointer, and some metadata like the format, samplerate, etc. - but
at least in this case, any new code would be extremely similar anyway,
and I'm not really sure whether it's OK to claim different copyright. So
what we do is we just use AVFrame (which of course is LGPL with 100%
certainty), and add some accessors around it to adapt it to mpv
conventions.
Also, this gets rid of some annoying conventions of mp_audio, like the
struct fields that require using an accessor to write to them anyway.
For the most part, this change is only dumb replacements of mp_audio
related functions and fields. One minor actual change is that you can't
allocate the new type on the stack anymore.
Some code still uses mp_audio. All audio filter code will be deleted, so
it makes no sense to convert this code. (Audio filters which are LGPL
and which we keep will have to be ported to a new filter infrastructure
anyway.) player/audio.c uses it because it interacts with the old filter
code. push.c has some complex use of mp_audio and mp_audio_buffer, but
this and pull.c will most likely be rewritten to do something else.
2017-08-16 19:00:20 +00:00
|
|
|
( "audio/aframe.c" ),
|
2013-07-16 11:28:28 +00:00
|
|
|
( "audio/decode/ad_lavc.c" ),
|
|
|
|
( "audio/decode/ad_spdif.c" ),
|
|
|
|
( "audio/decode/dec_audio.c" ),
|
2017-09-21 10:48:30 +00:00
|
|
|
( "audio/filter/af.c", "libaf" ),
|
|
|
|
( "audio/filter/af_channels.c", "libaf" ),
|
|
|
|
( "audio/filter/af_equalizer.c", "libaf" ),
|
|
|
|
( "audio/filter/af_format.c", "libaf" ),
|
|
|
|
( "audio/filter/af_lavcac3enc.c", "libaf" ),
|
|
|
|
( "audio/filter/af_lavfi.c", "libaf" ),
|
|
|
|
( "audio/filter/af_lavrresample.c", "libaf" ),
|
|
|
|
( "audio/filter/af_pan.c", "libaf" ),
|
2017-09-21 11:50:18 +00:00
|
|
|
( "audio/filter/af_rubberband.c", "rubberband" ),
|
2017-09-21 10:48:30 +00:00
|
|
|
( "audio/filter/af_scaletempo.c", "libaf" ),
|
|
|
|
( "audio/filter/af_volume.c", "libaf" ),
|
|
|
|
( "audio/filter/tools.c", "libaf" ),
|
2013-07-16 11:28:28 +00:00
|
|
|
( "audio/out/ao.c" ),
|
|
|
|
( "audio/out/ao_alsa.c", "alsa" ),
|
2016-10-19 22:08:48 +00:00
|
|
|
( "audio/out/ao_audiounit.m", "audiounit" ),
|
|
|
|
( "audio/out/ao_coreaudio_chmap.c", "audiounit" ),
|
|
|
|
( "audio/out/ao_coreaudio_utils.c", "audiounit" ),
|
2013-07-16 11:28:28 +00:00
|
|
|
( "audio/out/ao_coreaudio.c", "coreaudio" ),
|
2015-05-05 19:47:19 +00:00
|
|
|
( "audio/out/ao_coreaudio_chmap.c", "coreaudio" ),
|
2014-10-23 07:55:17 +00:00
|
|
|
( "audio/out/ao_coreaudio_exclusive.c", "coreaudio" ),
|
2013-07-16 11:28:28 +00:00
|
|
|
( "audio/out/ao_coreaudio_properties.c", "coreaudio" ),
|
|
|
|
( "audio/out/ao_coreaudio_utils.c", "coreaudio" ),
|
|
|
|
( "audio/out/ao_jack.c", "jack" ),
|
|
|
|
( "audio/out/ao_lavc.c", "encoding" ),
|
|
|
|
( "audio/out/ao_null.c" ),
|
|
|
|
( "audio/out/ao_openal.c", "openal" ),
|
2016-02-14 17:03:47 +00:00
|
|
|
( "audio/out/ao_opensles.c", "opensles" ),
|
2013-07-16 11:28:28 +00:00
|
|
|
( "audio/out/ao_oss.c", "oss-audio" ),
|
|
|
|
( "audio/out/ao_pcm.c" ),
|
|
|
|
( "audio/out/ao_pulse.c", "pulse" ),
|
|
|
|
( "audio/out/ao_rsound.c", "rsound" ),
|
2014-01-24 23:30:28 +00:00
|
|
|
( "audio/out/ao_sdl.c", "sdl1" ),
|
2013-07-16 11:28:28 +00:00
|
|
|
( "audio/out/ao_sdl.c", "sdl2" ),
|
|
|
|
( "audio/out/ao_sndio.c", "sndio" ),
|
|
|
|
( "audio/out/ao_wasapi.c", "wasapi" ),
|
2014-03-09 23:13:36 +00:00
|
|
|
( "audio/out/ao_wasapi_utils.c", "wasapi" ),
|
2014-11-17 11:37:51 +00:00
|
|
|
( "audio/out/ao_wasapi_changenotify.c", "wasapi" ),
|
2014-03-08 23:04:37 +00:00
|
|
|
( "audio/out/pull.c" ),
|
|
|
|
( "audio/out/push.c" ),
|
2013-07-16 11:28:28 +00:00
|
|
|
|
|
|
|
## Core
|
2013-12-17 01:39:45 +00:00
|
|
|
( "common/av_common.c" ),
|
|
|
|
( "common/av_log.c" ),
|
|
|
|
( "common/codecs.c" ),
|
|
|
|
( "common/encode_lavc.c", "encoding" ),
|
|
|
|
( "common/common.c" ),
|
2014-04-13 12:01:55 +00:00
|
|
|
( "common/tags.c" ),
|
2013-12-17 01:39:45 +00:00
|
|
|
( "common/msg.c" ),
|
|
|
|
( "common/playlist.c" ),
|
2017-02-07 16:05:17 +00:00
|
|
|
( "common/recorder.c" ),
|
2013-12-17 01:39:45 +00:00
|
|
|
( "common/version.c" ),
|
2013-07-16 11:28:28 +00:00
|
|
|
|
|
|
|
## Demuxers
|
|
|
|
( "demux/codec_tags.c" ),
|
2015-05-19 19:36:21 +00:00
|
|
|
( "demux/cue.c" ),
|
2013-07-16 11:28:28 +00:00
|
|
|
( "demux/demux.c" ),
|
|
|
|
( "demux/demux_cue.c" ),
|
2014-07-14 23:49:02 +00:00
|
|
|
( "demux/demux_disc.c" ),
|
2013-07-16 11:28:28 +00:00
|
|
|
( "demux/demux_edl.c" ),
|
|
|
|
( "demux/demux_lavf.c" ),
|
stream: libarchive wrapper for reading compressed archives
This works similar to the existing .rar support, but uses libarchive.
libarchive supports a number of formats, including zip and (most of)
rar.
Unfortunately, seeking does not work too well. Most libarchive readers
do not support seeking, so it's emulated by skipping data until the
target position. On backwards seek, the file is reopened. This works
fine on a local machine (and if the file is not too large), but will
perform not so well over network connection.
This is disabled by default for now. One reason is that we try
libarchive on every file we open, before trying libavformat, and I'm not
sure if I trust libarchive that much yet. Another reason is that this
breaks multivolume rar support. While libarchive supports seeking in
rar, and (probably) supports multivolume archive, our support of
libarchive (probably) does not. I don't care about multivolume rar, but
vocal users do.
2015-08-16 22:55:26 +00:00
|
|
|
( "demux/demux_libarchive.c", "libarchive" ),
|
2013-07-16 11:28:28 +00:00
|
|
|
( "demux/demux_mf.c" ),
|
|
|
|
( "demux/demux_mkv.c" ),
|
2015-02-17 22:47:37 +00:00
|
|
|
( "demux/demux_mkv_timeline.c" ),
|
2016-03-04 22:51:55 +00:00
|
|
|
( "demux/demux_null.c" ),
|
2013-07-16 11:28:28 +00:00
|
|
|
( "demux/demux_playlist.c" ),
|
|
|
|
( "demux/demux_raw.c" ),
|
2015-03-24 20:29:09 +00:00
|
|
|
( "demux/demux_rar.c" ),
|
Rewrite ordered chapters and timeline stuff
This uses a different method to piece segments together. The old
approach basically changes to a new file (with a new start offset) any
time a segment ends. This meant waiting for audio/video end on segment
end, and then changing to the new segment all at once. It had a very
weird impact on the playback core, and some things (like truly gapless
segment transitions, or frame backstepping) just didn't work.
The new approach adds the demux_timeline pseudo-demuxer, which presents
an uniform packet stream from the many segments. This is pretty similar
to how ordered chapters are implemented everywhere else. It also reminds
of the FFmpeg concat pseudo-demuxer.
The "pure" version of this approach doesn't work though. Segments can
actually have different codec configurations (different extradata), and
subtitles are most likely broken too. (Subtitles have multiple corner
cases which break the pure stream-concatenation approach completely.)
To counter this, we do two things:
- Reinit the decoder with each segment. We go as far as allowing
concatenating files with completely different codecs for the sake
of EDL (which also uses the timeline infrastructure). A "lighter"
approach would try to make use of decoder mechanism to update e.g.
the extradata, but that seems fragile.
- Clip decoded data to segment boundaries. This is equivalent to
normal playback core mechanisms like hr-seek, but now the playback
core doesn't need to care about these things.
These two mechanisms are equivalent to what happened in the old
implementation, except they don't happen in the playback core anymore.
In other words, the playback core is completely relieved from timeline
implementation details. (Which honestly is exactly what I'm trying to
do here. I don't think ordered chapter behavior deserves improvement,
even if it's bad - but I want to get it out from the playback core.)
There is code duplication between audio and video decoder common code.
This is awful and could be shareable - but this will happen later.
Note that the audio path has some code to clip audio frames for the
purpose of codec preroll/gapless handling, but it's not shared as
sharing it would cause more pain than it would help.
2016-02-15 20:04:07 +00:00
|
|
|
( "demux/demux_timeline.c" ),
|
2014-07-05 15:00:23 +00:00
|
|
|
( "demux/demux_tv.c", "tv" ),
|
2013-07-16 11:28:28 +00:00
|
|
|
( "demux/ebml.c" ),
|
2014-07-05 14:45:28 +00:00
|
|
|
( "demux/packet.c" ),
|
2015-02-17 22:46:12 +00:00
|
|
|
( "demux/timeline.c" ),
|
2013-07-16 11:28:28 +00:00
|
|
|
|
2013-12-17 00:23:09 +00:00
|
|
|
## Input
|
2013-12-26 16:10:35 +00:00
|
|
|
( "input/cmd_list.c" ),
|
|
|
|
( "input/cmd_parse.c" ),
|
2014-01-04 15:59:22 +00:00
|
|
|
( "input/event.c" ),
|
2013-12-17 00:23:09 +00:00
|
|
|
( "input/input.c" ),
|
2016-03-17 08:27:30 +00:00
|
|
|
( "input/ipc.c" ),
|
2017-06-27 11:47:46 +00:00
|
|
|
( ipc_c ),
|
2013-12-26 16:10:35 +00:00
|
|
|
( "input/keycodes.c" ),
|
2017-06-27 11:47:46 +00:00
|
|
|
( "input/pipe-win32.c", "win32-pipes" ),
|
2013-12-17 00:23:09 +00:00
|
|
|
|
2013-12-17 01:39:45 +00:00
|
|
|
## Misc
|
2014-08-29 10:09:04 +00:00
|
|
|
( "misc/bstr.c" ),
|
2013-12-17 01:39:45 +00:00
|
|
|
( "misc/charset_conv.c" ),
|
2014-04-23 18:37:57 +00:00
|
|
|
( "misc/dispatch.c" ),
|
2014-10-16 09:48:18 +00:00
|
|
|
( "misc/json.c" ),
|
2016-08-28 17:33:52 +00:00
|
|
|
( "misc/node.c" ),
|
2014-04-23 18:37:57 +00:00
|
|
|
( "misc/ring.c" ),
|
Add Plan 9-style barriers
Plan 9 has a very interesting synchronization mechanism, the
rendezvous() call. A good property of this is that you don't need to
explicitly initialize and destroy a barrier object, unlike as with e.g.
POSIX barriers (which are mandatory to begin with). Upon "meeting", they
can exchange a value.
This mechanism will be nice to synchronize certain stages of
initialization between threads in the following commit.
Unlike Plan 9 rendezvous(), this is not implemented with a hashtable,
because that would require additional effort (especially if you want to
make it actually scele). Unlike the Plan 9 variant, we use intptr_t
instead of void* as type for the value, because I expect that we will be
mostly passing a status code as value and not a pointer. Converting an
integer to void* requires two cast (because the integer needs to be
intptr_t), the other way around it's only one cast.
We don't particularly care about performance in this case either. It's
simply not important for our use-case. So a simple linked list is used
for waiters, and on wakeup, all waiters are temporarily woken up.
2014-07-26 18:29:48 +00:00
|
|
|
( "misc/rendezvous.c" ),
|
player: make screenshot commands honor the async flag
And also change input.conf to make all screenshots async. (Except the
every-frame mode, which always uses synchronous mode and ignores the
flag.) By default, the "screenshot" command is still asynchronous,
because scripts etc. might depend on this behavior.
This is only partially async. The code for determining the filename is
still always run synchronously. Only encoding the screenshot and writing
it to disk is asynchronous. We explicitly document the exact behavior as
undefined, so it can be changed any time.
Some of this is a bit messy, because I wanted to avoid duplicating the
message display code between sync and async mode. In async mode, this is
called from a worker thread, which is not safe because showing a message
accesses the thread-unsafe OSD code. So the core has to be locked during
this, which implies accessing the core and all that. So the code has
weird locking calls, and we need to do core destruction in a more
"controlled" manner (thus the outstanding_async field).
(What I'd really want would be the OSD simply showing log messages
instead.)
This is pretty untested, so expect bugs.
Fixes #4250.
2017-04-01 18:45:20 +00:00
|
|
|
( "misc/thread_pool.c" ),
|
2013-12-17 01:39:45 +00:00
|
|
|
|
2013-12-17 01:02:25 +00:00
|
|
|
## Options
|
|
|
|
( "options/m_config.c" ),
|
|
|
|
( "options/m_option.c" ),
|
|
|
|
( "options/m_property.c" ),
|
|
|
|
( "options/options.c" ),
|
|
|
|
( "options/parse_commandline.c" ),
|
|
|
|
( "options/parse_configfile.c" ),
|
|
|
|
( "options/path.c" ),
|
|
|
|
|
2013-12-16 23:53:22 +00:00
|
|
|
## Player
|
|
|
|
( "player/audio.c" ),
|
2014-02-10 20:01:35 +00:00
|
|
|
( "player/client.c" ),
|
2013-12-16 23:53:22 +00:00
|
|
|
( "player/command.c" ),
|
|
|
|
( "player/configfiles.c" ),
|
2015-09-20 16:05:06 +00:00
|
|
|
( "player/external_files.c" ),
|
2013-12-16 23:53:22 +00:00
|
|
|
( "player/loadfile.c" ),
|
|
|
|
( "player/main.c" ),
|
|
|
|
( "player/misc.c" ),
|
2016-02-05 22:19:56 +00:00
|
|
|
( "player/lavfi.c" ),
|
2013-12-17 00:15:48 +00:00
|
|
|
( "player/lua.c", "lua" ),
|
2014-12-13 16:27:47 +00:00
|
|
|
( "player/javascript.c", "javascript" ),
|
2013-12-16 23:53:22 +00:00
|
|
|
( "player/osd.c" ),
|
|
|
|
( "player/playloop.c" ),
|
|
|
|
( "player/screenshot.c" ),
|
2014-05-12 23:14:07 +00:00
|
|
|
( "player/scripting.c" ),
|
2013-12-16 23:53:22 +00:00
|
|
|
( "player/sub.c" ),
|
|
|
|
( "player/video.c" ),
|
|
|
|
|
2013-07-16 11:28:28 +00:00
|
|
|
## Streams
|
|
|
|
( "stream/ai_alsa1x.c", "alsa" ),
|
|
|
|
( "stream/ai_oss.c", "oss-audio" ),
|
|
|
|
( "stream/ai_sndio.c", "sndio" ),
|
|
|
|
( "stream/audio_in.c", "audio-input" ),
|
2013-11-28 18:28:38 +00:00
|
|
|
( "stream/cache.c" ),
|
2014-06-22 00:50:52 +00:00
|
|
|
( "stream/cache_file.c" ),
|
2013-07-16 11:28:28 +00:00
|
|
|
( "stream/cookies.c" ),
|
|
|
|
( "stream/dvb_tune.c", "dvbin" ),
|
|
|
|
( "stream/frequencies.c", "tv" ),
|
|
|
|
( "stream/rar.c" ),
|
|
|
|
( "stream/stream.c" ),
|
|
|
|
( "stream/stream_avdevice.c" ),
|
2014-07-14 23:49:02 +00:00
|
|
|
( "stream/stream_bluray.c", "libbluray" ),
|
2013-07-16 11:28:28 +00:00
|
|
|
( "stream/stream_cdda.c", "cdda" ),
|
|
|
|
( "stream/stream_dvb.c", "dvbin" ),
|
2017-03-31 19:17:01 +00:00
|
|
|
( "stream/stream_dvd.c", "dvdread-common" ),
|
|
|
|
( "stream/stream_dvd_common.c", "dvdread-common" ),
|
2014-07-14 23:49:02 +00:00
|
|
|
( "stream/stream_dvdnav.c", "dvdnav" ),
|
2013-07-16 11:28:28 +00:00
|
|
|
( "stream/stream_edl.c" ),
|
|
|
|
( "stream/stream_file.c" ),
|
2016-08-07 16:10:05 +00:00
|
|
|
( "stream/stream_cb.c" ),
|
2013-07-16 11:28:28 +00:00
|
|
|
( "stream/stream_lavf.c" ),
|
stream: libarchive wrapper for reading compressed archives
This works similar to the existing .rar support, but uses libarchive.
libarchive supports a number of formats, including zip and (most of)
rar.
Unfortunately, seeking does not work too well. Most libarchive readers
do not support seeking, so it's emulated by skipping data until the
target position. On backwards seek, the file is reopened. This works
fine on a local machine (and if the file is not too large), but will
perform not so well over network connection.
This is disabled by default for now. One reason is that we try
libarchive on every file we open, before trying libavformat, and I'm not
sure if I trust libarchive that much yet. Another reason is that this
breaks multivolume rar support. While libarchive supports seeking in
rar, and (probably) supports multivolume archive, our support of
libarchive (probably) does not. I don't care about multivolume rar, but
vocal users do.
2015-08-16 22:55:26 +00:00
|
|
|
( "stream/stream_libarchive.c", "libarchive" ),
|
2013-07-16 11:28:28 +00:00
|
|
|
( "stream/stream_memory.c" ),
|
|
|
|
( "stream/stream_mf.c" ),
|
|
|
|
( "stream/stream_null.c" ),
|
|
|
|
( "stream/stream_rar.c" ),
|
|
|
|
( "stream/stream_smb.c", "libsmbclient" ),
|
|
|
|
( "stream/stream_tv.c", "tv" ),
|
|
|
|
( "stream/tv.c", "tv" ),
|
|
|
|
( "stream/tvi_dummy.c", "tv" ),
|
|
|
|
( "stream/tvi_v4l2.c", "tv-v4l2"),
|
|
|
|
|
|
|
|
## Subtitles
|
|
|
|
( "sub/ass_mp.c", "libass"),
|
|
|
|
( "sub/dec_sub.c" ),
|
|
|
|
( "sub/draw_bmp.c" ),
|
|
|
|
( "sub/img_convert.c" ),
|
2015-12-18 00:57:35 +00:00
|
|
|
( "sub/lavc_conv.c" ),
|
2013-11-24 11:58:06 +00:00
|
|
|
( "sub/osd.c" ),
|
2013-07-16 11:28:28 +00:00
|
|
|
( "sub/osd_dummy.c", "dummy-osd" ),
|
|
|
|
( "sub/osd_libass.c", "libass-osd" ),
|
|
|
|
( "sub/sd_ass.c", "libass" ),
|
|
|
|
( "sub/sd_lavc.c" ),
|
2017-02-02 09:53:19 +00:00
|
|
|
( "sub/filter_sdh.c" ),
|
2013-07-16 11:28:28 +00:00
|
|
|
|
|
|
|
## Video
|
|
|
|
( "video/csputils.c" ),
|
|
|
|
( "video/fmt-conversion.c" ),
|
2017-07-01 13:56:12 +00:00
|
|
|
( "video/image_loader.c" ),
|
2013-07-16 11:28:28 +00:00
|
|
|
( "video/image_writer.c" ),
|
|
|
|
( "video/img_format.c" ),
|
2016-05-09 17:42:03 +00:00
|
|
|
( "video/hwdec.c" ),
|
2013-07-16 11:28:28 +00:00
|
|
|
( "video/mp_image.c" ),
|
|
|
|
( "video/mp_image_pool.c" ),
|
|
|
|
( "video/sws_utils.c" ),
|
|
|
|
( "video/vaapi.c", "vaapi" ),
|
|
|
|
( "video/vdpau.c", "vdpau" ),
|
2014-04-29 13:07:21 +00:00
|
|
|
( "video/vdpau_mixer.c", "vdpau" ),
|
2017-06-30 10:27:15 +00:00
|
|
|
( "video/decode/d3d.c", "d3d-hwaccel" ),
|
2017-01-17 07:11:12 +00:00
|
|
|
( "video/decode/dec_video.c"),
|
2017-06-30 10:27:15 +00:00
|
|
|
( "video/decode/hw_dxva2.c", "d3d9-hwaccel" ),
|
2017-01-17 07:11:12 +00:00
|
|
|
( "video/decode/hw_d3d11va.c", "d3d-hwaccel" ),
|
2017-07-06 17:40:40 +00:00
|
|
|
( "video/decode/hw_mediacodec.c", "android" ),
|
2013-07-16 11:28:28 +00:00
|
|
|
( "video/decode/vd_lavc.c" ),
|
2016-05-25 17:01:32 +00:00
|
|
|
( "video/filter/refqueue.c" ),
|
2013-07-16 11:28:28 +00:00
|
|
|
( "video/filter/vf.c" ),
|
2014-07-30 20:44:35 +00:00
|
|
|
( "video/filter/vf_buffer.c" ),
|
2017-09-21 11:50:18 +00:00
|
|
|
( "video/filter/vf_crop.c", "gpl" ),
|
2016-05-28 16:23:17 +00:00
|
|
|
( "video/filter/vf_d3d11vpp.c", "d3d-hwaccel" ),
|
2017-09-21 11:50:18 +00:00
|
|
|
( "video/filter/vf_dsize.c", "gpl" ),
|
|
|
|
( "video/filter/vf_expand.c", "gpl" ),
|
|
|
|
( "video/filter/vf_flip.c", "gpl" ),
|
|
|
|
( "video/filter/vf_format.c", "gpl" ),
|
|
|
|
( "video/filter/vf_gradfun.c", "gpl" ),
|
2016-02-05 22:17:33 +00:00
|
|
|
( "video/filter/vf_lavfi.c" ),
|
2017-09-21 11:50:18 +00:00
|
|
|
( "video/filter/vf_mirror.c", "gpl" ),
|
|
|
|
( "video/filter/vf_noformat.c", "gpl" ),
|
|
|
|
( "video/filter/vf_pullup.c", "gpl" ),
|
|
|
|
( "video/filter/vf_rotate.c", "gpl" ),
|
|
|
|
( "video/filter/vf_scale.c", "gpl" ),
|
|
|
|
( "video/filter/vf_stereo3d.c", "gpl" ),
|
|
|
|
( "video/filter/vf_sub.c", "gpl" ),
|
2014-10-11 23:31:20 +00:00
|
|
|
( "video/filter/vf_vapoursynth.c", "vapoursynth-core" ),
|
2016-11-22 13:58:31 +00:00
|
|
|
( "video/filter/vf_vavpp.c", "vaapi" ),
|
2014-04-29 13:07:21 +00:00
|
|
|
( "video/filter/vf_vdpaupp.c", "vdpau" ),
|
2017-09-21 11:50:18 +00:00
|
|
|
( "video/filter/vf_yadif.c", "gpl" ),
|
2013-07-16 11:28:28 +00:00
|
|
|
( "video/out/aspect.c" ),
|
|
|
|
( "video/out/bitmap_packer.c" ),
|
2014-10-05 20:31:33 +00:00
|
|
|
( "video/out/cocoa/video_view.m", "cocoa" ),
|
|
|
|
( "video/out/cocoa/events_view.m", "cocoa" ),
|
2013-07-16 11:28:28 +00:00
|
|
|
( "video/out/cocoa/window.m", "cocoa" ),
|
|
|
|
( "video/out/cocoa_common.m", "cocoa" ),
|
|
|
|
( "video/out/dither.c" ),
|
|
|
|
( "video/out/filter_kernels.c" ),
|
vo_gpu: d3d11: initial implementation
This is a new RA/vo_gpu backend that uses Direct3D 11. The GLSL
generated by vo_gpu is cross-compiled to HLSL with SPIRV-Cross.
What works:
- All of mpv's internal shaders should work, including compute shaders.
- Some external shaders have been tested and work, including RAVU and
adaptive-sharpen.
- Non-dumb mode works, even on very old hardware. Most features work at
feature level 9_3 and all features work at feature level 10_0. Some
features also work at feature level 9_1 and 9_2, but without high-bit-
depth FBOs, it's not very useful. (Hardware this old is probably not
fast enough for advanced features anyway.)
Note: This is more compatible than ANGLE, which requires 9_3 to work
at all (GLES 2.0,) and 10_1 for non-dumb-mode (GLES 3.0.)
- Hardware decoding with D3D11VA, including decoding of 10-bit formats
without truncation to 8-bit.
What doesn't work / can be improved:
- PBO upload and direct rendering does not work yet. Direct rendering
requires persistent-mapped PBOs because the decoder needs to be able
to read data from images that have already been decoded and uploaded.
Unfortunately, it seems like persistent-mapped PBOs are fundamentally
incompatible with D3D11, which requires all resources to use driver-
managed memory and requires memory to be unmapped (and hence pointers
to be invalidated) when a resource is used in a draw or copy
operation.
However it might be possible to use D3D11's limited multithreading
capabilities to emulate some features of PBOs, like asynchronous
texture uploading.
- The blit() and clear() operations don't have equivalents in the D3D11
API that handle all cases, so in most cases, they have to be emulated
with a shader. This is currently done inside ra_d3d11, but ideally it
would be done in generic code, so it can take advantage of mpv's
shader generation utilities.
- SPIRV-Cross is used through a NIH C-compatible wrapper library, since
it does not expose a C interface itself.
The library is available here: https://github.com/rossy/crossc
- The D3D11 context could be made to support more modern DXGI features
in future. For example, it should be possible to add support for
high-bit-depth and HDR output with DXGI 1.5/1.6.
2017-09-07 10:18:06 +00:00
|
|
|
( "video/out/d3d11/context.c", "d3d11" ),
|
|
|
|
( "video/out/d3d11/hwdec_d3d11va.c", "d3d11 && d3d-hwaccel" ),
|
|
|
|
( "video/out/d3d11/ra_d3d11.c", "d3d11" ),
|
2016-05-11 10:33:49 +00:00
|
|
|
( "video/out/opengl/angle_dynamic.c", "egl-angle" ),
|
2017-09-22 03:35:26 +00:00
|
|
|
( "video/out/gpu/context.c" ),
|
vo_gpu: d3d11: initial implementation
This is a new RA/vo_gpu backend that uses Direct3D 11. The GLSL
generated by vo_gpu is cross-compiled to HLSL with SPIRV-Cross.
What works:
- All of mpv's internal shaders should work, including compute shaders.
- Some external shaders have been tested and work, including RAVU and
adaptive-sharpen.
- Non-dumb mode works, even on very old hardware. Most features work at
feature level 9_3 and all features work at feature level 10_0. Some
features also work at feature level 9_1 and 9_2, but without high-bit-
depth FBOs, it's not very useful. (Hardware this old is probably not
fast enough for advanced features anyway.)
Note: This is more compatible than ANGLE, which requires 9_3 to work
at all (GLES 2.0,) and 10_1 for non-dumb-mode (GLES 3.0.)
- Hardware decoding with D3D11VA, including decoding of 10-bit formats
without truncation to 8-bit.
What doesn't work / can be improved:
- PBO upload and direct rendering does not work yet. Direct rendering
requires persistent-mapped PBOs because the decoder needs to be able
to read data from images that have already been decoded and uploaded.
Unfortunately, it seems like persistent-mapped PBOs are fundamentally
incompatible with D3D11, which requires all resources to use driver-
managed memory and requires memory to be unmapped (and hence pointers
to be invalidated) when a resource is used in a draw or copy
operation.
However it might be possible to use D3D11's limited multithreading
capabilities to emulate some features of PBOs, like asynchronous
texture uploading.
- The blit() and clear() operations don't have equivalents in the D3D11
API that handle all cases, so in most cases, they have to be emulated
with a shader. This is currently done inside ra_d3d11, but ideally it
would be done in generic code, so it can take advantage of mpv's
shader generation utilities.
- SPIRV-Cross is used through a NIH C-compatible wrapper library, since
it does not expose a C interface itself.
The library is available here: https://github.com/rossy/crossc
- The D3D11 context could be made to support more modern DXGI features
in future. For example, it should be possible to add support for
high-bit-depth and HDR output with DXGI 1.5/1.6.
2017-09-07 10:18:06 +00:00
|
|
|
( "video/out/gpu/d3d11_helpers.c", "d3d11 || egl-angle-win32" ),
|
2017-09-22 03:35:26 +00:00
|
|
|
( "video/out/gpu/hwdec.c" ),
|
|
|
|
( "video/out/gpu/lcms.c" ),
|
|
|
|
( "video/out/gpu/osd.c" ),
|
|
|
|
( "video/out/gpu/ra.c" ),
|
2017-09-13 01:09:48 +00:00
|
|
|
( "video/out/gpu/spirv.c" ),
|
|
|
|
( "video/out/gpu/spirv_shaderc.c", "shaderc" ),
|
2017-09-22 03:35:26 +00:00
|
|
|
( "video/out/gpu/shader_cache.c" ),
|
|
|
|
( "video/out/gpu/user_shaders.c" ),
|
|
|
|
( "video/out/gpu/utils.c" ),
|
|
|
|
( "video/out/gpu/video.c" ),
|
|
|
|
( "video/out/gpu/video_shaders.c" ),
|
2015-08-29 02:12:56 +00:00
|
|
|
( "video/out/opengl/common.c", "gl" ),
|
vo_opengl: refactor into vo_gpu
This is done in several steps:
1. refactor MPGLContext -> struct ra_ctx
2. move GL-specific stuff in vo_opengl into opengl/context.c
3. generalize context creation to support other APIs, and add --gpu-api
4. rename all of the --opengl- options that are no longer opengl-specific
5. move all of the stuff from opengl/* that isn't GL-specific into gpu/
(note: opengl/gl_utils.h became opengl/utils.h)
6. rename vo_opengl to vo_gpu
7. to handle window screenshots, the short-term approach was to just add
it to ra_swchain_fns. Long term (and for vulkan) this has to be moved to
ra itself (and vo_gpu altered to compensate), but this was a stop-gap
measure to prevent this commit from getting too big
8. move ra->fns->flush to ra_gl_ctx instead
9. some other minor changes that I've probably already forgotten
Note: This is one half of a major refactor, the other half of which is
provided by rossy's following commit. This commit enables support for
all linux platforms, while his version enables support for all non-linux
platforms.
Note 2: vo_opengl_cb.c also re-uses ra_gl_ctx so it benefits from the
--opengl- options like --opengl-early-flush, --opengl-finish etc. Should
be a strict superset of the old functionality.
Disclaimer: Since I have no way of compiling mpv on all platforms, some
of these ports were done blindly. Specifically, the blind ports included
context_mali_fbdev.c and context_rpi.c. Since they're both based on
egl_helpers, the port should have gone smoothly without any major
changes required. But if somebody complains about a compile error on
those platforms (assuming anybody actually uses them), you know where to
complain.
2017-09-14 06:04:55 +00:00
|
|
|
( "video/out/opengl/formats.c", "gl" ),
|
|
|
|
( "video/out/opengl/utils.c", "gl" ),
|
|
|
|
( "video/out/opengl/ra_gl.c", "gl" ),
|
2015-12-19 11:59:07 +00:00
|
|
|
( "video/out/opengl/context.c", "gl" ),
|
2017-09-15 15:37:28 +00:00
|
|
|
( "video/out/opengl/context_angle.c", "egl-angle-win32" ),
|
|
|
|
( "video/out/opengl/context_cocoa.c", "gl-cocoa" ),
|
2015-12-19 12:05:10 +00:00
|
|
|
( "video/out/opengl/context_drm_egl.c", "egl-drm" ),
|
2017-09-15 15:37:28 +00:00
|
|
|
( "video/out/opengl/context_dxinterop.c","gl-dxinterop" ),
|
2016-09-13 15:03:24 +00:00
|
|
|
( "video/out/opengl/context_mali_fbdev.c","mali-fbdev" ),
|
2017-10-05 18:58:37 +00:00
|
|
|
( "video/out/opengl/context_android.c", "android" ),
|
2015-12-19 12:05:10 +00:00
|
|
|
( "video/out/opengl/context_rpi.c", "rpi" ),
|
2017-03-18 16:43:57 +00:00
|
|
|
( "video/out/opengl/context_vdpau.c", "vdpau-gl-x11" ),
|
2015-12-19 12:05:10 +00:00
|
|
|
( "video/out/opengl/context_wayland.c", "gl-wayland" ),
|
2017-09-15 15:37:28 +00:00
|
|
|
( "video/out/opengl/context_win.c", "gl-win32" ),
|
vo_opengl: refactor into vo_gpu
This is done in several steps:
1. refactor MPGLContext -> struct ra_ctx
2. move GL-specific stuff in vo_opengl into opengl/context.c
3. generalize context creation to support other APIs, and add --gpu-api
4. rename all of the --opengl- options that are no longer opengl-specific
5. move all of the stuff from opengl/* that isn't GL-specific into gpu/
(note: opengl/gl_utils.h became opengl/utils.h)
6. rename vo_opengl to vo_gpu
7. to handle window screenshots, the short-term approach was to just add
it to ra_swchain_fns. Long term (and for vulkan) this has to be moved to
ra itself (and vo_gpu altered to compensate), but this was a stop-gap
measure to prevent this commit from getting too big
8. move ra->fns->flush to ra_gl_ctx instead
9. some other minor changes that I've probably already forgotten
Note: This is one half of a major refactor, the other half of which is
provided by rossy's following commit. This commit enables support for
all linux platforms, while his version enables support for all non-linux
platforms.
Note 2: vo_opengl_cb.c also re-uses ra_gl_ctx so it benefits from the
--opengl- options like --opengl-early-flush, --opengl-finish etc. Should
be a strict superset of the old functionality.
Disclaimer: Since I have no way of compiling mpv on all platforms, some
of these ports were done blindly. Specifically, the blind ports included
context_mali_fbdev.c and context_rpi.c. Since they're both based on
egl_helpers, the port should have gone smoothly without any major
changes required. But if somebody complains about a compile error on
those platforms (assuming anybody actually uses them), you know where to
complain.
2017-09-14 06:04:55 +00:00
|
|
|
( "video/out/opengl/context_glx.c", "gl-x11" ),
|
2015-12-19 12:05:10 +00:00
|
|
|
( "video/out/opengl/context_x11egl.c", "egl-x11" ),
|
2016-10-08 23:51:15 +00:00
|
|
|
( "video/out/opengl/cuda_dynamic.c", "cuda-hwaccel" ),
|
2015-12-19 11:45:07 +00:00
|
|
|
( "video/out/opengl/egl_helpers.c", "egl-helpers" ),
|
2016-09-16 03:15:36 +00:00
|
|
|
( "video/out/opengl/hwdec_cuda.c", "cuda-hwaccel" ),
|
2017-09-15 15:37:28 +00:00
|
|
|
( "video/out/opengl/hwdec_d3d11egl.c", "d3d-hwaccel" ),
|
|
|
|
( "video/out/opengl/hwdec_d3d11eglrgb.c","d3d-hwaccel" ),
|
|
|
|
( "video/out/opengl/hwdec_dxva2gldx.c", "gl-dxinterop-d3d9" ),
|
|
|
|
( "video/out/opengl/hwdec_dxva2egl.c", "d3d9-hwaccel" ),
|
2016-09-12 13:08:38 +00:00
|
|
|
( "video/out/opengl/hwdec_osx.c", "videotoolbox-gl" ),
|
2017-02-16 18:53:48 +00:00
|
|
|
( "video/out/opengl/hwdec_ios.m", "ios-gl" ),
|
2017-10-23 15:51:49 +00:00
|
|
|
( "video/out/opengl/hwdec_drmprime_drm.c","drmprime && drm" ),
|
2016-09-12 13:08:38 +00:00
|
|
|
( "video/out/opengl/hwdec_rpi.c", "rpi" ),
|
2015-09-27 18:09:10 +00:00
|
|
|
( "video/out/opengl/hwdec_vaegl.c", "vaapi-egl" ),
|
2015-08-29 02:12:56 +00:00
|
|
|
( "video/out/opengl/hwdec_vaglx.c", "vaapi-glx" ),
|
|
|
|
( "video/out/opengl/hwdec_vdpau.c", "vdpau-gl-x11" ),
|
2013-07-16 11:28:28 +00:00
|
|
|
( "video/out/vo.c" ),
|
2017-07-06 17:58:26 +00:00
|
|
|
( "video/out/vo_mediacodec_embed.c", "android" ),
|
2013-07-16 11:28:28 +00:00
|
|
|
( "video/out/vo_caca.c", "caca" ),
|
2015-04-15 16:14:14 +00:00
|
|
|
( "video/out/vo_drm.c", "drm" ),
|
2013-07-16 11:28:28 +00:00
|
|
|
( "video/out/vo_direct3d.c", "direct3d" ),
|
|
|
|
( "video/out/vo_image.c" ),
|
|
|
|
( "video/out/vo_lavc.c", "encoding" ),
|
2015-03-29 13:12:11 +00:00
|
|
|
( "video/out/vo_rpi.c", "rpi" ),
|
2013-07-16 11:28:28 +00:00
|
|
|
( "video/out/vo_null.c" ),
|
2017-09-22 03:35:26 +00:00
|
|
|
( "video/out/vo_gpu.c" ),
|
2014-12-09 16:47:02 +00:00
|
|
|
( "video/out/vo_opengl_cb.c", "gl" ),
|
2013-07-16 11:28:28 +00:00
|
|
|
( "video/out/vo_sdl.c", "sdl2" ),
|
2016-10-21 23:38:32 +00:00
|
|
|
( "video/out/vo_tct.c" ),
|
vaapi: change license to LGPL
Originally mpv vaapi support was based on the MPlayer-vaapi patches.
These were never merged in upstream MPlayer. The license headers
indicated they were GPL-only. Although the actual author agreed to
relicensing, the company employing him to write this code did not, so
the original code is unusable to us.
Fortunately, vaapi support was refactored and rewritten several times,
meaning little code is actually left. The previous commits removed or
moved that to GPL-only code. Namely, vo_vaapi.c remains GPL-only. The
other code went away or became unnecessary mainly because libavcodec
itself gained the ability to manage the hw decoder, and libavutil
provides code to manage vaapi surfaces. We also changed to mainly using
EGL interop, making any of the old rendering code unnecessary.
hwdec_vaglx.c is still GPL. It's possibly relicensable, because much of
it was changed, but I'm not too sure and further investigation would be
required. Also, this has been disabled by default for a while now, so
bothering with this is a waste of time. This commit simply disables it
at compile time as well in LGPL mode.
2017-09-29 16:44:47 +00:00
|
|
|
( "video/out/vo_vaapi.c", "vaapi-x11 && gpl" ),
|
2013-07-16 11:28:28 +00:00
|
|
|
( "video/out/vo_vdpau.c", "vdpau" ),
|
2015-09-30 20:52:22 +00:00
|
|
|
( "video/out/vo_x11.c" , "x11" ),
|
2013-07-16 11:28:28 +00:00
|
|
|
( "video/out/vo_xv.c", "xv" ),
|
2017-06-27 11:47:46 +00:00
|
|
|
( "video/out/w32_common.c", "win32-desktop" ),
|
|
|
|
( "video/out/win32/displayconfig.c", "win32-desktop" ),
|
|
|
|
( "video/out/win32/droptarget.c", "win32-desktop" ),
|
vo_gpu: vulkan: initial implementation
This time based on ra/vo_gpu. 2017 is the year of the vulkan desktop!
Current problems / limitations / improvement opportunities:
1. The swapchain/flipping code violates the vulkan spec, by assuming
that the presentation queue will be bounded (in cases where rendering
is significantly faster than vsync). But apparently, there's simply
no better way to do this right now, to the point where even the
stupid cube.c examples from LunarG etc. do it wrong.
(cf. https://github.com/KhronosGroup/Vulkan-Docs/issues/370)
2. The memory allocator could be improved. (This is a universal
constant)
3. Could explore using push descriptors instead of descriptor sets,
especially since we expect to switch descriptors semi-often for some
passes (like interpolation). Probably won't make a difference, but
the synchronization overhead might be a factor. Who knows.
4. Parallelism across frames / async transfer is not well-defined, we
either need to use a better semaphore / command buffer strategy or a
resource pooling layer to safely handle cross-frame parallelism.
(That said, I gave resource pooling a try and was not happy with the
result at all - so I'm still exploring the semaphore strategy)
5. We aggressively use pipeline barriers where events would offer a much
more fine-grained synchronization mechanism. As a result of this, we
might be suffering from GPU bubbles due to too-short dependencies on
objects. (That said, I'm also exploring the use of semaphores as a an
ordering tactic which would allow cross-frame time slicing in theory)
Some minor changes to the vo_gpu and infrastructure, but nothing
consequential.
NOTE: For safety, all use of asynchronous commands / multiple command
pools is currently disabled completely. There are some left-over relics
of this in the code (e.g. the distinction between dev_poll and
pool_poll), but that is kept in place mostly because this will be
re-extended in the future (vulkan rev 2).
The queue count is also currently capped to 1, because of the lack of
cross-frame semaphores means we need the implicit synchronization from
the same-queue semantics to guarantee a correct result.
2016-09-14 18:54:18 +00:00
|
|
|
( "video/out/vulkan/utils.c", "vulkan" ),
|
|
|
|
( "video/out/vulkan/malloc.c", "vulkan" ),
|
|
|
|
( "video/out/vulkan/formats.c", "vulkan" ),
|
|
|
|
( "video/out/vulkan/ra_vk.c", "vulkan" ),
|
|
|
|
( "video/out/vulkan/context.c", "vulkan" ),
|
|
|
|
( "video/out/vulkan/context_xlib.c", "vulkan && x11" ),
|
2017-09-16 02:46:38 +00:00
|
|
|
( "video/out/vulkan/context_wayland.c", "vulkan && wayland" ),
|
2017-09-24 06:45:56 +00:00
|
|
|
( "video/out/vulkan/context_win.c", "vulkan && win32-desktop" ),
|
2017-09-13 01:09:48 +00:00
|
|
|
( "video/out/vulkan/spirv_nvidia.c", "vulkan" ),
|
2015-11-25 11:07:22 +00:00
|
|
|
( "video/out/win32/exclusive_hack.c", "gl-win32" ),
|
2013-07-16 11:28:28 +00:00
|
|
|
( "video/out/wayland_common.c", "wayland" ),
|
2017-10-01 20:16:49 +00:00
|
|
|
( "video/out/wayland/xdg-shell-v6.c", "wayland" ),
|
|
|
|
( "video/out/wayland/idle-inhibit-v1.c", "wayland" ),
|
|
|
|
( "video/out/wayland/srv-decor.c", "wayland" ),
|
2014-05-06 18:22:32 +00:00
|
|
|
( "video/out/win_state.c"),
|
2013-07-16 11:28:28 +00:00
|
|
|
( "video/out/x11_common.c", "x11" ),
|
2017-10-23 15:51:49 +00:00
|
|
|
( "video/out/drm_atomic.c", "drm" ),
|
2015-04-19 07:39:58 +00:00
|
|
|
( "video/out/drm_common.c", "drm" ),
|
2017-10-23 15:51:49 +00:00
|
|
|
( "video/out/drm_prime.c", "drm && drmprime" ),
|
2013-07-16 11:28:28 +00:00
|
|
|
|
|
|
|
## osdep
|
|
|
|
( getch2_c ),
|
|
|
|
( "osdep/io.c" ),
|
|
|
|
( "osdep/timer.c" ),
|
|
|
|
( timer_c ),
|
|
|
|
( "osdep/threads.c" ),
|
|
|
|
|
2014-10-17 15:07:01 +00:00
|
|
|
( "osdep/ar/HIDRemote.m", "apple-remote" ),
|
2015-05-02 16:09:01 +00:00
|
|
|
( "osdep/macosx_application.m", "cocoa" ),
|
2013-07-16 11:28:28 +00:00
|
|
|
( "osdep/macosx_events.m", "cocoa" ),
|
2017-07-29 13:26:58 +00:00
|
|
|
( "osdep/macosx_menubar.m", "cocoa" ),
|
2017-02-25 20:56:59 +00:00
|
|
|
( "osdep/macosx_touchbar.m", "macos-touchbar" ),
|
osdep: add POSIX semaphore emulation for OSX
OSX is POSIX conformant, but it's a sad joke: it provides the
<semaphore.h> prototype as the standard demands, but they're empty
wrappers, and all functions just return ENOSYS.
Emulate them similar to how osdep/io.h emulate filesystem functions on
Windows. By including the header, working sem_* functions become
available.
To make it async-signal safe, use a pipe for wakeup (write() is AS-safe,
but mutexes can't be). Actually I'm not sure anymore if we really need
AS-safety, but for now the emulation can do it.
On Linux, the system provides a far more efficient and robust
implementation. We definitely want to avoid using the emulation if
possible, so this code is active on OSX only. For convenience we always
build the source file though, even if the implementation is disabled and
no actual code is generated.
(Linux provides working semaphores, but is formally not POSIX
conformant. On OSX it's the opposite. Is POSIX a complete joke?)
2014-09-10 01:09:41 +00:00
|
|
|
( "osdep/semaphore_osx.c" ),
|
2015-04-15 20:43:02 +00:00
|
|
|
( "osdep/subprocess.c" ),
|
2017-06-27 11:47:46 +00:00
|
|
|
( subprocess_c ),
|
2013-07-16 11:28:28 +00:00
|
|
|
( "osdep/path-macosx.m", "cocoa" ),
|
2015-05-01 19:13:44 +00:00
|
|
|
( "osdep/path-unix.c"),
|
2017-06-27 11:50:58 +00:00
|
|
|
( "osdep/path-win.c", "win32-desktop" ),
|
|
|
|
( "osdep/path-uwp.c", "uwp" ),
|
2017-06-27 10:37:47 +00:00
|
|
|
( "osdep/glob-win.c", "glob-win32" ),
|
2014-01-19 13:20:02 +00:00
|
|
|
( "osdep/w32_keyboard.c", "os-win32" ),
|
|
|
|
( "osdep/w32_keyboard.c", "os-cygwin" ),
|
2017-06-27 11:47:46 +00:00
|
|
|
( "osdep/windows_utils.c", "os-win32" ),
|
2017-08-07 22:00:02 +00:00
|
|
|
( "osdep/windows_utils.c", "os-cygwin" ),
|
2013-07-16 11:28:28 +00:00
|
|
|
( "osdep/mpv.rc", "win32-executable" ),
|
2015-01-01 14:10:42 +00:00
|
|
|
( "osdep/win32/pthread.c", "win32-internal-pthreads"),
|
2017-08-03 20:50:10 +00:00
|
|
|
( "osdep/android/posix-spawn.c", "android"),
|
2016-02-07 12:27:46 +00:00
|
|
|
( "osdep/android/strnlen.c", "android"),
|
2013-07-16 11:28:28 +00:00
|
|
|
|
|
|
|
## tree_allocator
|
|
|
|
"ta/ta.c", "ta/ta_talloc.c", "ta/ta_utils.c"
|
|
|
|
]
|
|
|
|
|
|
|
|
if ctx.dependency_satisfied('win32-executable'):
|
|
|
|
from waflib import TaskGen
|
|
|
|
|
|
|
|
TaskGen.declare_chain(
|
|
|
|
name = 'windres',
|
|
|
|
rule = '${WINDRES} ${WINDRES_FLAGS} ${SRC} ${TGT}',
|
|
|
|
ext_in = '.rc',
|
|
|
|
ext_out = '-rc.o',
|
|
|
|
color = 'PINK')
|
|
|
|
|
|
|
|
ctx.env.WINDRES_FLAGS = [
|
|
|
|
'--include-dir={0}'.format(ctx.bldnode.abspath()),
|
|
|
|
'--include-dir={0}'.format(ctx.srcnode.abspath())
|
|
|
|
]
|
|
|
|
|
|
|
|
for node in 'osdep/mpv.exe.manifest etc/mpv-icon.ico'.split():
|
|
|
|
ctx.add_manual_dependency(
|
|
|
|
ctx.path.find_node('osdep/mpv.rc'),
|
|
|
|
ctx.path.find_node(node))
|
|
|
|
|
2015-07-17 07:39:52 +00:00
|
|
|
version = ctx.bldnode.find_node('version.h')
|
|
|
|
if version:
|
|
|
|
ctx.add_manual_dependency(
|
|
|
|
ctx.path.find_node('osdep/mpv.rc'),
|
|
|
|
version)
|
2015-07-15 13:23:10 +00:00
|
|
|
|
2014-12-28 08:38:22 +00:00
|
|
|
if ctx.dependency_satisfied('cplayer') or ctx.dependency_satisfied('test'):
|
|
|
|
ctx(
|
|
|
|
target = "objects",
|
|
|
|
source = ctx.filtered_sources(sources),
|
|
|
|
use = ctx.dependencies_use(),
|
|
|
|
includes = _all_includes(ctx),
|
|
|
|
features = "c",
|
|
|
|
)
|
|
|
|
|
2017-01-12 16:37:11 +00:00
|
|
|
syms = False
|
|
|
|
if ctx.dependency_satisfied('cplugins'):
|
|
|
|
syms = True
|
|
|
|
ctx.load("syms")
|
|
|
|
|
2014-08-04 08:54:22 +00:00
|
|
|
if ctx.dependency_satisfied('cplayer'):
|
|
|
|
ctx(
|
|
|
|
target = "mpv",
|
2015-03-29 11:36:46 +00:00
|
|
|
source = main_fn_c,
|
2014-12-29 17:30:24 +00:00
|
|
|
use = ctx.dependencies_use() + ['objects'],
|
2014-12-28 08:38:22 +00:00
|
|
|
includes = _all_includes(ctx),
|
2017-01-12 16:37:11 +00:00
|
|
|
features = "c cprogram" + (" syms" if syms else ""),
|
|
|
|
export_symbols_def = "libmpv/mpv.def", # for syms=True
|
2014-11-01 09:57:10 +00:00
|
|
|
install_path = ctx.env.BINDIR
|
2014-08-04 08:54:22 +00:00
|
|
|
)
|
2016-01-11 21:13:16 +00:00
|
|
|
for f in ['mpv.conf', 'input.conf', 'mplayer-input.conf', \
|
2014-10-11 14:16:02 +00:00
|
|
|
'restore-old-bindings.conf']:
|
|
|
|
ctx.install_as(os.path.join(ctx.env.DOCDIR, f),
|
|
|
|
os.path.join('etc/', f))
|
2013-07-16 11:28:28 +00:00
|
|
|
|
2014-11-21 00:47:30 +00:00
|
|
|
if ctx.env.DEST_OS == 'win32':
|
|
|
|
wrapctx = ctx(
|
|
|
|
target = "mpv",
|
|
|
|
source = ['osdep/win32-console-wrapper.c'],
|
|
|
|
features = "c cprogram",
|
|
|
|
install_path = ctx.env.BINDIR
|
|
|
|
)
|
|
|
|
|
|
|
|
wrapctx.env.cprogram_PATTERN = "%s.com"
|
|
|
|
wrapflags = ['-municode', '-mconsole']
|
|
|
|
wrapctx.env.CFLAGS = wrapflags
|
|
|
|
wrapctx.env.LAST_LINKFLAGS = wrapflags
|
|
|
|
|
2014-12-28 08:38:22 +00:00
|
|
|
if ctx.dependency_satisfied('test'):
|
|
|
|
for test in ctx.path.ant_glob("test/*.c"):
|
|
|
|
ctx(
|
2016-05-29 17:33:30 +00:00
|
|
|
target = os.path.splitext(test.srcpath())[0],
|
|
|
|
source = test.srcpath(),
|
|
|
|
use = ctx.dependencies_use() + ['objects'],
|
|
|
|
includes = _all_includes(ctx),
|
|
|
|
features = "c cprogram",
|
|
|
|
install_path = None,
|
2014-12-28 08:38:22 +00:00
|
|
|
)
|
2014-11-21 00:47:30 +00:00
|
|
|
|
2014-06-16 09:22:46 +00:00
|
|
|
build_shared = ctx.dependency_satisfied('libmpv-shared')
|
|
|
|
build_static = ctx.dependency_satisfied('libmpv-static')
|
|
|
|
if build_shared or build_static:
|
|
|
|
if build_shared:
|
2014-08-12 17:19:20 +00:00
|
|
|
waftoolsdir = os.path.join(os.path.dirname(__file__), "waftools")
|
|
|
|
ctx.load("syms", tooldir=waftoolsdir)
|
2016-03-11 16:22:50 +00:00
|
|
|
vre = '#define MPV_CLIENT_API_VERSION MPV_MAKE_VERSION\((.*), (.*)\)'
|
2014-08-05 00:23:14 +00:00
|
|
|
libmpv_header = ctx.path.find_node("libmpv/client.h").read()
|
2016-03-11 16:22:50 +00:00
|
|
|
major, minor = re.search(vre, libmpv_header).groups()
|
2014-08-05 00:23:14 +00:00
|
|
|
libversion = major + '.' + minor + '.0'
|
2014-06-20 17:21:11 +00:00
|
|
|
|
2014-06-16 09:22:46 +00:00
|
|
|
def _build_libmpv(shared):
|
|
|
|
features = "c "
|
|
|
|
if shared:
|
|
|
|
features += "cshlib syms"
|
|
|
|
else:
|
|
|
|
features += "cstlib"
|
2016-02-08 20:39:57 +00:00
|
|
|
|
|
|
|
libmpv_kwargs = {
|
|
|
|
"target": "mpv",
|
|
|
|
"source": ctx.filtered_sources(sources),
|
|
|
|
"use": ctx.dependencies_use(),
|
|
|
|
"includes": [ctx.bldnode.abspath(), ctx.srcnode.abspath()] + \
|
|
|
|
ctx.dependencies_includes(),
|
|
|
|
"features": features,
|
|
|
|
"export_symbols_def": "libmpv/mpv.def",
|
|
|
|
"install_path": ctx.env.LIBDIR,
|
2017-04-24 14:05:22 +00:00
|
|
|
"install_path_implib": ctx.env.LIBDIR,
|
2016-02-08 20:39:57 +00:00
|
|
|
}
|
|
|
|
|
2016-07-28 22:03:19 +00:00
|
|
|
if shared and ctx.dependency_satisfied('android'):
|
|
|
|
# for Android we just add the linker flag without version
|
|
|
|
# as we still need the SONAME for proper linkage.
|
|
|
|
# (LINKFLAGS logic taken from waf's apply_vnum in ccroot.py)
|
|
|
|
v=ctx.env.SONAME_ST%'libmpv.so'
|
|
|
|
ctx.env.append_value('LINKFLAGS',v.split())
|
|
|
|
else:
|
2016-02-08 20:39:57 +00:00
|
|
|
# for all other configurations we want SONAME to be used
|
|
|
|
libmpv_kwargs["vnum"] = libversion
|
|
|
|
|
2017-04-24 14:05:22 +00:00
|
|
|
if shared and ctx.env.DEST_OS == 'win32':
|
|
|
|
libmpv_kwargs["install_path"] = ctx.env.BINDIR
|
|
|
|
|
2016-02-08 20:39:57 +00:00
|
|
|
ctx(**libmpv_kwargs)
|
|
|
|
|
2014-06-16 09:22:46 +00:00
|
|
|
if build_shared:
|
|
|
|
_build_libmpv(True)
|
|
|
|
if build_static:
|
|
|
|
_build_libmpv(False)
|
2014-02-10 20:25:22 +00:00
|
|
|
|
2014-08-07 21:45:40 +00:00
|
|
|
def get_deps():
|
|
|
|
res = ""
|
|
|
|
for k in ctx.env.keys():
|
|
|
|
if k.startswith("LIB_") and k != "LIB_ST":
|
|
|
|
res += " ".join(["-l" + x for x in ctx.env[k]]) + " "
|
|
|
|
return res
|
|
|
|
|
2014-03-11 15:55:49 +00:00
|
|
|
ctx(
|
|
|
|
target = 'libmpv/mpv.pc',
|
|
|
|
source = 'libmpv/mpv.pc.in',
|
|
|
|
features = 'subst',
|
|
|
|
PREFIX = ctx.env.PREFIX,
|
|
|
|
LIBDIR = ctx.env.LIBDIR,
|
|
|
|
INCDIR = ctx.env.INCDIR,
|
2014-03-11 23:40:55 +00:00
|
|
|
VERSION = libversion,
|
2014-08-07 21:45:40 +00:00
|
|
|
PRIV_LIBS = get_deps(),
|
2014-03-11 15:55:49 +00:00
|
|
|
)
|
|
|
|
|
2016-08-07 16:10:05 +00:00
|
|
|
headers = ["client.h", "qthelper.hpp", "opengl_cb.h", "stream_cb.h"]
|
2014-02-10 20:25:22 +00:00
|
|
|
for f in headers:
|
2014-03-11 16:06:06 +00:00
|
|
|
ctx.install_as(ctx.env.INCDIR + '/mpv/' + f, 'libmpv/' + f)
|
2014-02-10 20:25:22 +00:00
|
|
|
|
2014-03-11 15:55:49 +00:00
|
|
|
ctx.install_as(ctx.env.LIBDIR + '/pkgconfig/mpv.pc', 'libmpv/mpv.pc')
|
|
|
|
|
2015-12-29 19:57:09 +00:00
|
|
|
if ctx.dependency_satisfied('html-build'):
|
|
|
|
_build_html(ctx)
|
|
|
|
|
2013-07-16 11:28:28 +00:00
|
|
|
if ctx.dependency_satisfied('manpage-build'):
|
|
|
|
_build_man(ctx)
|
|
|
|
|
|
|
|
if ctx.dependency_satisfied('pdf-build'):
|
|
|
|
_build_pdf(ctx)
|
|
|
|
|
2014-11-28 21:25:54 +00:00
|
|
|
if ctx.dependency_satisfied('cplayer'):
|
2014-06-08 14:00:43 +00:00
|
|
|
|
2014-11-28 21:25:54 +00:00
|
|
|
if ctx.dependency_satisfied('zsh-comp'):
|
2016-09-10 19:19:59 +00:00
|
|
|
ctx.zshcomp(target = "etc/_mpv", source = "TOOLS/zsh.pl")
|
2014-11-28 21:25:54 +00:00
|
|
|
ctx.install_files(
|
|
|
|
ctx.env.ZSHDIR,
|
|
|
|
['etc/_mpv'])
|
|
|
|
|
|
|
|
ctx.install_files(
|
|
|
|
ctx.env.DATADIR + '/applications',
|
|
|
|
['etc/mpv.desktop'] )
|
2013-07-16 11:28:28 +00:00
|
|
|
|
2016-02-20 21:39:04 +00:00
|
|
|
if ctx.dependency_satisfied('encoding'):
|
|
|
|
ctx.install_files(ctx.env.CONFDIR, ['etc/encoding-profiles.conf'] )
|
2013-12-28 15:32:49 +00:00
|
|
|
|
2014-11-28 21:25:54 +00:00
|
|
|
for size in '16x16 32x32 64x64'.split():
|
|
|
|
ctx.install_as(
|
|
|
|
ctx.env.DATADIR + '/icons/hicolor/' + size + '/apps/mpv.png',
|
|
|
|
'etc/mpv-icon-8bit-' + size + '.png')
|
2015-12-01 07:02:52 +00:00
|
|
|
|
|
|
|
ctx.install_as(
|
|
|
|
ctx.env.DATADIR + '/icons/hicolor/scalable/apps/mpv.svg',
|
|
|
|
'etc/mpv-gradient.svg')
|
2016-03-10 09:15:48 +00:00
|
|
|
|
|
|
|
ctx.install_files(
|
|
|
|
ctx.env.DATADIR + '/icons/hicolor/symbolic/apps',
|
|
|
|
['etc/mpv-symbolic.svg'])
|