Release 0.8.2

This reverts commit ff10bd65d6.

Fixes #1631.

.github/ISSUE_TEMPLATE

@@ -1,23 +0,0 @@
-### mpv version and platform
-
-If you're not using git master or the latest release, update.
-
-### Reproduction steps
-
-### Expected behavior
-
-### Actual behavior
-
-### Log file
-
-Make a log file made with -v or --log-file=output.txt, paste it to
-http://sprunge.us or a similar site, and replace this text with a link to it.
-
-Providing a log file is strongly encouraged. It is very helpful for reproducing
-bugs or getting important technical context. Without a log it might not be
-possible to analyze and fix certain bugs.
-
-### Sample files
-
-Sample files needed to reproduce this issue can be uploaded to https://0x0.st/
-or similar sites. (Only needed if the issue cannot be reproduced without it.)

.github/PULL_REQUEST_TEMPLATE

@@ -1,7 +0,0 @@
-Ideally, you shouldn't need enter any text here, and your commit messages should
-explain your changes sufficiently (especially why they are needed). Read
-https://github.com/mpv-player/mpv/blob/master/DOCS/contribute.md for coding
-style and development conventions. Remove this text block, but if you haven't
-agreed to it before, leave the following sentence in place:
-
-I agree that my changes can be relicensed to LGPL 2.1 or later.

.gitignore

@@ -14,12 +14,12 @@
 /input/input_conf.h
 /tags
 /TAGS
+/video/out/gl_video_shaders.h
 /video/out/x11_icon.inc
 /demux/ebml_defs.c
 /demux/ebml_types.h
 /sub/osd_font.h
 /player/lua/*.inc
-/player/builtin_conf.inc
 /DOCS/man/mpv.1
 /DOCS/man/mpv.aux
 /DOCS/man/mpv.log

.travis.yml

@@ -2,7 +2,7 @@ language: c
 
 os:
   - linux
-  - osx
+#  - osx
 env:
   matrix:
     - LIBAV=libav-stable
@@ -12,8 +12,6 @@ env:
   global:
     # Coverity token
     - secure: "H21mSRlMhk4BKS0xHZvCFGJxteCP0hRVUxTuNfM2Z9HBsyutuLEYMtViLO86VtM+Tqla3xXPzUdS4ozLwI72Ax/5ZUDXACROj73yW6QhFB5D6rLut12+FjqC7M33Qv2hl0xwgNBmR5dsm1ToP37+Wn+ecJQNvN8fkTXF+HVzOEw="
-    # Travis token for mpv.io
-    - secure: "nlTVLJK6kRhtXvhKCoJ3YdFGHuKaq/eHowfPw25hqRWuBOZd+HjHY5KIYjV7SxuKFDpJE4GpNcvA3Q31nsqomxpkLYgrwjg6TSazN7ZP+x85ZgV1QGFebrPfGm2n5UR5CAPAwFoeF3pZheLi4bajVzwq1fWW+x3grS188P9OZso="
 compiler:
   - clang
   - gcc
@@ -39,18 +37,17 @@ matrix:
     - os: linux
       compiler: clang
 
-before_install: TOOLS/travis-deps libass-stable $LIBAV
+before_install: ./travis-deps libass-stable $LIBAV
 script:
   - ./bootstrap.py
   - ./waf configure
   - ./waf build
-after_script: TOOLS/travis-rebuild-website
 
 notifications:
   email: false
   irc:
     channels:
-      - "irc.freenode.org#mpv-devel"
+      - "irc.freenode.org#mpv-player-dev"
     on_success: change
     on_failure: always
 

Copyright

@@ -2,15 +2,9 @@ mpv is a fork of mplayer2, which is a fork of MPlayer.
 
 mpv as a whole is licensed as GPL version 2 or later (see LICENSE). Most source
 files are GPLv2+, but some files are available under a more liberal license,
-such as LGPLv2.1+, BSD, MIT, ISC, and possibly others. Look at the copyright
+such as LGPLv2+, BSD, MIT, ISC, and possibly others. Look at the copyright
 header of each source file, and grep the sources for "Copyright" if you need
-to know details. Files without Copyright notice are licensed as LGPLv2.1+.
-
-All new contributions must be LGPLv2.1+ licensed, or if the changes are done on
-GPL code, must come with the implicit agreement that the project can relicense
-the code to LGPLv2.1+ at a later point without asking the contributor. (This
-is a safeguard for making potential relicensing of the project to LGPLv2.1+
-easier.) Using a more liberal license compatible to LGPLv2.1+ is also ok.
+to know details. Files without Copyright notice are licensed as LGPLv2+.
 
 For information about authors and contributors, consult the git log, which
 contains the complete SVN and CVS history as well.
@@ -23,5 +17,3 @@ MPlayer as a whole is licensed under GPLv2 (incompatible to GPLv3!), because
 some files are licensed to GPLv2 (and _not_ any later version of the license).
 In particular, this affects the file libmpdemux/demux_ty_osd.c. It is disabled
 under mplayer2, and has been removed from mpv.
-
-"v2.1+" in this context means "version 2.1 or later".

DOCS/client-api-changes.rst

@@ -4,7 +4,9 @@ Introduction
 This file lists all changes that can cause compatibility issues when using
 mpv through the client API (libmpv and ``client.h``). Since the client API
 interfaces to input handling (commands, properties) as well as command line
-options, you should also look at ``interface-changes.rst``.
+options, this list is interesting for other uses of mpv, such as the Lua
+scripting interface, key bindings in ``input.rst``, or plain command line
+usage.
 
 Normally, changes to the C API that are incompatible to previous iterations
 receive a major version bump (i.e. the first version number is increased),
@@ -18,87 +20,12 @@ The version number is the same as used for MPV_CLIENT_API_VERSION (see
 
 Also, read the section ``Compatibility`` in ``client.h``.
 
-Options, commands, properties
-=============================
-
-Changes to these are not listed here, but in ``interface-changes.rst``. (Before
-client API version 1.17, they were listed here partially.)
-
-This listing includes changes to the bare C API and behavior only, not what
-you can access with them.
-
 API changes
 ===========
 
 ::
 
- --- mpv 0.21.0 ---
- 1.23   - deprecate setting "no-" options via mpv_set_option*(). For example,
-          instead of "no-video=" you should set "video=no".
-        - do not override the SIGPIPE signal handler anymore. This was done as
-          workaround for the FFmpeg TLS code, which has been fixed long ago.
-        - deprecate mpv_suspend() and mpv_resume(). They will be stubbed out
-          in mpv 0.22.0.
-        - make mpv_set_property() work to some degree before mpv_initialize().
-          It can now be used instead of mpv_set_option().
-        - semi-deprecate mpv_set_option()/mpv_set_option_string(). You should
-          use mpv_set_property() instead. There are some deprecated properties
-          which conflict with some options (see client.h remarks on
-          mpv_set_option()), for which mpv_set_option() might still be required.
-          In future mpv releases, the conflicting deprecated options/properties
-          will be removed, and mpv_set_option() will internally translate API
-          calls to mpv_set_property().
-        - qthelper.hpp: deprecate get_property_variant, set_property_variant,
-          mpv_set_option, command_variant, and replace them with get_property,
-          set_property, command.
- --- mpv 0.19.0 ---
- 1.22   - add stream_cb API for custom protocols
- --- mpv 0.18.1 ---
- ----   - remove "status" log level from mpv_request_log_messages() docs. This
-          is 100% equivalent to "v". The behavior is still the same, thus no
-          actual API change.
- --- mpv 0.18.0 ---
- 1.21   - mpv_set_property() changes behavior with MPV_FORMAT_NODE. Before this
-          change it rejected mpv_nodes with format==MPV_FORMAT_STRING if the
-          property was not a string or did not have special mechanisms in place
-          the function failed. Now it always invokes the option string parser,
-          and mpv_node with a basic data type works exactly as if the function
-          is invoked with that type directly. This new behavior is equivalent
-          to mpv_set_option().
-          This also affects the mp.set_property_native() Lua function.
-        - generally, setting choice options/properties with "yes"/"no" options
-          can now be set as MPV_FORMAT_FLAG
-        - reading a choice property as MPV_FORMAT_NODE will now return a
-          MPV_FORMAT_FLAG value if the choice is "yes" (true) or "no" (false)
-          This implicitly affects Lua and JSON IPC interfaces as well.
-        - big changes to vo-cmdline on vo_opengl and vo_opengl_hq (but not
-          vo_opengl_cb): options are now normally not reset, but applied on top
-          of the current options. The special undocumented value "-" still
-          works, but now resets all options to before any vo-cmdline command
-          has been called.
- --- mpv 0.12.0 ---
- 1.20   - deprecate "GL_MP_D3D_interfaces"/"glMPGetD3DInterface", and introduce
-          "GL_MP_MPGetNativeDisplay"/"glMPGetNativeDisplay" (this is a
-          backwards-compatible rename)
- --- mpv 0.11.0 ---
- --- mpv 0.10.0 ---
- 1.19   - add "GL_MP_D3D_interfaces" pseudo extension to make it possible to
-          use DXVA2 in OpenGL fullscreen mode in some situations
-        - 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 ---
- 1.16   - add mpv_opengl_cb_report_flip()
-        - introduce mpv_opengl_cb_draw() and deprecate mpv_opengl_cb_render()
-        - add MPV_FORMAT_BYTE_ARRAY
- 1.15   - mpv_initialize() will now load config files. This requires setting
-          the "config" and "config-dir" options. In particular, it will load
-          mpv.conf.
-        - minor backwards-compatible change to the "seek" and "screenshot"
-          commands (new flag syntax, old additional args deprecated)
- --- mpv 0.8.0 ---
+ --- mpv 0.8.0 is released ---
  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)
@@ -111,7 +38,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 ---
+ --- mpv 0.7.0 is released ---
  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
@@ -134,7 +61,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 ---
+ --- mpv 0.6.0 is released ---
  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
@@ -143,7 +70,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 ---
+ --- mpv 0.5.0 is released ---
  1.3    - add MPV_MAKE_VERSION()
  1.2    - remove "stream-time-pos" property (no replacement)
  1.1    - remap dvdnav:// to dvd://
@@ -155,6 +82,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 ---
+ --- mpv 0.4.0 is released ---
  1.0    - the API is declared stable
 

DOCS/client_api_examples/Copyright

@@ -0,0 +1,14 @@
+All examples in this directory and its sub-directories are licensed
+under one of the following licenses:
+
+    WTFPL, ISC, Ms-PL, AGPLv3, BSD (any)
+
+Pick any license of your liking, and disregard the others.
+
+(The full text of each license is available on this website:
+  http://opensource.org/licenses/alphabetical )
+
+Additionally, you may consider the example code to be public domain.
+You are free to use any of the example code without further
+requirements or need for attribution.
+

DOCS/client_api_examples/README.md

@@ -0,0 +1,30 @@
+Client API examples
+===================
+
+All these examples use the mpv client API through libmpv.
+
+cocoa
+-----
+
+Shows how to embed the mpv video window in Objective-C/Cocoa.
+
+qt
+--
+
+Shows how to embed the mpv video window in Qt (using normal desktop widgets).
+
+qml
+---
+
+Shows how to use mpv's OpenGL video renderer in QtQuick2 with QML.
+
+qml_direct
+----------
+
+Alternative example, which typically avoids a FBO indirection. Might be
+slightly faster, but is less flexible and harder to use.
+
+simple
+------
+
+Very primitive terminal-only example. Shows some most basic API usage.

DOCS/client_api_examples/cocoa/cocoabasic.m

@@ -0,0 +1,193 @@
+// Plays a video from the command line in a window provided by mpv.
+// You likely want to play the video in your own window instead,
+// but that's not quite ready yet.
+// You may need a basic Info.plist and MainMenu.xib to make this work.
+
+// Build with: clang -o cocoabasic cocoabasic.m `pkg-config --libs --cflags mpv`
+
+#include <mpv/client.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+
+static inline void check_error(int status)
+{
+    if (status < 0) {
+        printf("mpv API error: %s\n", mpv_error_string(status));
+        exit(1);
+    }
+}
+
+#import <Cocoa/Cocoa.h>
+
+@interface CocoaWindow : NSWindow
+@end
+
+@implementation CocoaWindow
+- (BOOL)canBecomeMainWindow { return YES; }
+- (BOOL)canBecomeKeyWindow { return YES; }
+@end
+
+@interface AppDelegate : NSObject <NSApplicationDelegate>
+{
+    mpv_handle *mpv;
+    dispatch_queue_t queue;
+    NSWindow *w;
+}
+@end
+
+static void wakeup(void *);
+
+@implementation AppDelegate
+
+- (void)createWindow {
+
+    int mask = NSTitledWindowMask|NSClosableWindowMask|
+               NSMiniaturizableWindowMask|NSResizableWindowMask;
+
+    self->w = [[CocoaWindow alloc]
+        initWithContentRect:NSMakeRect(0,0, 1280, 720)
+                  styleMask:mask
+                    backing:NSBackingStoreBuffered
+                      defer:NO];
+
+    [self->w setTitle:@"cocoabasic example"];
+    [self->w makeMainWindow];
+    [self->w makeKeyAndOrderFront:nil];
+
+    NSMenu *m = [[NSMenu alloc] initWithTitle:@"AMainMenu"];
+    NSMenuItem *item = [m addItemWithTitle:@"Apple" action:nil keyEquivalent:@""];
+    NSMenu *sm = [[NSMenu alloc] initWithTitle:@"Apple"];
+    [m setSubmenu:sm forItem:item];
+    [sm addItemWithTitle: @"Shutdown mpv" action:@selector(shutdown) keyEquivalent:@"s"];
+    [NSApp setMenu:m];
+    [NSApp activateIgnoringOtherApps:YES];
+}
+
+- (void) applicationDidFinishLaunching:(NSNotification *)notification {
+    [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
+    atexit_b(^{
+        // Because activation policy has just been set to behave like a real
+        // application, that policy must be reset on exit to prevent, among
+        // other things, the menubar created here from remaining on screen.
+        [NSApp setActivationPolicy:NSApplicationActivationPolicyProhibited];
+    });
+
+    // Read filename
+    NSArray *args = [NSProcessInfo processInfo].arguments;
+    if (args.count < 2) {
+        NSLog(@"Expected filename on command line");
+        exit(1);
+    }
+    NSString *filename = args[1];
+
+    [self createWindow];
+
+    // Deal with MPV in the background.
+    queue = dispatch_queue_create("mpv", DISPATCH_QUEUE_SERIAL);
+    dispatch_async(queue, ^{
+
+        mpv = mpv_create();
+        if (!mpv) {
+            printf("failed creating context\n");
+            exit(1);
+        }
+
+        int64_t wid = (intptr_t) [self->w contentView];
+        check_error(mpv_set_option(mpv, "wid", MPV_FORMAT_INT64, &wid));
+
+        // Maybe set some options here, like default key bindings.
+        // NOTE: Interaction with the window seems to be broken for now.
+        check_error(mpv_set_option_string(mpv, "input-default-bindings", "yes"));
+
+        // for testing!
+        check_error(mpv_set_option_string(mpv, "input-media-keys", "yes"));
+        check_error(mpv_set_option_string(mpv, "input-cursor", "no"));
+        check_error(mpv_set_option_string(mpv, "input-vo-keyboard", "yes"));
+
+        // request important errors
+        check_error(mpv_request_log_messages(mpv, "warn"));
+
+        check_error(mpv_initialize(mpv));
+
+        // Register to be woken up whenever mpv generates new events.
+        mpv_set_wakeup_callback(mpv, wakeup, (__bridge void *) self);
+
+        // Load the indicated file
+        const char *cmd[] = {"loadfile", filename.UTF8String, NULL};
+        check_error(mpv_command(mpv, cmd));
+    });
+}
+
+- (void) handleEvent:(mpv_event *)event
+{
+    switch (event->event_id) {
+    case MPV_EVENT_SHUTDOWN:
+        // Clean up and shut down.
+        mpv_terminate_destroy(mpv);
+        mpv = NULL;
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [[NSApplication sharedApplication] terminate:nil];
+        });
+        break;
+
+    case MPV_EVENT_LOG_MESSAGE: {
+        struct mpv_event_log_message *msg = (struct mpv_event_log_message *)event->data;
+        printf("[%s] %s: %s", msg->prefix, msg->level, msg->text);
+    }
+
+    case MPV_EVENT_VIDEO_RECONFIG:
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [self->w selectNextKeyView:nil];
+        });
+
+    default:
+        printf("event: %s\n", mpv_event_name(event->event_id));
+    }
+}
+
+- (void) readEvents
+{
+    dispatch_async(queue, ^{
+        while (mpv) {
+            mpv_event *event = mpv_wait_event(mpv, 0);
+            if (event->event_id == MPV_EVENT_NONE)
+                break;
+            [self handleEvent:event];
+        }
+    });
+}
+
+static void wakeup(void *context) {
+    AppDelegate *a = (__bridge AppDelegate *) context;
+    [a readEvents];
+}
+
+// Ostensibly, mpv's window would be hooked up to this.
+- (BOOL) windowShouldClose:(id)sender
+{
+    [self shutdown];
+    if (self->w)
+        [self->w release];
+    return YES;
+}
+
+- (void) shutdown
+{
+    if (mpv) {
+        const char *args[] = {"quit", NULL};
+        mpv_command(mpv, args);
+    }
+}
+@end
+
+// Delete this if you already have a main.m.
+int main(int argc, const char * argv[]) {
+    @autoreleasepool {
+        NSApplication *app = [NSApplication sharedApplication];
+        AppDelegate *delegate = [AppDelegate new];
+        app.delegate = delegate;
+        [app run];
+    }
+    return EXIT_SUCCESS;
+}

DOCS/client_api_examples/qml/main.cpp

@@ -0,0 +1,137 @@
+#include "main.h"
+
+#include <stdexcept>
+#include <clocale>
+
+#include <QObject>
+#include <QtGlobal>
+#include <QOpenGLContext>
+#include <QGuiApplication>
+
+#include <QtGui/QOpenGLFramebufferObject>
+
+#include <QtQuick/QQuickWindow>
+#include <QtQuick/QQuickView>
+
+class MpvRenderer : public QQuickFramebufferObject::Renderer
+{
+    static void *get_proc_address(void *ctx, const char *name) {
+        (void)ctx;
+        QOpenGLContext *glctx = QOpenGLContext::currentContext();
+        if (!glctx)
+            return NULL;
+        return (void *)glctx->getProcAddress(QByteArray(name));
+    }
+
+    mpv::qt::Handle mpv;
+    QQuickWindow *window;
+    mpv_opengl_cb_context *mpv_gl;
+public:
+    MpvRenderer(const MpvObject *obj)
+        : mpv(obj->mpv), window(obj->window()), mpv_gl(obj->mpv_gl)
+    {
+        int r = mpv_opengl_cb_init_gl(mpv_gl, NULL, get_proc_address, NULL);
+        if (r < 0)
+            throw std::runtime_error("could not initialize OpenGL");
+    }
+
+    virtual ~MpvRenderer()
+    {
+        // Until this call is done, we need to make sure the player remains
+        // alive. This is done implicitly with the mpv::qt::Handle instance
+        // in this class.
+        mpv_opengl_cb_uninit_gl(mpv_gl);
+    }
+
+    void render()
+    {
+        QOpenGLFramebufferObject *fbo = framebufferObject();
+        int vp[4] = {0, 0, fbo->width(), fbo->height()};
+        window->resetOpenGLState();
+        mpv_opengl_cb_render(mpv_gl, fbo->handle(), vp);
+        window->resetOpenGLState();
+    }
+};
+
+MpvObject::MpvObject(QQuickItem * parent)
+    : QQuickFramebufferObject(parent), mpv_gl(0)
+{
+    mpv = mpv::qt::Handle::FromRawHandle(mpv_create());
+    if (!mpv)
+        throw std::runtime_error("could not create mpv context");
+
+    mpv_set_option_string(mpv, "terminal", "yes");
+    mpv_set_option_string(mpv, "msg-level", "all=v");
+
+    if (mpv_initialize(mpv) < 0)
+        throw std::runtime_error("could not initialize mpv context");
+
+    // Make use of the MPV_SUB_API_OPENGL_CB API.
+    mpv::qt::set_option_variant(mpv, "vo", "opengl-cb");
+
+    // Request hw decoding, just for testing.
+    mpv::qt::set_option_variant(mpv, "hwdec", "auto");
+
+    // Setup the callback that will make QtQuick update and redraw if there
+    // is a new video frame. Use a queued connection: this makes sure the
+    // doUpdate() function is run on the GUI thread.
+    mpv_gl = (mpv_opengl_cb_context *)mpv_get_sub_api(mpv, MPV_SUB_API_OPENGL_CB);
+    if (!mpv_gl)
+        throw std::runtime_error("OpenGL not compiled in");
+    mpv_opengl_cb_set_update_callback(mpv_gl, MpvObject::on_update, (void *)this);
+    connect(this, &MpvObject::onUpdate, this, &MpvObject::doUpdate,
+            Qt::QueuedConnection);
+}
+
+MpvObject::~MpvObject()
+{
+    if (mpv_gl)
+        mpv_opengl_cb_set_update_callback(mpv_gl, NULL, NULL);
+}
+
+void MpvObject::on_update(void *ctx)
+{
+    MpvObject *self = (MpvObject *)ctx;
+    emit self->onUpdate();
+}
+
+// connected to onUpdate(); signal makes sure it runs on the GUI thread
+void MpvObject::doUpdate()
+{
+    update();
+}
+
+void MpvObject::command(const QVariant& params)
+{
+    mpv::qt::command_variant(mpv, params);
+}
+
+void MpvObject::setProperty(const QString& name, const QVariant& value)
+{
+    mpv::qt::set_property_variant(mpv, name, value);
+}
+
+QQuickFramebufferObject::Renderer *MpvObject::createRenderer() const
+{
+    window()->setPersistentOpenGLContext(true);
+    window()->setPersistentSceneGraph(true);
+    return new MpvRenderer(this);
+}
+
+int main(int argc, char **argv)
+{
+    QGuiApplication app(argc, argv);
+
+    // Qt sets the locale in the QGuiApplication constructor, but libmpv
+    // requires the LC_NUMERIC category to be set to "C", so change it back.
+    std::setlocale(LC_NUMERIC, "C");
+
+    qmlRegisterType<MpvObject>("mpvtest", 1, 0, "MpvObject");
+
+    QQuickView view;
+    view.setResizeMode(QQuickView::SizeRootObjectToView);
+    view.setSource(QUrl("qrc:///mpvtest/main.qml"));
+    view.show();
+
+    return app.exec();
+}

DOCS/client_api_examples/qml/main.h

@@ -0,0 +1,36 @@
+#ifndef MPVRENDERER_H_
+#define MPVRENDERER_H_
+
+#include <QtQuick/QQuickFramebufferObject>
+
+#include <mpv/client.h>
+#include <mpv/opengl_cb.h>
+#include <mpv/qthelper.hpp>
+
+class MpvRenderer;
+
+class MpvObject : public QQuickFramebufferObject
+{
+    Q_OBJECT
+
+    mpv::qt::Handle mpv;
+    mpv_opengl_cb_context *mpv_gl;
+
+    friend class MpvRenderer;
+
+public:
+    MpvObject(QQuickItem * parent = 0);
+    virtual ~MpvObject();
+    virtual Renderer *createRenderer() const;
+public slots:
+    void command(const QVariant& params);
+    void setProperty(const QString& name, const QVariant& value);
+signals:
+    void onUpdate();
+private slots:
+    void doUpdate();
+private:
+    static void on_update(void *ctx);
+};
+
+#endif

DOCS/client_api_examples/qml/main.qml

@@ -0,0 +1,71 @@
+import QtQuick 2.0
+import QtQuick.Controls 1.0
+
+import mpvtest 1.0
+
+Item {
+    width: 1280
+    height: 720
+
+    MpvObject {
+        id: renderer
+        anchors.fill: parent
+
+        MouseArea {
+            anchors.fill: parent
+            onClicked: renderer.command(["loadfile", "../../../test.mkv"])
+        }
+    }
+
+    Rectangle {
+        id: labelFrame
+        anchors.margins: -50
+        radius: 5
+        color: "white"
+        border.color: "black"
+        opacity: 0.8
+        anchors.fill: box
+    }
+
+    Row {
+        id: box
+        anchors.bottom: renderer.bottom
+        anchors.left: renderer.left
+        anchors.right: renderer.right
+        anchors.margins: 100
+
+        Text {
+            anchors.margins: 10
+            wrapMode: Text.WordWrap
+            text: "QtQuick and mpv are both rendering stuff.\n
+                   Click to load ../../../test.mkv"
+        }
+
+        // Don't take these controls too seriously. They're for testing.
+        Column {
+            CheckBox {
+                id: checkbox
+                anchors.margins: 10
+                // Heavily filtered means good, right?
+                text: "Make video look like on a Smart TV"
+                onClicked: {
+                    if (checkbox.checked) {
+                        renderer.command(["vo_cmdline", "scale=sharpen3:scale-param1=5.0"])
+                    } else {
+                        renderer.command(["vo_cmdline", ""])
+                    }
+                }
+            }
+            Slider {
+                id: slider
+                anchors.margins: 10
+                anchors.left: checkbox.left
+                anchors.right: checkbox.right
+                minimumValue: -100
+                maximumValue:  100
+                value: 0
+                onValueChanged: renderer.setProperty("gamma", slider.value | 0)
+            }
+        }
+    }
+}

DOCS/client_api_examples/qml/mpvtest.pro

@@ -0,0 +1,11 @@
+QT += qml quick
+
+HEADERS += main.h
+SOURCES += main.cpp
+
+CONFIG += link_pkgconfig debug
+PKGCONFIG += mpv
+
+RESOURCES += mpvtest.qrc
+
+OTHER_FILES += main.qml

DOCS/client_api_examples/qml/mpvtest.qrc

@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/mpvtest">
+        <file>main.qml</file>
+    </qresource>
+</RCC>

DOCS/client_api_examples/qml_direct/main.cpp

@@ -0,0 +1,154 @@
+#include "main.h"
+
+#include <stdexcept>
+#include <clocale>
+
+#include <QObject>
+#include <QtGlobal>
+#include <QOpenGLContext>
+
+#include <QGuiApplication>
+#include <QtQuick/QQuickWindow>
+#include <QtQuick/QQuickView>
+
+static void *get_proc_address(void *ctx, const char *name) {
+    (void)ctx;
+    QOpenGLContext *glctx = QOpenGLContext::currentContext();
+    if (!glctx)
+        return NULL;
+    return (void *)glctx->getProcAddress(QByteArray(name));
+}
+
+MpvRenderer::MpvRenderer(mpv::qt::Handle a_mpv, mpv_opengl_cb_context *a_mpv_gl)
+    : mpv(a_mpv), mpv_gl(a_mpv_gl), window(0), size()
+{
+    int r = mpv_opengl_cb_init_gl(mpv_gl, NULL, get_proc_address, NULL);
+    if (r < 0)
+        throw std::runtime_error("could not initialize OpenGL");
+}
+
+MpvRenderer::~MpvRenderer()
+{
+    // Until this call is done, we need to make sure the player remains
+    // alive. This is done implicitly with the mpv::qt::Handle instance
+    // in this class.
+    mpv_opengl_cb_uninit_gl(mpv_gl);
+}
+
+void MpvRenderer::paint()
+{
+    window->resetOpenGLState();
+
+    // Render to the whole window.
+    int vp[4] = {0, 0, size.width(), -size.height()};
+
+    // This uses 0 as framebuffer, which indicates that mpv will render directly
+    // to the frontbuffer. Note that mpv will always switch framebuffers
+    // explicitly. Some QWindow setups (such as using QQuickWidget) actually
+    // want you to render into a FBO in the beforeRendering() signal, and this
+    // code won't work there.
+    mpv_opengl_cb_render(mpv_gl, 0, vp);
+
+    window->resetOpenGLState();
+}
+
+MpvObject::MpvObject(QQuickItem * parent)
+    : QQuickItem(parent), mpv_gl(0), renderer(0)
+{
+    mpv = mpv::qt::Handle::FromRawHandle(mpv_create());
+    if (!mpv)
+        throw std::runtime_error("could not create mpv context");
+
+    mpv_set_option_string(mpv, "terminal", "yes");
+    mpv_set_option_string(mpv, "msg-level", "all=v");
+
+    if (mpv_initialize(mpv) < 0)
+        throw std::runtime_error("could not initialize mpv context");
+
+    // Make use of the MPV_SUB_API_OPENGL_CB API.
+    mpv::qt::set_option_variant(mpv, "vo", "opengl-cb");
+
+    // Setup the callback that will make QtQuick update and redraw if there
+    // is a new video frame. Use a queued connection: this makes sure the
+    // doUpdate() function is run on the GUI thread.
+    mpv_gl = (mpv_opengl_cb_context *)mpv_get_sub_api(mpv, MPV_SUB_API_OPENGL_CB);
+    if (!mpv_gl)
+        throw std::runtime_error("OpenGL not compiled in");
+    mpv_opengl_cb_set_update_callback(mpv_gl, MpvObject::on_update, (void *)this);
+    connect(this, &MpvObject::onUpdate, this, &MpvObject::doUpdate,
+            Qt::QueuedConnection);
+
+    connect(this, &QQuickItem::windowChanged,
+            this, &MpvObject::handleWindowChanged);
+}
+
+MpvObject::~MpvObject()
+{
+    if (mpv_gl)
+        mpv_opengl_cb_set_update_callback(mpv_gl, NULL, NULL);
+}
+
+void MpvObject::handleWindowChanged(QQuickWindow *win)
+{
+    if (!win)
+        return;
+    connect(win, &QQuickWindow::beforeSynchronizing,
+            this, &MpvObject::sync, Qt::DirectConnection);
+    connect(win, &QQuickWindow::sceneGraphInvalidated,
+            this, &MpvObject::cleanup, Qt::DirectConnection);
+    win->setClearBeforeRendering(false);
+}
+
+void MpvObject::sync()
+{
+    if (!renderer) {
+        renderer = new MpvRenderer(mpv, mpv_gl);
+        connect(window(), &QQuickWindow::beforeRendering,
+                renderer, &MpvRenderer::paint, Qt::DirectConnection);
+    }
+    renderer->window = window();
+    renderer->size = window()->size() * window()->devicePixelRatio();
+}
+
+void MpvObject::cleanup()
+{
+    if (renderer) {
+        delete renderer;
+        renderer = 0;
+    }
+}
+
+void MpvObject::on_update(void *ctx)
+{
+    MpvObject *self = (MpvObject *)ctx;
+    emit self->onUpdate();
+}
+
+// connected to onUpdate(); signal makes sure it runs on the GUI thread
+void MpvObject::doUpdate()
+{
+    window()->update();
+}
+
+void MpvObject::command(const QVariant& params)
+{
+    mpv::qt::command_variant(mpv, params);
+}
+
+int main(int argc, char **argv)
+{
+    QGuiApplication app(argc, argv);
+
+    // Qt sets the locale in the QGuiApplication constructor, but libmpv
+    // requires the LC_NUMERIC category to be set to "C", so change it back.
+    std::setlocale(LC_NUMERIC, "C");
+
+    qmlRegisterType<MpvObject>("mpvtest", 1, 0, "MpvObject");
+
+    QQuickView view;
+    view.setResizeMode(QQuickView::SizeRootObjectToView);
+    view.setSource(QUrl("qrc:///mpvtest/main.qml"));
+    view.show();
+
+    return app.exec();
+}

DOCS/client_api_examples/qml_direct/main.h

@@ -0,0 +1,50 @@
+#ifndef MPVRENDERER_H_
+#define MPVRENDERER_H_
+
+#include <QtQuick/QQuickItem>
+
+#include <mpv/client.h>
+#include <mpv/opengl_cb.h>
+#include <mpv/qthelper.hpp>
+
+class MpvRenderer : public QObject
+{
+    Q_OBJECT
+    mpv::qt::Handle mpv;
+    mpv_opengl_cb_context *mpv_gl;
+    QQuickWindow *window;
+    QSize size;
+
+    friend class MpvObject;
+public:
+    MpvRenderer(mpv::qt::Handle a_mpv, mpv_opengl_cb_context *a_mpv_gl);
+    virtual ~MpvRenderer();
+public slots:
+    void paint();
+};
+
+class MpvObject : public QQuickItem
+{
+    Q_OBJECT
+
+    mpv::qt::Handle mpv;
+    mpv_opengl_cb_context *mpv_gl;
+    MpvRenderer *renderer;
+
+public:
+    MpvObject(QQuickItem * parent = 0);
+    virtual ~MpvObject();
+public slots:
+    void command(const QVariant& params);
+    void sync();
+    void cleanup();
+signals:
+    void onUpdate();
+private slots:
+    void doUpdate();
+    void handleWindowChanged(QQuickWindow *win);
+private:
+    static void on_update(void *ctx);
+};
+
+#endif

DOCS/client_api_examples/qml_direct/main.qml

@@ -0,0 +1,49 @@
+import QtQuick 2.0
+import QtQuick.Controls 1.0
+
+import mpvtest 1.0
+
+Item {
+    width: 1280
+    height: 720
+
+    MpvObject {
+        id: renderer
+
+        // This object isn't real and not visible; it just renders into the
+        // background of the containing Window.
+        width: 0
+        height: 0
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        onClicked: renderer.command(["loadfile", "../../../test.mkv"])
+    }
+
+    Rectangle {
+        id: labelFrame
+        anchors.margins: -50
+        radius: 5
+        color: "white"
+        border.color: "black"
+        opacity: 0.8
+        anchors.fill: box
+    }
+
+    Row {
+        id: box
+        anchors.bottom: parent.bottom
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.margins: 100
+
+        Text {
+            anchors.margins: 10
+            wrapMode: Text.WordWrap
+            text: "QtQuick and mpv are both rendering stuff.\n
+                   In this example, mpv is always in the background.\n
+                   Click to load ../../../test.mkv"
+        }
+    }
+}

DOCS/client_api_examples/qml_direct/mpvtest.pro

@@ -0,0 +1,11 @@
+QT += qml quick
+
+HEADERS += main.h
+SOURCES += main.cpp
+
+CONFIG += link_pkgconfig debug
+PKGCONFIG += mpv
+
+RESOURCES += mpvtest.qrc
+
+OTHER_FILES += main.qml

DOCS/client_api_examples/qml_direct/mpvtest.qrc

@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/mpvtest">
+        <file>main.qml</file>
+    </qresource>
+</RCC>

DOCS/client_api_examples/qt/qtexample.cpp

@@ -0,0 +1,225 @@
+// This example can be built with: qmake && make
+
+#include <clocale>
+#include <sstream>
+#include <stdexcept>
+
+#include <QtGlobal>
+#include <QFileDialog>
+#include <QStatusBar>
+#include <QMenuBar>
+#include <QMenu>
+#include <QGridLayout>
+#include <QApplication>
+#include <QTextEdit>
+
+#if QT_VERSION >= 0x050000
+#include <QJsonDocument>
+#endif
+
+#include <mpv/qthelper.hpp>
+
+#include "qtexample.h"
+
+static void wakeup(void *ctx)
+{
+    // This callback is invoked from any mpv thread (but possibly also
+    // recursively from a thread that is calling the mpv API). Just notify
+    // the Qt GUI thread to wake up (so that it can process events with
+    // mpv_wait_event()), and return as quickly as possible.
+    MainWindow *mainwindow = (MainWindow *)ctx;
+    emit mainwindow->mpv_events();
+}
+
+MainWindow::MainWindow(QWidget *parent) :
+    QMainWindow(parent)
+{
+    setWindowTitle("Qt embedding demo");
+    setMinimumSize(640, 480);
+
+    QMenu *menu = menuBar()->addMenu(tr("&File"));
+    QAction *on_open = new QAction(tr("&Open"), this);
+    on_open->setShortcuts(QKeySequence::Open);
+    on_open->setStatusTip(tr("Open a file"));
+    connect(on_open, &QAction::triggered, this, &MainWindow::on_file_open);
+    menu->addAction(on_open);
+
+    QAction *on_new = new QAction(tr("&New window"), this);
+    connect(on_new, &QAction::triggered, this, &MainWindow::on_new_window);
+    menu->addAction(on_new);
+
+    statusBar();
+
+    QMainWindow *log_window = new QMainWindow(this);
+    log = new QTextEdit(log_window);
+    log->setReadOnly(true);
+    log_window->setCentralWidget(log);
+    log_window->setWindowTitle("mpv log window");
+    log_window->setMinimumSize(500, 50);
+    log_window->show();
+
+    mpv = mpv_create();
+    if (!mpv)
+        throw std::runtime_error("can't create mpv instance");
+
+    // Create a video child window. Force Qt to create a native window, and
+    // pass the window ID to the mpv wid option. Works on: X11, win32, Cocoa
+    mpv_container = new QWidget(this);
+    setCentralWidget(mpv_container);
+    mpv_container->setAttribute(Qt::WA_DontCreateNativeAncestors);
+    mpv_container->setAttribute(Qt::WA_NativeWindow);
+    // If you have a HWND, use: int64_t wid = (intptr_t)hwnd;
+    int64_t wid = mpv_container->winId();
+    mpv_set_option(mpv, "wid", MPV_FORMAT_INT64, &wid);
+
+    // Enable default bindings, because we're lazy. Normally, a player using
+    // mpv as backend would implement its own key bindings.
+    mpv_set_option_string(mpv, "input-default-bindings", "yes");
+
+    // Enable keyboard input on the X11 window. For the messy details, see
+    // --input-vo-keyboard on the manpage.
+    mpv_set_option_string(mpv, "input-vo-keyboard", "yes");
+
+    // Let us receive property change events with MPV_EVENT_PROPERTY_CHANGE if
+    // this property changes.
+    mpv_observe_property(mpv, 0, "time-pos", MPV_FORMAT_DOUBLE);
+
+    mpv_observe_property(mpv, 0, "track-list", MPV_FORMAT_NODE);
+    mpv_observe_property(mpv, 0, "chapter-list", MPV_FORMAT_NODE);
+
+    // Request log messages with level "info" or higher.
+    // They are received as MPV_EVENT_LOG_MESSAGE.
+    mpv_request_log_messages(mpv, "info");
+
+    // From this point on, the wakeup function will be called. The callback
+    // can come from any thread, so we use the QueuedConnection mechanism to
+    // relay the wakeup in a thread-safe way.
+    connect(this, &MainWindow::mpv_events, this, &MainWindow::on_mpv_events,
+            Qt::QueuedConnection);
+    mpv_set_wakeup_callback(mpv, wakeup, this);
+
+    if (mpv_initialize(mpv) < 0)
+        throw std::runtime_error("mpv failed to initialize");
+}
+
+void MainWindow::handle_mpv_event(mpv_event *event)
+{
+    switch (event->event_id) {
+    case MPV_EVENT_PROPERTY_CHANGE: {
+        mpv_event_property *prop = (mpv_event_property *)event->data;
+        if (strcmp(prop->name, "time-pos") == 0) {
+            if (prop->format == MPV_FORMAT_DOUBLE) {
+                double time = *(double *)prop->data;
+                std::stringstream ss;
+                ss << "At: " << time;
+                statusBar()->showMessage(QString::fromStdString(ss.str()));
+            } else if (prop->format == MPV_FORMAT_NONE) {
+                // The property is unavailable, which probably means playback
+                // was stopped.
+                statusBar()->showMessage("");
+            }
+        } else if (strcmp(prop->name, "chapter-list") == 0 ||
+                   strcmp(prop->name, "track-list") == 0)
+        {
+            // Dump the properties as JSON for demo purposes.
+#if QT_VERSION >= 0x050000
+            if (prop->format == MPV_FORMAT_NODE) {
+                QVariant v = mpv::qt::node_to_variant((mpv_node *)prop->data);
+                // Abuse JSON support for easily printing the mpv_node contents.
+                QJsonDocument d = QJsonDocument::fromVariant(v);
+                append_log("Change property " + QString(prop->name) + ":\n");
+                append_log(d.toJson().data());
+            }
+#endif
+        }
+        break;
+    }
+    case MPV_EVENT_VIDEO_RECONFIG: {
+        // Retrieve the new video size.
+        int64_t w, h;
+        if (mpv_get_property(mpv, "dwidth", MPV_FORMAT_INT64, &w) >= 0 &&
+            mpv_get_property(mpv, "dheight", MPV_FORMAT_INT64, &h) >= 0 &&
+            w > 0 && h > 0)
+        {
+            // Note that the MPV_EVENT_VIDEO_RECONFIG event doesn't necessarily
+            // imply a resize, and you should check yourself if the video
+            // dimensions really changed.
+            // mpv itself will scale/letter box the video to the container size
+            // if the video doesn't fit.
+            std::stringstream ss;
+            ss << "Reconfig: " << w << " " << h;
+            statusBar()->showMessage(QString::fromStdString(ss.str()));
+        }
+        break;
+    }
+    case MPV_EVENT_LOG_MESSAGE: {
+        struct mpv_event_log_message *msg = (struct mpv_event_log_message *)event->data;
+        std::stringstream ss;
+        ss << "[" << msg->prefix << "] " << msg->level << ": " << msg->text;
+        append_log(QString::fromStdString(ss.str()));
+        break;
+    }
+    case MPV_EVENT_SHUTDOWN: {
+        mpv_terminate_destroy(mpv);
+        mpv = NULL;
+        break;
+    }
+    default: ;
+        // Ignore uninteresting or unknown events.
+    }
+}
+
+// This slot is invoked by wakeup() (through the mpv_events signal).
+void MainWindow::on_mpv_events()
+{
+    // Process all events, until the event queue is empty.
+    while (mpv) {
+        mpv_event *event = mpv_wait_event(mpv, 0);
+        if (event->event_id == MPV_EVENT_NONE)
+            break;
+        handle_mpv_event(event);
+    }
+}
+
+void MainWindow::on_file_open()
+{
+    QString filename = QFileDialog::getOpenFileName(this, "Open file");
+    if (mpv) {
+        const QByteArray c_filename = filename.toUtf8();
+        const char *args[] = {"loadfile", c_filename.data(), NULL};
+        mpv_command_async(mpv, 0, args);
+    }
+}
+
+void MainWindow::on_new_window()
+{
+    (new MainWindow())->show();
+}
+
+void MainWindow::append_log(const QString &text)
+{
+    QTextCursor cursor = log->textCursor();
+    cursor.movePosition(QTextCursor::End);
+    cursor.insertText(text);
+    log->setTextCursor(cursor);
+}
+
+MainWindow::~MainWindow()
+{
+    if (mpv)
+        mpv_terminate_destroy(mpv);
+}
+
+int main(int argc, char *argv[])
+{
+    QApplication a(argc, argv);
+
+    // Qt sets the locale in the QApplication constructor, but libmpv requires
+    // the LC_NUMERIC category to be set to "C", so change it back.
+    std::setlocale(LC_NUMERIC, "C");
+
+    MainWindow w;
+    w.show();
+
+    return a.exec();
+}

DOCS/client_api_examples/qt/qtexample.h

@@ -0,0 +1,37 @@
+#ifndef QTEXAMPLE_H
+#define QTEXAMPLE_H
+
+#include <QMainWindow>
+
+#include <mpv/client.h>
+
+class QTextEdit;
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    explicit MainWindow(QWidget *parent = 0);
+    ~MainWindow();
+
+private slots:
+    void on_file_open();
+    void on_new_window();
+    void on_mpv_events();
+
+signals:
+    void mpv_events();
+
+private:
+    QWidget *mpv_container;
+    mpv_handle *mpv;
+    QTextEdit *log;
+
+    void append_log(const QString &text);
+
+    void create_player();
+    void handle_mpv_event(mpv_event *event);
+};
+
+#endif // QTEXAMPLE_H

DOCS/client_api_examples/qt/qtexample.pro

@@ -0,0 +1,12 @@
+QT       += core gui
+
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+
+TARGET = qtexample
+TEMPLATE = app
+
+CONFIG += link_pkgconfig debug
+PKGCONFIG += mpv
+
+SOURCES += qtexample.cpp
+HEADERS += qtexample.h

DOCS/client_api_examples/simple/simple.c

@@ -0,0 +1,54 @@
+// Build with: gcc -o simple simple.c `pkg-config --libs --cflags mpv`
+
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <mpv/client.h>
+
+static inline void check_error(int status)
+{
+    if (status < 0) {
+        printf("mpv API error: %s\n", mpv_error_string(status));
+        exit(1);
+    }
+}
+
+int main(int argc, char *argv[])
+{
+    if (argc != 2) {
+        printf("pass a single media file as argument\n");
+        return 1;
+    }
+
+    mpv_handle *ctx = mpv_create();
+    if (!ctx) {
+        printf("failed creating context\n");
+        return 1;
+    }
+
+    // Enable default key bindings, so the user can actually interact with
+    // the player (and e.g. close the window).
+    check_error(mpv_set_option_string(ctx, "input-default-bindings", "yes"));
+    mpv_set_option_string(ctx, "input-vo-keyboard", "yes");
+    int val = 1;
+    check_error(mpv_set_option(ctx, "osc", MPV_FORMAT_FLAG, &val));
+
+    // Done setting up options.
+    check_error(mpv_initialize(ctx));
+
+    // Play this file.
+    const char *cmd[] = {"loadfile", argv[1], NULL};
+    check_error(mpv_command(ctx, cmd));
+
+    // Let it play, and wait until the user quits.
+    while (1) {
+        mpv_event *event = mpv_wait_event(ctx, 10000);
+        printf("event: %s\n", mpv_event_name(event->event_id));
+        if (event->event_id == MPV_EVENT_SHUTDOWN)
+            break;
+    }
+
+    mpv_terminate_destroy(ctx);
+    return 0;
+}

DOCS/compile-windows.md

@@ -66,9 +66,9 @@ echo "MXE_TARGETS := i686-w64-mingw32.static" >> settings.mk
 # echo "MXE_TARGETS := x86_64-w64-mingw32.static" >> settings.mk
 
 # Build required packages. The following provide a minimum required to build
-# a reasonable mpv binary (though not an absolute minimum).
+# mpv.
 
-make gcc ffmpeg libass jpeg lua
+make gcc ffmpeg libass jpeg pthreads
 
 # Add MXE binaries to $PATH
 export PATH=/opt/mxe/usr/bin/:$PATH
@@ -79,7 +79,6 @@ export PATH=/opt/mxe/usr/bin/:$PATH
 cd ..
 git clone https://github.com/mpv-player/mpv.git
 cd mpv
-python ./bootstrap.py
 DEST_OS=win32 TARGET=i686-w64-mingw32.static ./waf configure
 # Or, if 64 bit version,
 # DEST_OS=win32 TARGET=x86_64-w64-mingw32.static ./waf configure
@@ -104,21 +103,22 @@ Installing MSYS2
    It doesn't matter whether the i686 or the x86_64 version is used. Both can
    build 32-bit and 64-bit binaries when running on a 64-bit version of Windows.
 
-2. Start a MinGW-w64 shell (``mingw64.exe``). Note that this is different
-   from the MSYS2 shell that is started from the final installation dialog.
+2. Add ``C:\msys64\mingw64\bin`` to your ``%PATH%``. mpv will depend on several
+   DLLs in this folder.
 
-   For a 32-bit build, use ``mingw32.exe``.
+3. Start a MinGW-w64 shell (``mingw64_shell.bat``). For a 32-bit build, use
+   ``mingw32_shell.bat``.
 
 Updating MSYS2
 --------------
 
-To prevent errors during post-install, the MSYS2 core runtime must be updated
-separately.
+To prevent errors during post-install, ``msys2-runtime`` and ``pacman`` must be
+updated first.
 
 ```bash
-# Check for core updates. If instructed, close the shell window and reopen it
-# before continuing.
-pacman -Syu
+# Check for updates to msys2-runtime and pacman. If there were updates, restart
+# MSYS2 before continuing.
+pacman -Sy --needed msys2-runtime pacman
 
 # Update everything else
 pacman -Su
@@ -129,14 +129,14 @@ Installing mpv dependencies
 
 ```bash
 # Install MSYS2 build dependencies and a MinGW-w64 compiler
-pacman -S git mingw-w64-x86_64-pkg-config python mingw-w64-x86_64-gcc
+pacman -S git pkg-config python3 mingw-w64-x86_64-gcc
 
 # Install the most important MinGW-w64 dependencies. libass, libbluray and
 # lcms2 are also pulled in as dependencies of ffmpeg.
-pacman -S mingw-w64-x86_64-ffmpeg mingw-w64-x86_64-libjpeg-turbo mingw-w64-x86_64-lua51
+pacman -S mingw-w64-x86_64-ffmpeg mingw-w64-x86_64-libjpeg-turbo mingw-w64-x86_64-lua
 
 # Install additional (optional) dependencies
-pacman -S mingw-w64-x86_64-libdvdnav mingw-w64-x86_64-libguess mingw-w64-x86_64-angleproject-git
+pacman -S mingw-w64-x86_64-libdvdnav mingw-w64-x86_64-mpg123 mingw-w64-x86_64-libguess
 ```
 
 For a 32-bit build, install ``mingw-w64-i686-*`` packages instead.
@@ -156,14 +156,14 @@ Finally, compile and install mpv. Binaries will be installed to
 
 ```bash
 # For a 32-bit build, use --prefix=/mingw32 instead
-./waf configure CC=gcc.exe --check-c-compiler=gcc --prefix=/mingw64
+./waf configure CC=gcc --prefix=/mingw64
 ./waf install
 ```
 
 Or, compile and install both libmpv and mpv:
 
 ```bash
-./waf configure CC=gcc.exe --check-c-compiler=gcc --enable-libmpv-shared --prefix=/mingw64
+./waf configure CC=gcc --enable-libmpv-shared --prefix=/mingw64
 ./waf install
 
 # waf installs libmpv to the wrong directory, so fix it up
@@ -173,46 +173,39 @@ sed -i 's_/mingw64/bin_/mingw64/lib_' /mingw64/lib/pkgconfig/mpv.pc
 rmdir /mingw64/bin/pkgconfig
 ```
 
-Linking libmpv with MSVC programs
----------------------------------
+Additional dependencies
+=======================
 
-You can build C++ programs in Visual Studio and link them with libmpv. To do
-this, you need a Visual Studio which supports ``stdint.h`` (recent ones do),
-and you need to create a import library for the mpv DLL:
+pthreads
+--------
+
+mpv will use a pthreads wrapper by default. Either pthreads-win32 or
+winpthreads should work. The latter is packaged with most MinGW-w64
+environments, including MSYS2, so it shouldn't be a problem. If you don't have
+a pthreads wrapper or you want to build mpv without one, configure with:
 
 ```bash
-lib /def:mpv.def /name:mpv-1.dll /out:mpv.lib /MACHINE:X64
+./waf configure --enable-win32-internal-pthreads
 ```
 
-The string in the ``/name:`` parameter must match the filename of the DLL (this
-is simply the filename the MSVC linker will use). The ``mpv.def`` can be
-retrieved from the mpv build directory, or can be produced by MingGW's
-gendef.exe helper from the mpv DLL.
+libwaio
+-------
 
-Static linking is not possible.
+If you want to use ``--input-file``, you need libwaio. It's available from
+git://midipix.org/waio
 
-Running mpv
------------
-
-If you want to run mpv from the MinGW-w64 shell, you will find the experience
-much more pleasant if you use the ``winpty`` utility
+To compile libwaio in MSYS2, run:
 
 ```bash
-pacman -S winpty
-winpty mpv.com ToS-4k-1920.mov
+git clone git://midipix.org/waio && cd waio
+
+# 32-bit build, run from mingw32_shell.bat
+./build-mingw-nt32 lib-static CC=gcc AR=ar
+cp -r include/waio /mingw32/include
+cp lib32/libwaio.a /mingw32/lib
+
+# 64-bit build, run from mingw64_shell.bat
+./build-mingw-nt64 lib-static CC=gcc AR=ar
+cp -r include/waio /mingw64/include
+cp lib64/libwaio.a /mingw64/lib
 ```
-
-If you want to move / copy ``mpv.exe`` and ``mpv.com`` to somewhere other than
-``/mingw64/bin/`` for use outside the MinGW-w64 shell, they will still depend on
-DLLs in that folder. The simplest solution is to add ``C:\msys64\mingw64\bin``
-to the windows system ``%PATH%``. Beware though that this can cause problems or
-confusion in Cygwin if that is also installed on the machine.
-
-Use of the ANGLE OpenGL backend requires a copy of ``d3dcompiler_43.dll`` (yes,
-exactly 43) in the path or in the same folder as mpv. It must be of the same
-architecture (x86_64 / i686) as the mpv you compiled. You can find a copy in the
-official mpv builds:
-
-https://mpv.srsfckn.biz/mpv-x86_64-20160118.7z
-
-https://mpv.srsfckn.biz/mpv-i686-20160118.7z

DOCS/contribute.md

@@ -4,8 +4,8 @@ How to contribute
 General
 -------
 
-The main contact for mpv development is IRC, specifically #mpv
-and #mpv-devel on Freenode.
+The main contact for mpv development is IRC, specifically #mpv-player
+and #mpv-player-dev on Freenode.
 
 Sending patches
 ---------------
@@ -14,11 +14,6 @@ Sending patches
   ``git format-patch``. diffs posted as pastebins (especially if the http link
   returns HTML) just cause extra work for everyone, because they lack commit
   message and authorship information.
-- All new code must be LGPLv2.1+ licensed, or come with the implicit agreement
-  that it will be relicensed to LGPLv2.1+ later (see ``Copyright`` in the
-  repository root directory).
-- When creating pull requests, be sure to test your changes. If you didn't,
-  please say so in the pull request message.
 - Write informative commit messages. Use present tense to describe the
   situation with the patch applied, and past tense for the situation before
   the change.
@@ -29,8 +24,8 @@ Sending patches
 
   For example, you fixed a crash in af_volume.c:
 
-  - Bad: ``fixed the bug (wtf?)``
-  - Good: ``af_volume: fix crash due to null pointer access``
+  Bad: ``fixed the bug (wtf?)``
+  Good: ``af_volume: fix crash due to null pointer access``
 
   Having a prefix gives context, and is especially useful when trying to find
   a specific change by looking at the history, or when running ``git blame``.
@@ -55,10 +50,7 @@ Sending patches
   something like reformatting a whole file, and hiding an actual functional
   change in the same commit.
 - If you add a new command line option, document it in options.rst. If you
-  add a new input property, document it in input.rst. Changes to the user
-  interface (options, properties, commands) should be documented in
-  interface-changes.rst. Changes to libmpv should be documented in
-  client-api-changes.rst.
+  add a new input property, document it in input.rst.
 
 Code formatting
 ---------------
@@ -126,8 +118,6 @@ mpv uses C99 with K&R formatting, with some exceptions.
         very_long_condition_b)
     {
         code();
-    } else {
-        ...
     }
     ```
 - Remove any trailing whitespace.

DOCS/edl-mpv.rst

@@ -31,8 +31,9 @@ estimated remaining duration of the source file is used.
 
 Note::
 
-    Usage of relative or absolute paths as well as any protocol prefixes may be
-    prevented for security reasons.
+    mpv can't use ordered chapter files in EDL entries. Usage of relative or
+    absolute paths as well as any protocol prefixes is prevented for security
+    reasons.
 
 
 Syntax of mpv EDL files

DOCS/interface-changes.rst

@@ -1,260 +0,0 @@
-Introduction
-============
-
-mpv provides access to its internals via the following means:
-
-- options
-- commands
-- properties
-- events
-
-All of these are important for interfacing both with end users and API users
-(which include Lua scripts, libmpv, and the JSON IPC). As such, they constitute
-a large part of the user interface and APIs.
-
-This document lists changes to them. New changes are added to the top.
-
-Interface changes
-=================
-
-::
-
- --- mpv 0.21.0 ---
-    - setting certain options at runtime will now take care of updating them
-      property (see for example issue #3281). On the other hand, it will also
-      do runtime verification and reject option changes that do not work
-      (example: setting the "vf" option to a filter during playback, which fails
-      to initialize - the option value will remain at its old value). In general,
-      "set name value" should be mostly equivalent to "set options/name value"
-      in cases where the "name" property is not deprecated and "options/name"
-      exists - deviations from this are either bugs, or documented as caveats
-      in the "Inconsistencies between options and properties" manpage section.
-    - deprecate _all_ --vo and --ao suboptions. Generally, all suboptions are
-      replaced by global options, which do exactly the same. For example,
-      "--vo=opengl:scale=nearest" turns into "--scale=nearest". In some cases,
-      the global option is prefixed, e.g. "--vo=opengl:pbo" turns into
-      "--opengl-pbo".
-      Most of the exact replacements are documented here:
-        https://github.com/mpv-player/mpv/wiki/Option-replacement-list
-    - remove --vo=opengl-hq. Set --profile=opengl-hq instead. Note that this
-      profile does not force the VO. This means if you use the --vo option to
-      set another VO, it won't work. But this also means it can be used with
-      opengl-cb.
-    - remove the --vo=opengl "pre-shaders", "post-shaders" and "scale-shader"
-      sub-options: they were deprecated in favor of "user-shaders"
-    - deprecate --vo-defaults (no replacement)
-    - remove the vo-cmdline command. You can set OpenGL renderer options
-      directly via properties instead.
-    - deprecate the device/sink options on all AOs. Use --audio-device instead.
-    - deprecate "--ao=wasapi:exclusive" and "--ao=coreaudio:exclusive",
-      use --audio-exclusive instead.
-    - subtle changes in how "--no-..." options are treated mean that they are
-      not accessible under "options/..." anymore (instead, these are resolved
-      at parsing time). This does not affect options which start with "--no-",
-      but do not use the mechanism for negation options.
-      (Also see client API change for API version 1.23.)
-    - rename the following properties
-        - "demuxer" -> "current-demuxer"
-        - "fps" -> "container-fps"
-        - "idle" -> "idle-active"
-        - "cache" -> "cache-percent"
-      the old names are deprecated and will change behavior in mpv 0.22.0.
-    - remove deprecated "hwdec-active" and "hwdec-detected" properties
-    - deprecate the ao and vo auto-profiles (they never made any sense)
-    - deprecate "--vo=direct3d_shaders" - use "--vo=direct3d" instead.
-      Change "--vo=direct3d" to always use shaders by default.
-    - deprecate --playlist-pos option, renamed to --playlist-start
-    - deprecate the --chapter option, as it is redundant with --start/--end,
-      and conflicts with the semantics of the "chapter" property
-    - rename --sub-text-* to --sub-* and --ass-* to --sub-ass-* (old options
-      deprecated)
-    - incompatible change to cdda:// protocol options: the part after cdda://
-      now always sets the device, not the span or speed to be played. No
-      separating extra "/" is needed. The hidden --cdda-device options is also
-      deleted (it was redundant with the documented --cdrom-device).
-    - deprecate --vo=rpi. It will be removed in mpv 0.22.0. Its functionality
-      was folded into --vo=opengl, which now uses RPI hardware decoding by
-      treating it as a hardware overlay (without applying GL filtering). Also
-      to be changed in 0.22.0: the --fs flag will be reset to "no" by default
-      (like on the other platforms).
-    - deprecate --mute=auto (informally has been since 0.18.1)
-    - deprecate "resume" and "suspend" IPC commands. They will be completely
-      removed in 0.22.0.
-    - deprecate mp.suspend(), mp.resume(), mp.resume_all() Lua scripting
-      commands, as well as setting mp.use_suspend. They will be completely
-      removed in 0.22.0.
-    - the "seek" command's absolute seek mode will now interpret negative
-      seek times as relative from the end of the file (and clamps seeks that
-      still go before 0)
-    - add almost all options to the property list, meaning you can change
-      options without adding "options/" to the property name (a new section
-      has been added to the manpage describing some conflicting behavior
-      between options and properties)
-    - implement changing sub-speed during playback
-    - make many previously fixed options changeable at runtime (for example
-      --terminal, --osc, --ytdl, can all be enable/disabled after
-      mpv_initialize() - this can be extended to other still fixed options
-      on user requests)
- --- mpv 0.20.0 ---
-    - add --image-display-duration option - this also means that image duration
-      is not influenced by --mf-fps anymore in the general case (this is an
-      incompatible change)
- --- mpv 0.19.0 ---
-    - deprecate "balance" option/property (no replacement)
- --- mpv 0.18.1 ---
-    - deprecate --heartbeat-cmd
-    - remove --softvol=no capability:
-        - deprecate --softvol, it now does nothing
-        - --volume, --mute, and the corresponding properties now always control
-          softvol, and behave as expected without surprises (e.g. you can set
-          them normally while no audio is initialized)
-        - rename --softvol-max to --volume-max (deprecated alias is added)
-        - the --volume-restore-data option and property are removed without
-          replacement. They were _always_ internal, and used for watch-later
-          resume/restore. Now --volume/--mute are saved directly instead.
-        - the previous point means resuming files with older watch-later configs
-          will print an error about missing --volume-restore-data (which you can
-          ignore), and will not restore the previous value
-        - as a consequence, volume controls will no longer control PulseAudio
-          per-application value, or use the system mixer's per-application
-          volume processing
-        - system or per-application volume can still be controlled with the
-          ao-volume and ao-mute properties (there are no command line options)
- --- mpv 0.18.0 ---
-    - now ab-loops are active even if one of the "ab-loop-a"/"-b" properties is
-      unset ("no"), in which case the start of the file is used if the A loop
-      point is unset, and the end of the file for an unset B loop point
-    - deprecate --sub-ass=no option by --ass-style-override=strip
-      (also needs --embeddedfonts=no)
-    - add "hwdec-interop" and "hwdec-current" properties
-    - deprecated "hwdec-active" and "hwdec-detected" properties (to be removed
-      in mpv 0.20.0)
-    - choice option/property values that are "yes" or "no" will now be returned
-      as booleans when using the mpv_node functions in the client API, the
-      "native" property accessors in Lua, and the JSON API. They can be set as
-      such as well.
-    - the VO opengl fbo-format sub-option does not accept "rgb" or "rgba"
-      anymore
-    - all VO opengl prescalers have been removed (replaced by user scripts)
- --- mpv 0.17.0 ---
-    - deprecate "track-list/N/audio-channels" property (use
-      "track-list/N/demux-channel-count" instead)
-    - remove write access to "stream-pos", and change semantics for read access
-    - Lua scripts now don't suspend mpv by default while script code is run
-    - add "cache-speed" property
-    - rename --input-unix-socket to --input-ipc-server, and make it work on
-      Windows too
-    - change the exact behavior of the "video-zoom" property
-    - --video-unscaled no longer disables --video-zoom and --video-aspect
-      To force the old behavior, set --video-zoom=0 and --video-aspect=0
- --- mpv 0.16.0 ---
-    - change --audio-channels default to stereo (use --audio-channels=auto to
-      get the old default)
-    - add --audio-normalize-downmix
-    - change the default downmix behavior (--audio-normalize-downmix=yes to get
-      the old default)
-    - VO opengl custom shaders must now use "sample_pixel" as function name,
-      instead of "sample"
-    - change VO opengl scaler-resizes-only default to enabled
-    - add VO opengl "interpolation-threshold" suboption (introduces new default
-      behavior, which can change e.g. ``--video-sync=display-vdrop`` to the
-      worse, but is usually what you want)
-    - make "volume" and "mute" properties changeable even if no audio output is
-      active (this gives not-ideal behavior if --softvol=no is used)
-    - add "volume-max" and "mixer-active" properties
-    - ignore --input-cursor option for events injected by input commands like
-      "mouse", "keydown", etc.
- --- mpv 0.15.0 ---
-    - change "yadif" video filter defaults
- --- mpv 0.14.0 ---
-    - vo_opengl interpolation now requires --video-sync=display-... to be set
-    - change some vo_opengl defaults (including changing tscale)
-    - add "vsync-ratio", "estimated-display-fps" properties
-    - add --rebase-start-time option
-      This is a breaking change to start time handling. Instead of making start
-      time handling an aspect of different options and properties (like
-      "time-pos" vs. "playback-time"), make it dependent on the new option. For
-      compatibility, the "time-start" property now always returns 0, so code
-      which attempted to handle rebasing manually will not break.
- --- mpv 0.13.0 ---
-    - remove VO opengl-cb frame queue suboptions (no replacement)
- --- mpv 0.12.0 ---
-    - remove --use-text-osd (useless; fontconfig isn't a requirement anymore,
-      and text rendering is also lazily initialized)
-    - some time properties (at least "playback-time", "time-pos",
-      "time-remaining", "playtime-remaining") now are unavailable if the time
-      is unknown, instead of just assuming that the internal playback position
-      is 0
-    - add --audio-fallback-to-null option
-    - replace vf_format outputlevels suboption with "video-output-levels" global
-      property/option; also remove "colormatrix-output-range" property
-    - vo_opengl: remove sharpen3/sharpen5 scale filters, add sharpen sub-option
- --- 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
-      "display-sync-active" property
-      "vo-missed-frame-count" property
-      "audio-speed-correction" and "video-speed-correction" properties
-    - remove --demuxer-readahead-packets and --demuxer-readahead-bytes
-      add --demuxer-max-packets and --demuxer-max-bytes
-      (the new options are not replacement and have very different semantics)
-    - change "video-aspect" property: always settable, even if no video is
-      running; always return the override - if no override is set, return
-      the video's aspect ratio
-    - remove disc-nav (DVD, BD) related properties and commands
-    - add "option-info/<name>/set-locally" property
-    - add --cache-backbuffer; change --cache-default default to 75MB
-      the new total cache size is the sum of backbuffer and the cache size
-      specified by --cache-default or --cache
-    - add ``track-list/N/audio-channels`` property
-    - change --screenshot-tag-colorspace default value
-    - add --stretch-image-subs-to-screen
-    - add "playlist/N/title" property
-    - add --video-stereo-mode=no to disable auto-conversions
-    - add --force-seekable, and change default seekability in some cases
-    - add vf yadif/vavpp/vdpaupp interlaced-only suboptions
-      Also, the option is enabled by default (Except vf_yadif, which has
-      it enabled only if it's inserted by the deinterlace property.)
-    - add --hwdec-preload
-    - add ao coreaudio exclusive suboption
-    - add ``track-list/N/forced`` property
-    - add audio-params/channel-count and ``audio-params-out/channel-count props.
-    - add af volume replaygain-fallback suboption
-    - add video-params/stereo-in property
-    - add "keypress", "keydown", and "keyup" commands
-    - deprecate --ad-spdif-dtshd and enabling passthrough via --ad
-      add --audio-spdif as replacement
-    - remove "get_property" command
-    - remove --slave-broken
-    - add vo opengl custom shader suboptions (source-shader, scale-shader,
-      pre-shaders, post-shaders)
-    - completely change how the hwdec properties work:
-        - "hwdec" now reflects the --hwdec option
-        - "hwdec-detected" does partially what the old "hwdec" property did
-          (and also, "detected-hwdec" is removed)
-        - "hwdec-active" is added
-    - add protocol-list property
-    - deprecate audio-samplerate and audio-channels properties
-      (audio-params sub-properties are the replacement)
-    - add audio-params and audio-out-params properties
-    - deprecate "audio-format" property, replaced with "audio-codec-name"
-    - deprecate --media-title, replaced with --force-media-title
-    - deprecate "length" property, replaced with "duration"
-    - change volume property:
-        - the value 100 is now always "unchanged volume" - with softvol, the
-          range is 0 to --softvol-max, without it is 0-100
-        - the minimum value of --softvol-max is raised to 100
-    - remove vo opengl npot suboption
-    - add relative seeking by percentage to "seek" command
-    - add playlist_shuffle command
-    - add --force-window=immediate
-    - add ao coreaudio change-physical-format suboption
-    - remove vo opengl icc-cache suboption, add icc-cache-dir suboption
-    - add --screenshot-directory
-    - add --screenshot-high-bit-depth
-    - add --screenshot-jpeg-source-chroma
-    - default action for "rescan_external_files" command changes
- --- mpv 0.9.0 ---

DOCS/man/af.rst

@@ -11,10 +11,6 @@ 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.
 
@@ -63,14 +59,11 @@ 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|auto>``
-        Whether to normalize when remixing channel layouts (default: auto).
-        ``auto`` uses the value set by ``--audio-normalize-downmix``.
     ``o=<string>``
         Set AVOptions on the SwrContext or AVAudioResampleContext. These should
         be documented by FFmpeg or Libav.
 
-``lavcac3enc[=options]``
+``lavcac3enc[=tospdif[:bitrate[:minchn]]]``
     Encode multi-channel audio to AC-3 at runtime using libavcodec. Supports
     16-bit native-endian input format, maximum 6 channels. The output is
     big-endian when outputting a raw AC-3 stream, native-endian when
@@ -99,13 +92,62 @@ Available filters are:
         :5ch: 448
         :6ch: 448
 
-    ``minch=<n>``
-        If the input channel number is less than ``<minch>``, the filter will
+    ``minchn=<n>``
+        If the input channel number is less than ``<minchn>``, the filter will
         detach itself (default: 3).
 
-    ``encoder=<name>``
-        Select the libavcodec encoder used. Currently, this should be an AC-3
-        encoder, and using another codec will fail horribly.
+``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
@@ -164,7 +206,7 @@ Available filters are:
 
     .. admonition:: Examples
 
-        ``mpv --af=channels=4:[0-1,1-0,2-2,3-3] media.avi``
+        ``mpv --af=channels=4:[0-1,1-0,0-2,1-3] media.avi``
             Would change the number of channels to 4 and set up 4 routes that
             swap channel 0 and channel 1 and leave channel 2 and 3 intact.
             Observe that if media containing two channels were played back,
@@ -183,21 +225,14 @@ Available filters are:
         automatically up- and downmix standard channel layouts.
 
 ``format=format:srate:channels:out-format:out-srate:out-channels``
-    Does not do any format conversion itself. Rather, it may cause the
-    filter system to insert necessary conversion filters before or after this
-    filter if needed. It is primarily useful for controlling the audio format
-    going into other filters. To specify the format for audio output, see
-    ``--audio-format``, ``--audio-samplerate``, and ``--audio-channels``. This
-    filter is able to force a particular format, whereas ``--audio-*``
-    may be overridden by the ao based on output compatibility.
+    Force a specific audio format/configuration without actually changing the
+    audio data. Keep in mind that the filter system might auto-insert actual
+    conversion filters before or after this filter if needed.
 
     All parameters are optional. The first 3 parameters restrict what the filter
-    accepts as input. They will therefore cause conversion filters to be
-    inserted before this one.  The ``out-`` parameters tell the filters or audio
-    outputs following this filter how to interpret the data without actually
-    doing a conversion. Setting these will probably just break things unless you
-    really know you want this for some reason, such as testing or dealing with
-    broken media.
+    accepts as input. The ``out-`` parameters change the audio format, without
+    actually doing a conversion. The data will be 'reinterpreted' by the
+    filters or audio outputs following this filter.
 
     ``<format>``
         Force conversion to this format. Use ``--af=format=format=help`` to get
@@ -217,9 +252,21 @@ Available filters are:
 
     ``<out-channels>``
 
-    *NOTE*: this filter used to be named ``force``. The old ``format`` filter
-    used to do conversion itself, unlike this one which lets the filter system
-    handle the conversion.
+    See also ``--audio-format``, ``--audio-samplerate``, and
+    ``--audio-channels`` for related options. Keep in mind that
+    ``--audio-channels`` does not actually force the number of
+    channels in most cases, while this filter can do this.
+
+    *NOTE*: this filter used to be named ``force``. Also, unlike the old
+    ``format`` filter, this does not do any actual conversion anymore.
+    Conversion is done by other, automatically inserted filters.
+
+``convert24``
+    Filter for internal use only. Converts between 24-bit and 32-bit sample
+    formats.
+
+``convertsign``
+    Filter for internal use only. Converts between signed/unsigned formats.
 
 ``volume[=<volumedb>[:...]]``
     Implements software volume control. Use this filter with caution since it
@@ -245,10 +292,6 @@ Available filters are:
     ``replaygain-clip=yes|no``
         Prevent clipping caused by replaygain by automatically lowering the
         gain (default). Use ``replaygain-clip=no`` to disable this.
-    ``replaygain-fallback``
-        Gain in dB to apply if the file has no replay gain tags. This option
-        is always applied if the replaygain logic is somehow inactive. If this
-        is applied, no other replaygain options are applied.
     ``softclip``
         Turns soft clipping on. Soft-clipping can make the
         sound more smooth if very high volume levels are used. Enable this
@@ -312,12 +355,121 @@ 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.
 
-    This filter supports the following ``af-command`` commands:
+``sub[=fc:ch]``
+    Adds a subwoofer channel to the audio stream. The audio data used for
+    creating the subwoofer channel is an average of the sound in channel 0 and
+    channel 1. The resulting sound is then low-pass filtered by a 4th order
+    Butterworth filter with a default cutoff frequency of 60Hz and added to a
+    separate channel in the audio stream.
 
-    ``set-matrix``
-        Set the ``<matrix>`` argument dynamically. This can be used to change
-        the mixing matrix at runtime, without reinitializing the entire filter
-        chain.
+    .. warning::
+
+        Disable this filter when you are playing media with an LFE channel
+        (e.g. 5.1 surround sound), otherwise this filter will disrupt the sound
+        to the subwoofer.
+
+    ``<fc>``
+        cutoff frequency in Hz for the low-pass filter (20 Hz to 300 Hz)
+        (default: 60 Hz) For the best result try setting the cutoff frequency
+        as low as possible. This will improve the stereo or surround sound
+        experience.
+    ``<ch>``
+        Determines the channel number in which to insert the sub-channel
+        audio. Channel number can be between 0 and 7 (default: 5). Observe
+        that the number of channels will automatically be increased to <ch> if
+        necessary.
+
+    .. admonition:: Example
+
+        ``mpv --af=sub=100:4 --audio-channels=5 media.avi``
+            Would add a subwoofer channel with a cutoff frequency of 100 Hz to
+            output channel 4.
+
+``center``
+    Creates a center channel from the front channels. May currently be low
+    quality as it does not implement a high-pass filter for proper extraction
+    yet, but averages and halves the channels instead.
+
+    ``<ch>``
+        Determines the channel number in which to insert the center channel.
+        Channel number can be between 0 and 7 (default: 5). Observe that the
+        number of channels will automatically be increased to ``<ch>`` if
+        necessary.
+
+``surround[=delay]``
+    Decoder for matrix encoded surround sound like Dolby Surround. Some files
+    with 2-channel audio actually contain matrix encoded surround sound.
+
+    ``<delay>``
+        delay time in ms for the rear speakers (0 to 1000) (default: 20) This
+        delay should be set as follows: If d1 is the distance from the
+        listening position to the front speakers and d2 is the distance from
+        the listening position to the rear speakers, then the delay should be
+        set to 15ms if d1 <= d2 and to 15 + 5*(d1-d2) if d1 > d2.
+
+    .. admonition:: Example
+
+        ``mpv --af=surround=15 --audio-channels=4 media.avi``
+            Would add surround sound decoding with 15 ms delay for the sound to
+            the rear speakers.
+
+``delay[=[ch1,ch2,...]]``
+    Delays the sound to the loudspeakers such that the sound from the
+    different channels arrives at the listening position simultaneously. It is
+    only useful if you have more than 2 loudspeakers.
+
+    ``[ch1,ch2,...]``
+        The delay in ms that should be imposed on each channel (floating point
+        number between 0 and 1000).
+
+    To calculate the required delay for the different channels, do as follows:
+
+    1. Measure the distance to the loudspeakers in meters in relation to your
+       listening position, giving you the distances s1 to s5 (for a 5.1
+       system). There is no point in compensating for the subwoofer (you will
+       not hear the difference anyway).
+
+    2. Subtract the distances s1 to s5 from the maximum distance, i.e.
+       ``s[i] = max(s) - s[i]; i = 1...5``.
+
+    3. Calculate the required delays in ms as ``d[i] = 1000*s[i]/342; i =
+       1...5``.
+
+    .. admonition:: Example
+
+        ``mpv --af=delay=[10.5,10.5,0,0,7,0] media.avi``
+            Would delay front left and right by 10.5 ms, the two rear channels
+            and the subwoofer by 0 ms and the center channel by 7 ms.
+
+``export=mmapped_file:nsamples]``
+    Exports the incoming signal to other processes using memory mapping
+    (``mmap()``). Memory mapped areas contain a header::
+
+        int nch                      /* number of channels */
+        int size                     /* buffer size */
+        unsigned long long counter   /* Used to keep sync, updated every time
+                                        new data is exported. */
+
+    The rest is payload (non-interleaved) 16-bit data.
+
+    ``<mmapped_file>``
+        File to map data to (required)
+    ``<nsamples>``
+        number of samples per channel (default: 512).
+
+    .. admonition:: Example
+
+        ``mpv --af=export=/tmp/mpv-af_export:1024 media.avi``
+            Would export 1024 samples per channel to ``/tmp/mpv-af_export``.
+
+``extrastereo[=mul]``
+    (Linearly) increases the difference between left and right channels which
+    adds some sort of "live" effect to playback.
+
+    ``<mul>``
+        Sets the difference coefficient (default: 2.5). 0.0 means mono sound
+        (average of both channels), with 1.0 sound will be unchanged, with
+        -1.0 left and right channels will be swapped.
 
 ``drc[=method:target]``
     Applies dynamic range compression. This maximizes the volume by compressing
@@ -342,6 +494,45 @@ Available filters are:
         This filter can cause distortion with audio signals that have a very
         large dynamic range.
 
+``ladspa=file:label:[<control0>,<control1>,...]``
+    Load a LADSPA (Linux Audio Developer's Simple Plugin API) plugin. This
+    filter is reentrant, so multiple LADSPA plugins can be used at once.
+
+    ``<file>``
+        Specifies the LADSPA plugin library file.
+
+        .. note::
+
+            See also the note about the ``LADSPA_PATH`` variable in the
+            `ENVIRONMENT VARIABLES`_ section.
+    ``<label>``
+        Specifies the filter within the library. Some libraries contain only
+        one filter, but others contain many of them. Entering 'help' here
+        will list all available filters within the specified library, which
+        eliminates the use of 'listplugins' from the LADSPA SDK.
+    ``[<control0>,<control1>,...]``
+        Controls are zero or more ``,`` separated floating point values that
+        determine the behavior of the loaded plugin (for example delay,
+        threshold or gain).
+        In verbose mode (add ``-v`` to the mpv command line), all
+        available controls and their valid ranges are printed. This eliminates
+        the use of 'analyseplugin' from the LADSPA SDK.
+        Note that ``,`` is already used by the option parser to separate
+        filters, so you must quote the list of values with ``[...]`` or
+        similar.
+
+    .. admonition:: Example
+
+        ``mpv --af=ladspa='/usr/lib/ladspa/delay.so':delay_5s:[0.5,0.2] media.avi``
+            Does something.
+
+``karaoke``
+    Simple voice removal filter exploiting the fact that voice is usually
+    recorded with mono gear and later 'center' mixed onto the final audio
+    stream. Beware that this filter will turn your signal into mono. Works
+    well for 2 channel tracks; do not bother trying it on anything but 2
+    channel stereo.
+
 ``scaletempo[=option1:option2:...]``
     Scales audio tempo without altering pitch, optionally synced to playback
     speed (default).
@@ -374,10 +565,9 @@ Available filters are:
              Scale tempo in sync with speed (default).
         pitch
              Reverses effect of filter. Scales pitch without altering tempo.
-             Add this to your ``input.conf`` to step by musical semi-tones::
-
-                [ multiply speed 0.9438743126816935
-                ] multiply speed 1.059463094352953
+             Add ``[ multiply speed 0.9438743126816935`` and
+             ``] multiply speed 1.059463094352953`` to your ``input.conf``
+             to step by musical semi-tones.
 
              .. warning::
 
@@ -401,36 +591,15 @@ Available filters are:
         ``mpv --af=scaletempo=stride=30:overlap=.50:search=10 media.ogg``
             Would tweak the quality and performance parameters.
 
+        ``mpv --af=format=float,scaletempo media.ogg``
+            Would make scaletempo use float code. Maybe faster on some
+            platforms.
+
         ``mpv --af=scaletempo=scale=1.2:speed=pitch audio.ogg``
             Would play media at 1.2x normal speed, with audio at normal pitch.
             Changing playback speed would change pitch, leaving audio tempo at
             1.2x.
 
-``rubberband``
-    High quality pitch correction with librubberband. This can be used in place
-    of ``scaletempo``, and will be used to adjust audio pitch when playing
-    at speed different from normal. It can also be used to adjust audio pitch
-    without changing playback speed.
-
-    ``<pitch-scale>``
-        Sets the pitch scaling factor. Frequencies are multiplied by this value.
-
-    This filter has a number of additional sub-options. You can list them with
-    ``mpv --af=rubberband=help``. This will also show the default values
-    for each option. The options are not documented here, because they are
-    merely passed to librubberband. Look at the librubberband documentation
-    to learn what each option does:
-    http://breakfastquay.com/rubberband/code-doc/classRubberBand_1_1RubberBandStretcher.html
-    (The mapping of the mpv rubberband filter sub-option names and values to
-    those of librubberband follows a simple pattern: ``"Option" + Name + Value``.)
-
-    This filter supports the following ``af-command`` commands:
-
-    ``set-pitch``
-        Set the ``<pitch-scale>`` argument dynamically. This can be used to
-        change the playback pitch at runtime. Note that speed is controlled
-        using the standard ``speed`` property, not ``af-command``.
-
 ``lavfi=graph``
     Filter audio using FFmpeg's libavfilter.
 
@@ -445,3 +614,4 @@ Available filters are:
 
     ``o=<string>``
         AVOptions.
+

DOCS/man/ao.rst

@@ -4,82 +4,141 @@ AUDIO OUTPUT DRIVERS
 Audio output drivers are interfaces to different audio output facilities. The
 syntax is:
 
-``--ao=<driver1,driver2,...[,]>``
+``--ao=<driver1[:suboption1[=value]:...],driver2,...[,]>``
     Specify a priority list of audio output drivers to be used.
 
 If the list has a trailing ',', mpv will fall back on drivers not contained
-in the list.
+in the list. Suboptions are optional and can mostly be omitted.
+
+You can also set defaults for each driver. The defaults are applied before the
+normal driver parameters.
 
 ``--ao-defaults=<driver1[:parameter1:parameter2:...],driver2,...>``
     Set defaults for each driver.
 
-    Deprecated. No replacement.
-
 .. note::
 
     See ``--ao=help`` for a list of compiled-in audio output drivers. The
     driver ``--ao=alsa`` is preferred. ``--ao=pulse`` is preferred on systems
-    where PulseAudio is used. On BSD systems, ``--ao=oss`` or ``--ao=sndio``
-    may work (the latter being experimental).
+    where PulseAudio is used. On Windows, ``--ao=wasapi`` is preferred,
+    though it might cause trouble sometimes, in which case ``--ao=dsound``
+    should be used. On BSD systems, ``--ao=oss`` or `--ao=sndio`` may work
+    (the latter being experimental). On OS X systems, use ``--ao=coreaudio``.
+
+.. admonition:: Examples
+
+    - ``--ao=alsa,oss,`` Try the ALSA driver, then the OSS driver, then others.
+    - ``--ao=alsa:resample=yes:device=[plughw:0,3]`` Lets ALSA resample and
+      sets the device-name as first card, fourth device.
 
 Available audio output drivers are:
 
 ``alsa`` (Linux only)
     ALSA audio output driver
 
-    See `ALSA audio output options`_ for options specific to this AO.
+    ``device=<device>``
+        Sets the device name. For ac3 output via S/PDIF, use an "iec958" or
+        "spdif" device, unless you really know how to set it correctly.
+    ``resample=yes``
+        Enable ALSA resampling plugin. (This is disabled by default, because
+        some drivers report incorrect audio delay in some cases.)
+    ``mixer-device=<device>``
+        Set the mixer device used with ``--no-softvol`` (default: ``default``).
+    ``mixer-name=<name>``
+        Set the name of the mixer element (default: ``Master``). This is for
+        example ``PCM`` or ``Master``.
+    ``mixer-index=<number>``
+        Set the index of the mixer channel (default: 0). Consider the output of
+        "``amixer scontrols``", then the index is the number that follows the
+        name of the element.
+    ``non-interleaved``
+        Allow output of non-interleaved formats (if the audio decoder uses
+        this format). Currently disabled by default, because some popular
+        ALSA plugins are utterly broken with non-interleaved formats.
+
+    .. note::
+
+        MPlayer and mplayer2 required you to replace any ',' with '.' and
+        any ':' with '=' in the ALSA device name. mpv does not do this anymore.
+        Instead, quote the device name:
+
+            ``--ao=alsa:device=[plug:surround50]``
+
+        Note that the ``[`` and ``]`` simply quote the device name. With some
+        shells (like zsh), you have to quote the option string to prevent the
+        shell from interpreting the brackets instead of passing them to mpv.
+
+        Actually, you should use the ``--audio-device`` option, instead of
+        setting the device directly.
 
     .. warning::
 
-        To get multichannel/surround audio, use ``--audio-channels=auto``. The
-        default for this option is ``auto-safe``, which makes this audio otuput
-        explicitly reject multichannel output, as there is no way to detect
-        whether a certain channel layout is actually supported.
+        Handling of multichannel/surround audio changed in mpv 0.8.0 from the
+        behavior in MPlayer/mplayer2 and older versions of mpv.
 
-        You can also try `using the upmix plugin <http://git.io/vfuAy>`_.
-        This setup enables multichannel audio on the ``default`` device
-        with automatic upmixing with shared access, so playing stereo
-        and multichannel audio at the same time will work as expected.
+        The old behavior is that the player always downmixed to stereo by
+        default. The ``--audio-channels`` (or ``--channels`` before that) option
+        had to be set to get multichannel audio. Then playing stereo would
+        use the ``default`` device (which typically allows multiple programs
+        to play audio at the same time via dmix), while playing anything with
+        more channels would open one of the hardware devices, e.g. via the
+        ``surround51`` alias (typically with exclusive access). Whether the
+        player would use exclusive access or not would depend on the file
+        being played.
+
+        The new behavior since mpv 0.8.0 always enables multichannel audio,
+        i.e. ``--audio-channels=auto`` is the default. However, since ALSA
+        provides no good way to play multichannel audio in a non-exclusive
+        way (without blocking other applications from using audio), the player
+        is restricted to the capabilities of the ``default`` device by default,
+        which means it supports only stereo and mono (at least with current
+        typical ALSA configurations). But if a hardware device is selected,
+        then multichannel audio will typically work.
+
+        The short story is: if you want multichannel audio with ALSA, use
+        ``--audio-device`` to select the device (use ``--audio-device=help``
+        to get a list of all devices and their mpv name).
+
+        You can also try
+        `Using the upmix plugin <https://github.com/mpv-player/mpv/wiki/ALSA:-Surround-Sound-and-Upmixing>`_.
 
 ``oss``
     OSS audio output driver
 
-    The following global options are supported by this audio output:
-
-    ``--oss-device``
+    ``<dsp-device>``
         Sets the audio output device (default: ``/dev/dsp``).
-        Deprecated, use ``--audio-device``.
-    ``--oss-mixer-device``
+    ``<mixer-device>``
         Sets the audio mixer device (default: ``/dev/mixer``).
-    ``--oss-mixer-channel``
+    ``<mixer-channel>``
         Sets the audio mixer channel (default: ``pcm``). Other valid values
         include **vol, pcm, line**. For a complete list of options look for
         ``SOUND_DEVICE_NAMES`` in ``/usr/include/linux/soundcard.h``.
 
 ``jack``
-    JACK (Jack Audio Connection Kit) audio output driver.
+    JACK (Jack Audio Connection Kit) audio output driver
 
-    The following global options are supported by this audio output:
-
-    ``--jack-port=<name>``
+    ``port=<name>``
         Connects to the ports with the given name (default: physical ports).
-    ``--jack-name=<client>``
+    ``name=<client>``
         Client name that is passed to JACK (default: ``mpv``). Useful
         if you want to have certain connections established automatically.
-    ``--jack-autostart=<yes|no>``
+    ``(no-)autostart``
         Automatically start jackd if necessary (default: disabled). Note that
         this tends to be unreliable and will flood stdout with server messages.
-    ``--jack-connect=<yes|no>``
+    ``(no-)connect``
         Automatically create connections to output ports (default: enabled).
         When enabled, the maximum number of output channels will be limited to
         the number of available output ports.
-    ``--jack-std-channel-layout=<waveext|any>``
-        Select the standard channel layout (default: waveext). JACK itself has no
+    ``std-channel-layout=alsa|waveext|any``
+        Select the standard channel layout (default: alsa). JACK itself has no
         notion of channel layouts (i.e. assigning which speaker a given
         channel is supposed to map to) - it just takes whatever the application
         outputs, and reroutes it to whatever the user defines. This means the
         user and the application are in charge of dealing with the channel
-        layout. ``waveext`` uses WAVE_FORMAT_EXTENSIBLE order, which, even
+        layout. ``alsa`` uses the old MPlayer layout, which is inspired by
+        ALSA's standard layouts. In this mode, ao_jack will refuse to play 3
+        or 7 channels (because these do not really have a defined meaning in
+        MPlayer). ``waveext`` uses WAVE_FORMAT_EXTENSIBLE order, which, even
         though it was defined by Microsoft, is the standard on many systems.
         The value ``any`` makes JACK accept whatever comes from the audio
         filter chain, regardless of channel layout and without reordering. This
@@ -93,27 +152,12 @@ Available audio output drivers are:
     Automatically redirects to ``coreaudio_exclusive`` when playing compressed
     formats.
 
-    The following global options are supported by this audio output:
-
-    ``--coreaudio-change-physical-format=<yes|no>``
-        Change the physical format to one similar to the requested audio format
-        (default: no). This has the advantage that multichannel audio output
-        will actually work. The disadvantage is that it will change the
-        system-wide audio settings. This is equivalent to changing the ``Format``
-        setting in the ``Audio Devices`` dialog in the ``Audio MIDI Setup``
-        utility. Note that this does not affect the selected speaker setup.
-
-    ``--coreaudio-exclusive``
-        Deprecated, use ``--audio-exclusive``.
-        Use exclusive mode access. This merely redirects to
-        ``coreaudio_exclusive``, but should be preferred over using that AO
-        directly.
-
-
 ``coreaudio_exclusive`` (Mac OS X only)
     Native Mac OS X audio output driver using direct device access and
     exclusive mode (bypasses the sound server).
 
+    Supports only compressed formats (AC3 and DTS).
+
 ``openal``
     Experimental OpenAL audio output driver
 
@@ -123,21 +167,18 @@ Available audio output drivers are:
 ``pulse``
     PulseAudio audio output driver
 
-    The following global options are supported by this audio output:
-
-    ``--pulse-host=<host>``, ``--pulse-sink=<sink>``
+    ``[<host>][:<output sink>]``
         Specify the host and optionally output sink to use. An empty <host>
         string uses a local connection, "localhost" uses network transfer
         (most likely not what you want).
-        Deprecated, use ``--audio-device``.
 
-    ``--pulse-buffer=<1-2000|native>``
+    ``buffer=<1-2000|native>``
         Set the audio buffer size in milliseconds. A higher value buffers
         more data, and has a lower probability of buffer underruns. A smaller
         value makes the audio stream react faster, e.g. to playback speed
         changes. Default: 250.
 
-    ``--pulse-latency-hacks=<yes|no>``
+    ``latency-hacks=<yes|no>``
         Enable hacks to workaround PulseAudio timing bugs (default: no). If
         enabled, mpv will do elaborate latency calculations on its own. If
         disabled, it will use PulseAudio automatically updated timing
@@ -146,7 +187,19 @@ Available audio output drivers are:
         (it used to be required to get good behavior on old PulseAudio versions).
 
         If you have stuttering video when using pulse, try to enable this
-        option. (Or try to update PulseAudio.)
+        option. (Or alternatively, try to update PulseAudio.)
+
+``dsound`` (Windows only)
+    DirectX DirectSound audio output driver
+
+    .. note:: This driver is for compatibility with old systems.
+
+    ``device=<devicenum>``
+        Sets the device number to use. Playing a file with ``-v`` will show a
+        list of available devices.
+
+    ``buffersize=<ms>``
+        DirectSound buffer size in milliseconds (default: 200).
 
 ``sdl``
     SDL 1.2+ audio output driver. Should work on any platform supported by SDL
@@ -157,67 +210,57 @@ Available audio output drivers are:
               environments, such as systems where none of the other drivers
               are available.
 
-    The following global options are supported by this audio output:
-
-    ``--sdl-buflen=<length>``
+    ``buflen=<length>``
         Sets the audio buffer length in seconds. Is used only as a hint by the
         sound system. Playing a file with ``-v`` will show the requested and
         obtained exact buffer size. A value of 0 selects the sound system
         default.
 
-    ``--sdl-bufcnt=<count>``
+    ``bufcnt=<count>``
         Sets the number of extra audio buffers in mpv. Usually needs not be
         changed.
 
 ``null``
-    Produces no audio output but maintains video playback speed. You can use
-    ``--ao=null --ao-null-untimed`` for benchmarking.
+    Produces no audio output but maintains video playback speed. Use
+    ``--ao=null:untimed`` for benchmarking.
 
-    The following global options are supported by this audio output:
-
-    ``--ao-null-untimed``
+    ``untimed``
         Do not simulate timing of a perfect audio device. This means audio
         decoding will go as fast as possible, instead of timing it to the
         system clock.
 
-    ``--ao-null-buffer``
+    ``buffer``
         Simulated buffer length in seconds.
 
-    ``--ao-null-outburst``
+    ``outburst``
         Simulated chunk size in samples.
 
-    ``--ao-null-speed``
+    ``speed``
         Simulated audio playback speed as a multiplier. Usually, a real audio
         device will not go exactly as fast as the system clock. It will deviate
-        just a little, and this option helps to simulate this.
+        just a little, and this option helps simulating this.
 
-    ``--ao-null-latency``
+    ``latency``
         Simulated device latency. This is additional to EOF.
 
-    ``--ao-null-broken-eof``
+    ``broken-eof``
         Simulate broken audio drivers, which always add the fixed device
         latency to the reported audio playback position.
 
-    ``--ao-null-broken-delay``
+    ``broken-delay``
         Simulate broken audio drivers, which don't report latency correctly.
 
-    ``--ao-null-channel-layouts``
-        If not empty, this is a ``,`` separated list of channel layouts the
-        AO allows. This can be used to test channel layout selection.
-
 ``pcm``
     Raw PCM/WAVE file writer audio output
 
-    The following global options are supported by this audio output:
-
-    ``--ao-pcm-waveheader=<yes|no>``
+    ``(no-)waveheader``
         Include or do not include the WAVE header (default: included). When
         not included, raw PCM will be generated.
-    ``--ao-pcm-file=<filename>``
+    ``file=<filename>``
         Write the sound to ``<filename>`` instead of the default
         ``audiodump.wav``. If ``no-waveheader`` is specified, the default is
         ``audiodump.pcm``.
-    ``--ao-pcm-append=<yes|no>``
+    ``(no-)append``
         Append to the file, instead of overwriting it. Always use this with the
         ``no-waveheader`` option - with ``waveheader`` it's broken, because
         it will write a WAVE header every time the file is opened.
@@ -229,19 +272,14 @@ Available audio output drivers are:
               confused with RoarAudio, which is something completely
               different.
 
-    The following global options are supported by this audio output:
-
-    ``--rsound-host=<name/path>``
+    ``host=<name/path>``
         Set the address of the server (default: localhost).  Can be either a
         network hostname for TCP connections or a Unix domain socket path
         starting with '/'.
-    ``--rsound-port=<number>``
+    ``port=<number>``
         Set the TCP port used for connecting to the server (default: 12345).
         Not used if connecting to a Unix domain socket.
 
-    These options are deprecated. If anyone cares enough, their functionality
-    can be added back using ``--audio-device``.
-
 ``sndio``
     Audio output to the OpenBSD sndio sound system
 
@@ -250,28 +288,25 @@ Available audio output drivers are:
     (Note: only supports mono, stereo, 4.0, 5.1 and 7.1 channel
     layouts.)
 
-    The following global options are supported by this audio output:
-
-    ``--ao-sndio-device=<device>``
+    ``device=<device>``
         sndio device to use (default: ``$AUDIODEVICE``, resp. ``snd0``).
-        Deprecated, use ``--audio-device``.
 
 ``wasapi``
     Audio output to the Windows Audio Session API.
 
-    The following global options are supported by this audio output:
+    ``device=<id>``
+        Uses the requested endpoint instead of the system's default audio
+        endpoint. Both the number and the ID String are valid; the ID String
+        is guaranteed to not change unless the driver is uninstalled.
 
-    ``--ao-wasapi-exclusive``
-        Deprecated, use ``--audio-exclusive``.
+        Also supports searching active devices by name. If more than one
+        device matches the name, refuses loading it.
+
+        To get a list of the valid devices, give ``help`` as the id. The
+        list is the same as the ``list`` suboption, but stops the player
+        initialization.
+    ``exclusive``
         Requests exclusive, direct hardware access. By definition prevents
         sound playback of any other program until mpv exits.
-    ``--ao-wasapi-device=<id>``
-        Deprecated, use ``--audio-device``.
-
-        Uses the requested endpoint instead of the system's default audio
-        endpoint. Both an ordinal number (0,1,2,...) and the GUID
-        String are valid; the GUID string is guaranteed to not change
-        unless the driver is uninstalled.
-
-        Also supports searching active devices by human-readable name. If more
-        than one device matches the name, refuses loading it.
+    ``list``
+        Lists all audio endpoints (output devices) present in the system.

DOCS/man/changes.rst

@@ -8,11 +8,6 @@ There is no real changelog, but you can look at the following things:
 
   https://github.com/mpv-player/mpv/releases
 * The git log, which is the "real" changelog
-* The files ``client-api-changes.rst`` and ``interface-changes.rst`` in the
-  ``DOCS`` sub directoryon the git repository, which document API and user
-  interface changes (the latter usually documents breaking changes only, rather
-  than additions).
 * The file ``mplayer-changes.rst`` in the ``DOCS`` sub directory on the git
   repository, which used to be in place of this section. It documents some
-  changes that happened since mplayer2 forked off MPlayer. (Not updated
-  anymore.)
+  changes that happened since mplayer2 forked off MPlayer.

DOCS/man/encode.rst

@@ -93,8 +93,8 @@ You can encode files from one format/codec to another using this facility.
         Completely empties the options list.
 
 ``--oafirst``
-    Force the audio stream to become the first stream in the output.
-    By default, the order is unspecified.
+    Force the audio stream to become the first stream in the output. By default
+    the order is unspecified.
 
 ``--ovc=<codec>``
     Specifies the output video codec. This can be a comma separated list of
@@ -111,7 +111,7 @@ You can encode files from one format/codec to another using this facility.
 
     .. admonition:: Examples
 
-        ``"--ovc=mpeg4 --ovcopts=qscale=5"``
+        ``"--ovc=mpeg4 --oacopts=qscale=5"``
             selects constant quantizer scale 5 for MPEG-4 encoding.
 
         ``"--ovc=libx264 --ovcopts=crf=23"``
@@ -134,8 +134,8 @@ You can encode files from one format/codec to another using this facility.
         Completely empties the options list.
 
 ``--ovfirst``
-    Force the video stream to become the first stream in the output.
-    By default, the order is unspecified.
+    Force the video stream to become the first stream in the output. By default
+    the order is unspecified.
 
 ``--ocopyts``
     Copies input pts to the output video (not supported by some output

DOCS/man/ipc.rst

@@ -1,10 +1,10 @@
 JSON IPC
 ========
 
-mpv can be controlled by external programs using the JSON-based IPC protocol.
-It can be enabled by specifying the path to a unix socket or a named pipe using
-the option ``--input-ipc-server``. Clients can connect to this socket and send
-commands to the player or receive events from it.
+mpv can be controlled by external programs using the JSON-based IPC protocol. It
+can be enabled by specifying the path to a unix socket using the option
+``--input-unix-socket``. Clients can connect to this socket and send commands to
+the player or receive events from it.
 
 .. warning::
 
@@ -17,12 +17,12 @@ commands to the player or receive events from it.
 Socat example
 -------------
 
-You can use the ``socat`` tool to send commands (and receive replies) from the
+You can use the ``socat`` tool to send commands (and receive reply) from the
 shell. Assuming mpv was started with:
 
 ::
 
-    mpv file.mkv --input-ipc-server=/tmp/mpvsocket
+    mpv file.mkv --input-unix-socket=/tmp/mpvsocket
 
 Then you can control it using socat:
 
@@ -41,36 +41,11 @@ It's also possible to send input.conf style text-only commands:
 
 ::
 
-    > echo 'show-text ${playback-time}' | socat - /tmp/mpvsocket
+    > echo 'show_text ${playback-time}' | socat - /tmp/mpvsocket
 
 But you won't get a reply over the socket. (This particular command shows the
 playback time on the player's OSD.)
 
-Command Prompt example
-----------------------
-
-Unfortunately, it's not as easy to test the IPC protocol on Windows, since
-Windows ports of socat (in Cygwin and MSYS2) don't understand named pipes. In
-the absence of a simple tool to send and receive from bidirectional pipes, the
-``echo`` command can be used to send commands, but not receive replies from the
-command prompt.
-
-Assuming mpv was started with:
-
-::
-
-    mpv file.mkv --input-ipc-server=\\.\pipe\mpvsocket
-
-You can send commands from a command prompt:
-
-::
-
-    echo show-text ${playback-time} >\\.\pipe\mpvsocket
-
-To be able to simultaneously read and write from the IPC pipe, like on Linux,
-it's necessary to write an external program that uses overlapped file I/O (or
-some wrapper like .NET's NamedPipeClientStream.)
-
 Protocol
 --------
 
@@ -104,30 +79,9 @@ mpv will also send events to clients with JSON messages of the following form:
 where ``event_name`` is the name of the event. Additional event-specific fields
 can also be present. See `List of events`_ for a list of all supported events.
 
-Because events can occur at any time, it may be difficult at times to determine
-which response goes with which command. Commands may optionally include a
-``request_id`` which, if provided in the command request, will be copied
-verbatim into the response. mpv does not intrepret the ``request_id`` in any
-way; it is solely for the use of the requester.
-
-For example, this request:
-
-::
-
-    { "command": ["get_property", "time-pos"], "request_id": 100 }
-
-Would generate this response:
-
-::
-
-    { "error": "success", "data": 1.468135, "request_id": 100 }
-
-All commands, replies, and events are separated from each other with a line
-break character (``\n``).
-
 If the first character (after skipping whitespace) is not ``{``, the command
 will be interpreted as non-JSON text command, as they are used in input.conf
-(or ``mpv_command_string()`` in the client API). Additionally, lines starting
+(or ``mpv_command_string()`` in the client API). Additionally, line starting
 with ``#`` and empty lines are ignored.
 
 Currently, embedded 0 bytes terminate the current line, but you should not
@@ -136,7 +90,7 @@ rely on this.
 Commands
 --------
 
-In addition to the commands described in `List of Input Commands`_, a few
+Additionally to  the commands described in `List of Input Commands`_, a few
 extra commands can also be used as part of the protocol:
 
 ``client_name``
@@ -214,7 +168,7 @@ extra commands can also be used as part of the protocol:
 
 ``unobserve_property``
     Undo ``observe_property`` or ``observe_property_string``. This requires the
-    numeric id passed to the observed command as argument.
+    numeric id passed to the observe command as argument.
 
     Example:
 
@@ -242,24 +196,18 @@ extra commands can also be used as part of the protocol:
     command.
 
 ``suspend``
-    Deprecated, will be removed completely in 0.21.0.
-
     Suspend the mpv main loop. There is a long-winded explanation of this in
     the C API function ``mpv_suspend()``. In short, this prevents the player
     from displaying the next video frame, so that you don't get blocked when
     trying to access the player.
 
 ``resume``
-    Deprecated, will be removed completely in 0.21.0.
-
     Undo one ``suspend`` call. ``suspend`` increments an internal counter, and
     ``resume`` decrements it. When 0 is reached, the player is actually resumed.
 
 ``get_version``
     Returns the client API version the C API of the remote mpv instance
-    provides.
-
-    See also: ``DOCS/client-api-changes.rst``.
+    provides. (Also see ``DOCS/client-api-changes.rst``.)
 
 UTF-8
 -----

DOCS/man/libmpv.rst

@@ -1,16 +0,0 @@
-EMBEDDING INTO OTHER PROGRAMS (LIBMPV)
-======================================
-
-mpv can be embedded into other programs as video/audio playback backend. The
-recommended way to do so is using libmpv. See ``libmpv/client.h`` in the mpv
-source code repository. This provides a C API. Bindings for other languages
-might be available (see wiki).
-
-Since libmpv merely allows access to underlying mechanisms that can control
-mpv, further documentation is spread over a few places:
-
-- https://github.com/mpv-player/mpv/blob/master/libmpv/client.h
-- http://mpv.io/manual/master/#options
-- http://mpv.io/manual/master/#list-of-input-commands
-- http://mpv.io/manual/master/#properties
-- https://github.com/mpv-player/mpv-examples/tree/master/libmpv

DOCS/man/lua.rst

@@ -73,10 +73,6 @@ The ``mp`` module is preloaded, although it can be loaded manually with
     Run the given command. This is similar to the commands used in input.conf.
     See `List of Input Commands`_.
 
-    By default, this will show something on the OSD (depending on the command),
-    as if it was used in ``input.conf``. See `Input Command Prefixes`_ how
-    to influence OSD usage per command.
-
     Returns ``true`` on success, or ``nil, error`` on error.
 
 ``mp.commandv(arg1, arg2, ...)``
@@ -98,9 +94,6 @@ The ``mp`` module is preloaded, although it can be loaded manually with
     the ``expand-properties`` prefix, or the ``mp.get_property`` family of
     functions.
 
-    Unlike ``mp.command``, this will not use OSD by default either (except
-    for some OSD-specific commands).
-
 ``mp.command_native(table [,def])``
     Similar to ``mp.commandv``, but pass the argument list as table. This has
     the advantage that in at least some cases, arguments can be passed as
@@ -175,7 +168,7 @@ The ``mp`` module is preloaded, although it can be loaded manually with
     Similar to ``mp.set_property``, but set the given property using its native
     type.
 
-    Since there are several data types which cannot represented natively in
+    Since there are several data types which can not represented natively in
     Lua, this might not always work as expected. For example, while the Lua
     wrapper can do some guesswork to decide whether a Lua table is an array
     or a map, this would fail with empty tables. Also, there are not many
@@ -192,14 +185,13 @@ The ``mp`` module is preloaded, although it can be loaded manually with
     Register callback to be run on a key binding. The binding will be mapped to
     the given ``key``, which is a string describing the physical key. This uses
     the same key names as in input.conf, and also allows combinations
-    (e.g. ``ctrl+a``). If the key is empty or ``nil``, no physical key is
-    registered, but the user still can create own bindings (see below).
+    (e.g. ``ctrl+a``).
 
     After calling this function, key presses will cause the function ``fn`` to
     be called (unless the user remapped the key with another binding).
 
     The ``name`` argument should be a short symbolic string. It allows the user
-    to remap the key binding via input.conf using the ``script-message``
+    to remap the key binding via input.conf using the ``script_message``
     command, and the name of the key binding (see below for
     an example). The name should be unique across other bindings in the same
     script - if not, the previous binding with the same name will be
@@ -221,8 +213,8 @@ The ``mp`` module is preloaded, although it can be loaded manually with
             has an ``is_mouse`` entry, which tells whether the event was caused
             by a mouse button.
 
-    Internally, key bindings are dispatched via the ``script-message-to`` or
-    ``script-binding`` input commands and ``mp.register_script_message``.
+    Internally, key bindings are dispatched via the ``script_message_to`` or
+    ``script_binding`` input commands and ``mp.register_script_message``.
 
     Trying to map multiple commands to a key will essentially prefer a random
     binding, while the other bindings are not called. It is guaranteed that
@@ -245,7 +237,7 @@ The ``mp`` module is preloaded, although it can be loaded manually with
 
     ::
 
-        y script-binding something
+        y script_binding something
 
 
     This will print the message when the key ``y`` is pressed. (``x`` will
@@ -256,7 +248,7 @@ The ``mp`` module is preloaded, although it can be loaded manually with
 
     ::
 
-        y script-binding fooscript/something
+        y script_binding fooscript.something
 
 ``mp.add_forced_key_binding(...)``
     This works almost the same as ``mp.add_key_binding``, but registers the
@@ -334,6 +326,7 @@ The ``mp`` module is preloaded, although it can be loaded manually with
     the timer is re-added after the function fn is run.
 
     Returns a timer object. The timer object provides the following methods:
+
         ``stop()``
             Disable the timer. Does nothing if the timer is already disabled.
             This will remember the current elapsed time when stopping, so that
@@ -350,10 +343,6 @@ The ``mp`` module is preloaded, although it can be loaded manually with
             with ``add_timeout()``), this starts the timer from the beginning,
             using the initially configured timeout.
 
-        ``is_enabled()``
-            Whether the timer is currently enabled or was previously disabled
-            (e.g. by ``stop()`` or ``kill()``).
-
         ``timeout`` (RW)
             This field contains the current timeout period. This value is not
             updated as time progresses. It's only used to calculate when the
@@ -368,23 +357,6 @@ The ``mp`` module is preloaded, although it can be loaded manually with
             (``true``). This value is used when the timer expires (but before
             the timer callback function fn is run).
 
-    Note that these are method, and you have to call them using ``:`` instead
-    of ``.`` (Refer to http://www.lua.org/manual/5.2/manual.html#3.4.9 .)
-
-    Example:
-
-    ::
-
-        seconds = 0
-        timer = mp.add_periodic_timer(1, function()
-            print("called every second")
-            # stop it after 10 seconds
-            seconds = seconds + 1
-            if seconds >= 10 then
-                timer:kill()
-            end
-        end)
-
 
 ``mp.get_opt(key)``
     Return a setting from the ``--script-opts`` option. It's up to the user and
@@ -394,7 +366,7 @@ The ``mp`` module is preloaded, although it can be loaded manually with
 ``mp.get_script_name()``
     Return the name of the current script. The name is usually made of the
     filename of the script, with directory and file extension removed. If
-    there are several scripts which would have the same name, it's made unique
+    there are several script which would have the same name, it's made unique
     by appending a number.
 
     .. admonition:: Example
@@ -412,28 +384,26 @@ These also live in the ``mp`` module, but are documented separately as they
 are useful only in special situations.
 
 ``mp.suspend()``
-    This function has been deprecated in mpv 0.21.0 (no replacement).
-
     Suspend the mpv main loop. There is a long-winded explanation of this in
     the C API function ``mpv_suspend()``. In short, this prevents the player
     from displaying the next video frame, so that you don't get blocked when
     trying to access the player.
 
-    Before mpv 0.17.0, this was automatically called by the event handler.
+    This is automatically called by the event handler.
 
 ``mp.resume()``
-    This function has been deprecated in mpv 0.21.0 (no replacement).
-
     Undo one ``mp.suspend()`` call. ``mp.suspend()`` increments an internal
     counter, and ``mp.resume()`` decrements it. When 0 is reached, the player
     is actually resumed.
 
 ``mp.resume_all()``
-    This function has been deprecated in mpv 0.21.0 (no replacement).
-
     This resets the internal suspend counter and resumes the player. (It's
     like calling ``mp.resume()`` until the player is actually resumed.)
 
+    You might want to call this if you're about to do something that takes a
+    long time, but doesn't really need access to the player (like a network
+    operation). Note that you still can access the player at any time.
+
 ``mp.get_wakeup_pipe()``
     Calls ``mpv_get_wakeup_pipe()`` and returns the read end of the wakeup
     pipe. (See ``client.h`` for details.)
@@ -456,12 +426,7 @@ are useful only in special situations.
     ``mp.get_wakeup_pipe()`` if you're interested in properly working
     notification of new events and working timers.
 
-``mp.register_idle(fn)``
-    Register an event loop idle handler. Idle handlers are called before the
-    script goes to sleep after handling all new events. This can be used for
-    example to delay processing of property change events: if you're observing
-    multiple properties at once, you might not want to act on each property
-    change, but only when all change notifications have been received.
+    This function calls ``mp.suspend()`` and ``mp.resume_all()`` on its own.
 
 ``mp.enable_messages(level)``
     Set the minimum log level of which mpv message output to receive. These
@@ -471,9 +436,9 @@ are useful only in special situations.
     The level is a string, see ``msg.log`` for allowed log levels.
 
 ``mp.register_script_message(name, fn)``
-    This is a helper to dispatch ``script-message`` or ``script-message-to``
-    invocations to Lua functions. ``fn`` is called if ``script-message`` or
-    ``script-message-to`` (with this script as destination) is run
+    This is a helper to dispatch ``script_message`` or ``script_message_to``
+    invocations to Lua functions. ``fn`` is called if ``script_message`` or
+    ``script_message_to`` (with this script as destination) is run
     with ``name`` as first parameter. The other parameters are passed to ``fn``.
     If a message with the given name is already registered, it's overwritten.
 
@@ -530,8 +495,8 @@ Example implementation::
         optionB = -0.5,
         optionC = true,
     }
-    read_options(options, "myscript")
-    print(options.optionA)
+    options.read_options(options, "myscript")
+    print(option.optionA)
 
 
 The config file will be stored in ``lua-settings/identifier.conf`` in mpv's user
@@ -554,8 +519,8 @@ Example command-line::
      --script-opts=myscript-optionA=TEST,myscript-optionB=0,myscript-optionC=yes
 
 
-mp.utils functions
-------------------
+mp.utils options
+----------------
 
 This built-in module provides generic helper functions for Lua, and have
 strictly speaking nothing to do with mpv or video/audio playback. They are
@@ -642,20 +607,7 @@ strictly part of the guaranteed API.
             On Windows, ``killed`` is only returned when the process has been
             killed by mpv as a result of ``cancellable`` being set to ``true``.
 
-        ``killed_by_us``
-            Set to ``true`` if the process has been killed by mpv as a result
-            of ``cancellable`` being set to ``true``.
-
-``utils.subprocess_detached(t)``
-    Runs an external process and detaches it from mpv's control.
-
-    The parameter ``t`` is a table. The function reads the following entries:
-
-        ``args``
-            Array of strings of the same semantics as the ``args`` used in the
-            ``subprocess`` function.
-
-    The function returns ``nil``.
+    In all cases, ``mp.resume_all()`` is implicitly called.
 
 ``utils.parse_json(str [, trail])``
     Parses the given string argument as JSON, and returns it as a Lua table. On
@@ -671,14 +623,6 @@ strictly part of the guaranteed API.
     trailing text is returned as 3rd return value. (The 3rd return value is
     always there, but with ``trail`` set, no error is raised.)
 
-``utils.format_json(v)``
-    Format the given Lua table (or value) as a JSON string and return it. On
-    error, returns ``nil, error``. (Errors usually only happen on value types
-    incompatible with JSON.)
-
-    The argument value uses similar conventions as ``mp.set_property_native()``
-    to distinguish empty objects and arrays.
-
 ``utils.to_string(v)``
     Turn the given value into a string. Formats tables and their contents. This
     doesn't do anything special; it is only needed because Lua is terrible.
@@ -715,33 +659,6 @@ List of events
     Happens after a file was unloaded. Typically, the player will load the
     next file right away, or quit if this was the last file.
 
-    The event has the ``reason`` field, which takes one of these values:
-
-    ``eof``
-        The file has ended. This can (but doesn't have to) include
-        incomplete files or broken network connections under
-        circumstances.
-
-    ``stop``
-        Playback was ended by a command.
-
-    ``quit``
-        Playback was ended by sending the quit command.
-
-    ``error``
-        An error happened. In this case, an ``error`` field is present with
-        the error string.
-
-    ``redirect``
-        Happens with playlists and similar. Details see
-        ``MPV_END_FILE_REASON_REDIRECT`` in the C API.
-
-    ``unknown``
-        Unknown. Normally doesn't happen, unless the Lua API is out of sync
-        with the C API. (Likewise, it could happen that your script gets
-        reason strings that did not exist yet at the time your script was
-        written.)
-
 ``file-loaded``
     Happens after a file was loaded and begins playback.
 

DOCS/man/mpv.rst

@@ -32,14 +32,8 @@ INTERACTIVE CONTROL
 ===================
 
 mpv has a fully configurable, command-driven control layer which allows you
-to control mpv using keyboard, mouse, or remote control (there is no
-LIRC support - configure remotes as input devices instead).
-
-See the ``--input-`` options for ways to customize it.
-
-The following listings are not necessarily complete. See ``etc/input.conf`` for
-a list of default bindings. User ``input.conf`` files and Lua scripts can
-define additional key bindings.
+to control mpv using keyboard, mouse, joystick or remote control (with
+LIRC). See the ``--input-`` options for ways to customize it.
 
 Keyboard Control
 ----------------
@@ -54,7 +48,7 @@ UP and DOWN
 
 Ctrl+LEFT and Ctrl+RIGHT
     Seek to the previous/next subtitle. Subject to some restrictions and
-    might not always work; see ``sub-seek`` command.
+    might not work always; see ``sub_seek`` command.
 
 [ and ]
     Decrease/increase current playback speed by 10%.
@@ -120,7 +114,11 @@ o (also P)
     Show progression bar, elapsed time and total duration on the OSD.
 
 O
-    Toggle OSD states between normal and playback time/duration.
+    Toggle OSD states: none / seek / seek + timer / seek + timer + total time.
+
+d
+    Toggle frame dropping states: none / skip display / skip decoding (see
+    ``--framedrop``).
 
 v
     Toggle subtitle visibility.
@@ -132,22 +130,14 @@ x and z
     Adjust subtitle delay by +/- 0.1 seconds.
 
 l
-    Set/clear A-B loop points. See ``ab-loop`` command for details.
-
-L
-    Toggle infinite looping.
+    Set/clear A-B loop points. See ``ab_loop`` command for details.
 
 Ctrl + and Ctrl -
     Adjust audio delay by +/- 0.1 seconds.
 
-u
-    Switch between applying no style overrides to SSA/ASS subtitles, and
-    overriding them almost completely with the normal subtitle style. See
-    ``--sub-ass-style-override`` for more info.
-
 V
     Toggle subtitle VSFilter aspect compatibility mode. See
-    ``--sub-ass-vsfilter-aspect-compat`` for more info.
+    ``--ass-vsfilter-aspect-compat`` for more info.
 
 r and t
     Move subtitles up/down.
@@ -159,10 +149,6 @@ S
     Take a screenshot, without subtitles. (Whether this works depends on VO
     driver support.)
 
-Ctrl s
-    Take a screenshot, as the window shows it (with subtitles, OSD, and scaled
-    video).
-
 I
     Show filename on the OSD.
 
@@ -175,7 +161,7 @@ Shift+PGUP and Shift+PGDWN
     Seek backward or forward by 10 minutes. (This used to be mapped to
     PGUP/PGDWN without Shift.)
 
-d
+D
     Activate/deactivate deinterlacer.
 
 A
@@ -196,19 +182,23 @@ corresponding adjustment, or the software equalizer (``--vf=eq``).)
 7 and 8
     Adjust saturation.
 
-Alt+0 (and command+0 on OSX)
-    Resize video window to half its original size.
+(The following keys are valid only on OS X.)
 
-Alt+1 (and command+1 on OSX)
+command + 0
+    Resize video window to half its original size.
+    (On other platforms, you can bind keys to change the ``window-scale``
+    property.)
+
+command + 1
     Resize video window to its original size.
 
-Alt+2 (and command+2 on OSX)
+command + 2
     Resize video window to double its original size.
 
-command + f (OSX only)
+command + f
     Toggle fullscreen (see also ``--fs``).
 
-command + [ and command + ] (OSX only)
+command + [ and command + ]
     Set video window alpha.
 
 (The following keys are valid if you have a keyboard with multimedia keys.)
@@ -226,10 +216,7 @@ PREVIOUS and NEXT
 support.)
 
 h and k
-    Select previous/next tv-channel.
-
-H and K
-    Select previous/next dvb-channel.
+    Select previous/next channel.
 
 Mouse Control
 -------------
@@ -265,52 +252,50 @@ parser puts several options into a single string, and passes them to a
 component at once, instead of using multiple options on the level of the
 command line.
 
-The suboption parser can quote strings with ``"`` and ``[...]``.
+The suboption parser can quote strings with ``"``, ``'``, and ``[...]``.
 Additionally, there is a special form of quoting with ``%n%`` described below.
 
-For example, assume the hypothetical ``foo`` filter can take multiple options:
+For example, the ``opengl`` VO can take multiple options:
 
-    ``mpv test.mkv --vf=foo:option1=value1:option2:option3=value3,bar``
+    ``mpv test.mkv --vo=opengl:scale=lanczos:icc-profile=file.icc,xv``
 
-This passes ``option1`` and ``option3`` to the ``foo`` filter, with ``option2``
-as flag (implicitly ``option2=yes``), and adds a ``bar`` filter after that. If
-an option contains spaces or characters like ``,`` or ``:``, you need to quote
-them:
+This passes ``scale=lanczos`` and ``icc-profile=file.icc`` to ``opengl``,
+and also specifies ``xv`` as fallback VO. If the icc-profile path contains
+spaces or characters like ``,`` or ``:``, you need to quote them:
 
-    ``mpv '--vf=foo:option1="option value with spaces",bar'``
+    ``mpv '--vo=opengl:icc-profile="file with spaces.icc",xv'``
 
 Shells may actually strip some quotes from the string passed to the commandline,
-so the example quotes the string twice, ensuring that mpv receives the ``"``
+so the example quotes the string twice, ensuring that mpv recieves the ``"``
 quotes.
 
-The ``[...]`` form of quotes wraps everything between ``[`` and ``]``. It's
+The ``[...]`` from of quotes wraps everything between ``[`` and ``]``. It's
 useful with shells that don't interpret these characters in the middle of
-an argument (like bash). These quotes are balanced (since mpv 0.9.0): the ``[``
-and ``]`` nest, and the quote terminates on the last ``]`` that has no matching
-``[`` within the string. (For example, ``[a[b]c]`` results in ``a[b]c``.)
+an argument (like bash).
 
-The fixed-length quoting syntax is intended for use with external
-scripts and programs.
+A special kind of string-escaping intended for use with external scripts and
+programs is started with ``%``.
 
-It is started with ``%`` and has the following format::
+It has the following format::
 
     %n%string_of_length_n
 
 .. admonition:: Examples
 
-    ``mpv '--vf=foo:option1=%11%quoted text' test.avi``
+    ``mpv --ao=pcm:file=%10%C:test.wav test.avi``
 
     Or in a script:
 
-    ``mpv --vf=foo:option1=%`expr length "$NAME"`%"$NAME" test.avi``
+    ``mpv --ao=pcm:file=%`expr length "$NAME"`%"$NAME" test.avi``
 
 Suboptions passed to the client API are also subject to escaping. Using
 ``mpv_set_option_string()`` is exactly like passing ``--name=data`` to the
 command line (but without shell processing of the string). Some options
 support passing values in a more structured way instead of flat strings, and
 can avoid the suboption parsing mess. For example, ``--vf`` supports
-``MPV_FORMAT_NODE``, which lets you pass suboptions as a nested data structure
-of maps and arrays.
+``MPV_FORMAT_NODE``, which let's you pass suboptions as a nested data structure
+of maps and arrays. (``--vo`` supports this in the same way, although this
+fact is undocumented.)
 
 Paths
 -----
@@ -320,41 +305,19 @@ example, paths starting with ``-`` will be interpreted as options. Likewise,
 if a path contains the sequence ``://``, the string before that might be
 interpreted as protocol prefix, even though ``://`` can be part of a legal
 UNIX path. To avoid problems with arbitrary paths, you should be sure that
-absolute paths passed to mpv start with ``/``, and prefix relative paths with
-``./``.
-
-Using the ``file://`` pseudo-protocol is discouraged, because it involves
-strange URL unescaping rules.
+absolute paths passed to mpv start with ``/``, and relative paths with ``./``.
 
 The name ``-`` itself is interpreted as stdin, and will cause mpv to disable
 console controls. (Which makes it suitable for playing data piped to stdin.)
 
-The special argument ``--`` can be used to stop mpv from interpreting the
-following arguments as options.
-
-When using the client API, you should strictly avoid using ``mpv_command_string``
-for invoking the ``loadfile`` command, and instead prefer e.g. ``mpv_command``
-to avoid the need for filename escaping.
-
 For paths passed to suboptions, the situation is further complicated by the
 need to escape special characters. To work this around, the path can be
-additionally wrapped in the fixed-length syntax, e.g. ``%n%string_of_length_n``
-(see above).
+additionally wrapped in the ``%n%string_of_length_n`` syntax (see above).
 
 Some mpv options interpret paths starting with ``~``. Currently, the prefix
 ``~~/`` expands to the mpv configuration directory (usually ``~/.config/mpv/``).
 ``~/`` expands to the user's home directory. (The trailing ``/`` is always
-required.) There are the following paths as well:
-
-================ ===============================================================
-Name             Meaning
-================ ===============================================================
-``~~home/``      same as ``~~/``
-``~~global/``    the global config path, if available (not on win32)
-``~~osxbundle/`` the OSX bundle resource path (OSX only)
-``~~desktop/``   the path to the desktop (win32, OSX)
-================ ===============================================================
-
+required.)
 
 Per-File Options
 ----------------
@@ -396,45 +359,6 @@ file stops playing. If option ``--c`` is changed during playback of
 ``file2.mkv``, it is reset when advancing to ``file3.mkv``. This only affects
 file-local options. The option ``--a`` is never reset here.
 
-
-Playing DVDs
-------------
-
-DVDs can be played with the ``dvd://[title]`` syntax. The optional
-title specifier is a number which selects between separate video
-streams on the DVD. If no title is given (``dvd://``) then the longest
-title is selected automatically by the library. This is usually what
-you want. mpv does not support DVD menus.
-
-DVDs which have been copied on to a hard drive or other mounted
-filesystem (by e.g. the ``dvdbackup`` tool) are accommodated by
-specifying the path to the local copy: ``--dvd-device=PATH``.
-Alternatively, running ``mpv PATH`` should auto-detect a DVD directory
-tree and play the longest title.
-
-.. note::
-
-    mpv uses a different default DVD library than MPlayer. MPlayer
-    uses libdvdread by default, and mpv uses libdvdnav by default.
-    Both libraries are developed in parallel, but libdvdnav is
-    intended to support more sophisticated DVD features such as menus
-    and multi-angle playback. mpv uses libdvdnav for files specified
-    as either ``dvd://...`` or ``dvdnav://...``. To use libdvdread,
-    which will produce behavior more like MPlayer, specify
-    ``dvdread://...`` instead. Some users have experienced problems
-    when using libdvdnav, in which playback gets stuck in a DVD menu
-    stream. These problems are reported to go away when auto-selecting
-    the title (``dvd://`` rather than ``dvd://1``) or when using
-    libdvdread (e.g. ``dvdread://0``).
-
-    DVDs use image-based subtitles. Image subtitles are implemented as
-    a bitmap video stream which can be superimposed over the main
-    movie. mpv's subtitle styling and positioning options and keyboard
-    shortcuts generally do not work with image-based subtitles.
-    Exceptions include options like ``--stretch-dvd-subs`` and 
-    ``--stretch-image-subs-to-screen``.
-
-
 CONFIGURATION FILES
 ===================
 
@@ -444,12 +368,10 @@ Location and Syntax
 You can put all of the options in configuration files which will be read every
 time mpv is run. The system-wide configuration file 'mpv.conf' is in your
 configuration directory (e.g. ``/etc/mpv`` or ``/usr/local/etc/mpv``), the
-user-specific one is ``~/.config/mpv/mpv.conf``. For details and platform
-specifics (in particular Windows paths) see the `FILES`_ section.
-
+user-specific one is ``~/.config/mpv/mpv.conf``.
 User-specific options override system-wide options and options given on the
 command line override either. The syntax of the configuration files is
-``option=value``. Everything after a *#* is considered a comment. Options
+``option=<value>``; everything after a *#* is considered a comment. Options
 that work without values can be enabled by setting them to *yes* and disabled by
 setting them to *no*. Even suboptions can be specified in this way.
 
@@ -467,11 +389,11 @@ Escaping spaces and special characters
 
 This is done like with command line options. The shell is not involved here,
 but option values still need to be quoted as a whole if it contains certain
-characters like spaces. A config entry can be quoted with ``"``,
-as well as with the fixed-length syntax (``%n%``) mentioned before. This is like
-passing the exact contents of the quoted string as command line option. C-style
-escapes are currently _not_ interpreted on this level, although some options do
-this manually. (This is a mess and should probably be changed at some point.)
+characters like spaces. A config entry can be quoted with ``"`` and ``'``,
+as well as with the ``%n%`` syntax mentioned before. This is like passing
+the exact contents of the quoted string as command line option. C-style escapes
+are currently _not_ interpreted on this level, although some options to this
+manually. (This is a mess and should probably be changed at some point.)
 
 Putting Command Line Options into the Configuration File
 --------------------------------------------------------
@@ -514,41 +436,13 @@ description (shown by ``--profile=help``) can be defined with the
 ``profile-desc`` option. To end the profile, start another one or use the
 profile name ``default`` to continue with normal options.
 
-.. admonition:: Example mpv config file with profiles
+.. admonition:: Example mpv profile
 
     ::
 
-        # normal top-level option
-        fullscreen=yes
-
-        # a profile that can be enabled with --profile=big-cache
-        [big-cache]
-        cache=123400
-        demuxer-readahead-secs=20
-
-        [slow]
-        profile-desc="some profile name"
-        # reference a builtin profile
-        profile=opengl-hq
-
-        [fast]
-        vo=vdpau
-
-        # using a profile again extends it
-        [slow]
-        framedrop=no
-        # you can also include other profiles
-        profile=big-cache
-
-
-Auto profiles
--------------
-
-Some profiles are loaded automatically. The following example demonstrates this:
-
-.. admonition:: Auto profile loading
-
-    ::
+        [vo.vdpau]
+        # Use hardware decoding
+        hwdec=vdpau
 
         [protocol.dvd]
         profile-desc="profile for dvd:// streams"
@@ -558,28 +452,27 @@ Some profiles are loaded automatically. The following example demonstrates this:
         profile-desc="profile for .flv files"
         vf=flip
 
-The profile name follows the schema ``type.name``, where type can be
-``protocol`` for the input/output protocol in use (see ``--list-protocols``),
-and ``extension`` for the extension of the path of the currently played file
-(*not* the file format).
+        [ao.alsa]
+        device=spdif
 
-This feature is very limited, and there are no other auto profiles.
 
 TAKING SCREENSHOTS
 ==================
 
 Screenshots of the currently played file can be taken using the 'screenshot'
 input mode command, which is by default bound to the ``s`` key. Files named
-``mpv-shotNNNN.jpg`` will be saved in the working directory, using the first
-available number - no files will be overwritten. In pseudo-GUI mode, the
-screenshot will be saved somewhere else. See `PSEUDO GUI MODE`_.
+``shotNNNN.jpg`` will be saved in the working directory, using the first
+available number - no files will be overwritten.
 
 A screenshot will usually contain the unscaled video contents at the end of the
 video filter chain and subtitles. By default, ``S`` takes screenshots without
 subtitles, while ``s`` includes subtitles.
 
-Unlike with MPlayer, the ``screenshot`` video filter is not required. This
-filter was never required in mpv, and has been removed.
+The ``screenshot`` video filter is not required when using a recommended GUI
+video output driver. It should normally not be added to the config file, as
+taking screenshots is handled by the VOs, and adding the screenshot filter will
+break hardware decoding. (The filter may still be useful for taking screenshots
+at a certain point within the video chain when using multiple video filters.)
 
 TERMINAL STATUS LINE
 ====================
@@ -612,26 +505,19 @@ listed.
   if there is audio "missing", or not enough frames can be dropped. Usually
   this will indicate a problem. (``total-avsync-change`` property.)
 - Encoding state in ``{...}``, only shown in encoding mode.
-- Display sync state. If display sync is active (``display-sync-active``
-  property), this shows ``DS: 2.500/13``, where the first number is average
-  number of vsyncs per video frame (e.g. 2.5 when playing 24Hz videos on 60Hz
-  screens), which might jitter if the ratio doesn't round off, or there are
-  mistimed frames (``vsync-ratio``), and the second number of estimated number
-  of vsyncs which took too long (``vo-delayed-frame-count`` property). The
-  latter is a heuristic, as it's generally not possible to determine this with
-  certainty.
 - Dropped frames, e.g. ``Dropped: 4``. Shows up only if the count is not 0. Can
   grow if the video framerate is higher than that of the display, or if video
-  rendering is too slow. May also be incremented on "hiccups" and when the video
+  rendering is too slow. Also can be incremented on "hiccups" and when the video
   frame couldn't be displayed on time. (``vo-drop-frame-count`` property.)
   If the decoder drops frames, the number of decoder-dropped frames is appended
-  to the display as well, e.g.: ``Dropped: 4/34``. This happens only if
-  decoder frame dropping is enabled with the ``--framedrop`` options.
-  (``drop-frame-count`` property.)
+  to the display as well, e.g.: ``Dropped: 4/34``. This should almost never
+  happen, unless decoder-framedropping is enabled with one of the
+  ``--framedrop`` options, the stream contains errors, or a weird codec is in
+  use. (``drop-frame-count`` property.)
 - Cache state, e.g. ``Cache:  2s+134KB``. Visible if the stream cache is enabled.
   The first value shows the amount of video buffered in the demuxer in seconds,
   the second value shows *additional* data buffered in the stream cache in
-  kilobytes. (``demuxer-cache-duration`` and ``cache-used`` properties.)
+  kilobytes. (``demuxer-cache-duration`` and ``cached-used`` properties.)
 
 
 PROTOCOLS
@@ -653,13 +539,17 @@ PROTOCOLS
     Play a path from  Samba share.
 
 ``bd://[title][/device]`` ``--bluray-device=PATH``
-    Play a Blu-ray disc. Currently, this does not accept ISO files. Instead,
+    Play a Blu-Ray disc. Currently, this does not accept ISO files. Instead,
     you must mount the ISO file as filesystem, and point ``--bluray-device``
     to the mounted directory directly.
 
+``bdnav://[title][/device]``
+    Play a Blu-Ray disc, with navigation features enabled. This feature is
+    permanently experimental.
+
 ``dvd://[title|[starttitle]-endtitle][/device]`` ``--dvd-device=PATH``
-    Play a DVD. DVD menus are not supported. If no title is given, the longest
-    title is auto-selected.
+    Play a DVD. If you want dvdnav menus, use ``dvd://menu``. If no title
+    is given, the longest title is auto-selected.
 
     ``dvdnav://`` is an old alias for ``dvd://`` and does exactly the same
     thing.
@@ -681,7 +571,7 @@ PROTOCOLS
 ``mf://[filemask|@listfile]`` ``--mf-...``
     Play a series of images as video.
 
-``cdda://[device]`` ``--cdrom-device=PATH`` ``--cdda-...``
+``cdda://track[-endtrack][:speed][/device]`` ``--cdrom-device=PATH`` ``--cdda-...``
     Play CD.
 
 ``lavf://...``
@@ -704,66 +594,15 @@ PROTOCOLS
     ``PATH`` itself should start with a third ``/`` to make the path an
     absolute path.
 
-``fd://123``
-    Read data from the given file descriptor (for example 123). This is similar
-    to piping data to stdin via ``-``, but can use an arbitrary file descriptor.
-
 ``edl://[edl specification as in edl-mpv.rst]``
     Stitch together parts of multiple files and play them.
 
 ``null://``
-    Simulate an empty file. If opened for writing, it will discard all data.
-    The ``null`` demuxer will specifically pass autoprobing if this protocol
-    is used (while it's not automatically invoked for empty files).
+    Simulate an empty file.
 
 ``memory://data``
     Use the ``data`` part as source data.
 
-``hex://data``
-    Like ``memory://``, but the string is interpreted as hexdump.
-
-PSEUDO GUI MODE
-===============
-
-mpv has no official GUI, other than the OSC (`ON SCREEN CONTROLLER`_), which
-is not a full GUI and is not meant to be. However, to compensate for the lack
-of expected GUI behavior, mpv will in some cases start with some settings
-changed to behave slightly more like a GUI mode.
-
-Currently this happens only in the following cases:
-
-- if started using the ``mpv.desktop`` file on Linux (e.g. started from menus
-  or file associations provided by desktop environments)
-- if started from explorer.exe on Windows (technically, if it was started on
-  Windows, and all of the stdout/stderr/stdin handles are unset)
-- started out of the bundle on OSX
-- if you manually use ``--player-operation-mode=pseudo-gui`` on the command line
-
-This mode applies options from the builtin profile ``builtin-pseudo-gui``, but
-only if these haven't been set in the user's config file or on the command line.
-Also, for compatibility with the old pseudo-gui behavior, the options in the
-``pseudo-gui`` profile are applied unconditionally. In addition, the profile
-makes sure to enable the pseudo-GUI mode, so that ``--profile=pseudo-gui``
-works like in older mpv releases. The profiles are currently defined as follows:
-
-::
-
-    [builtin-pseudo-gui]
-    terminal=no
-    force-window=yes
-    idle=once
-    screenshot-directory=~~desktop/
-    [pseudo-gui]
-    player-operation-mode=pseudo-gui
-
-.. warning::
-
-    Currently, you can extend the ``pseudo-gui`` profile in the config file the
-    normal way. This is deprecated. In future mpv releases, the behavior might
-    change, and not apply your additional settings, and/or use a different
-    profile name.
-
-
 .. include:: options.rst
 
 .. include:: ao.rst
@@ -786,8 +625,6 @@ works like in older mpv releases. The profiles are currently defined as follows:
 
 .. include:: changes.rst
 
-.. include:: libmpv.rst
-
 ENVIRONMENT VARIABLES
 =====================
 
@@ -805,6 +642,9 @@ behavior of mpv.
     If set, XDG-style system configuration directories are used. Otherwise,
     the UNIX convention (``PREFIX/etc/mpv/``) is used.
 
+``TERM``
+    Used to determine terminal type.
+
 ``MPV_HOME``
     Directory where mpv looks for user settings. Overrides ``HOME``, and mpv
     will try to load the config file as ``$MPV_HOME/mpv.conf``.
@@ -815,7 +655,8 @@ behavior of mpv.
     of ``--v`` options passed to the command line.
 
 ``MPV_LEAK_REPORT``
-    If set to ``1``, enable internal talloc leak reporting.
+    If set to ``1``, enable internal talloc leak reporting. Note that this can
+    cause trouble with multithreading, so only developers should use this.
 
 ``LADSPA_PATH``
     Specifies the search path for LADSPA plugins. If it is unset, fully
@@ -855,7 +696,7 @@ libdvdcss:
 
         key
            is the default method. libdvdcss will use a set of calculated
-           player keys to try to get the disc key. This can fail if the drive
+           player keys to try and get the disc key. This can fail if the drive
            does not recognize any of the player keys.
 
         disc
@@ -908,8 +749,6 @@ If errors happen, the following exit codes can be returned:
         immediately after initialization.
     :3: There were some files that could be played, and some files which
         couldn't (using the definition of success from above).
-    :4: Quit due to a signal, Ctrl+c in a VO window (by default), or from the
-        default quit key bindings in encoding mode.
 
 Note that quitting the player manually will always lead to exit code 0,
 overriding the exit code that would be returned normally. Also, the ``quit``
@@ -918,15 +757,11 @@ input command can take an exit code: in this case, that exit code is returned.
 FILES
 =====
 
-For Windows-specifics, see `FILES ON WINDOWS`_ section.
-
 ``/usr/local/etc/mpv/mpv.conf``
-    mpv system-wide settings (depends on ``--prefix`` passed to configure - mpv
-    in default configuration will use ``/usr/local/etc/mpv/`` as config
-    directory, while most Linux distributions will set it to ``/etc/mpv/``).
+    mpv system-wide settings (depends on ``--prefix`` passed to configure)
 
 ``~/.config/mpv/mpv.conf``
-    mpv user settings (see `CONFIGURATION FILES`_ section)
+    mpv user settings
 
 ``~/.config/mpv/input.conf``
     key bindings (see `INPUT.CONF`_ section)
@@ -940,7 +775,7 @@ For Windows-specifics, see `FILES ON WINDOWS`_ section.
 ``~/.config/mpv/watch_later/``
     Contains temporary config files needed for resuming playback of files with
     the watch later feature. See for example the ``Q`` key binding, or the
-    ``quit-watch-later`` input command.
+    ``quit_watch_later`` input command.
 
     Each file is a small config file which is loaded if the corresponding media
     file is loaded. It contains the playback position and some (not necessarily
@@ -971,7 +806,7 @@ locations are different. They are generally located under ``%APPDATA%/mpv/``.
 For example, the path to mpv.conf is ``%APPDATA%/mpv/mpv.conf``, which maps to
 a system and user-specific path, for example
 
-    ``C:\users\USERNAME\AppData\Roaming\mpv\mpv.conf``
+    ``C:\users\USERNAME\Application Data\mpv\mpv.conf``
 
 You can find the exact path by running ``echo %APPDATA%\mpv\mpv.conf`` in cmd.exe.
 
@@ -981,23 +816,61 @@ Other config files (such as ``input.conf``) are in the same directory. See the
 The environment variable ``$MPV_HOME`` completely overrides these, like on
 UNIX.
 
-If a directory named ``portable_config`` next to the mpv.exe exists, all
-config will be loaded from this directory only. Watch later config files are
-written to this directory as well. (This exists on Windows only and is redundant
-with ``$MPV_HOME``. However, since Windows is very scripting unfriendly, a
-wrapper script just setting ``$MPV_HOME``, like you could do it on other
-systems, won't work. ``portable_config`` is provided for convenience to get
-around this restriction.)
-
 Config files located in the same directory as ``mpv.exe`` are loaded with
 lower priority. Some config files are loaded only once, which means that
 e.g. of 2 ``input.conf`` files located in two config directories, only the
 one from the directory with higher priority will be loaded.
 
-A third config directory with the lowest priority is the directory named ``mpv``
-in the same directory as ``mpv.exe``. This used to be the directory with the
+A third config directory with lowest priority is the directory named ``mpv``
+in the same directory as ``mpv.exe``. This used to be the directory with
 highest priority, but is now discouraged to use and might be removed in the
 future.
 
 Note that mpv likes to mix ``/`` and ``\`` path separators for simplicity.
 kernel32.dll accepts this, but cmd.exe does not.
+
+EXAMPLES OF MPV USAGE
+=====================
+
+Blu-ray playback:
+    - ``mpv bd:////path/to/disc``
+    - ``mpv bd:// --bluray-device=/path/to/disc``
+
+Play in Japanese with English subtitles:
+    ``mpv dvd://1 --alang=ja --slang=en``
+
+Play only chapters 5, 6, 7:
+    ``mpv dvd://1 --chapter=5-7``
+
+Play only titles 5, 6, 7:
+    ``mpv dvd://5-7``
+
+Play a multi-angle DVD:
+    ``mpv dvd://1 --dvd-angle=2``
+
+Play from a different DVD device:
+    ``mpv dvd://1 --dvd-device=/dev/dvd2``
+
+Play DVD video from a directory with VOB files:
+    ``mpv dvd://1 --dvd-device=/path/to/directory/``
+
+Stream from HTTP:
+    ``mpv http://example.com/example.avi``
+
+Stream using RTSP:
+    ``mpv rtsp://server.example.com/streamName``
+
+Play a libavfilter graph:
+    ``mpv avdevice://lavfi:mandelbrot``
+
+AUTHORS
+=======
+
+mpv is a MPlayer fork based on mplayer2, which in turn is a fork of MPlayer.
+
+MPlayer was initially written by Arpad Gereoffy. See the ``AUTHORS`` file for
+a list of some of the many other contributors.
+
+MPlayer is (C) 2000-2013 The MPlayer Team
+
+This man page was written mainly by Gabucino, Jonas Jermann and Diego Biurrun.

DOCS/man/osc.rst

@@ -5,7 +5,7 @@ The On Screen Controller (short: OSC) is a minimal GUI integrated with mpv to
 offer basic mouse-controllability. It is intended to make interaction easier
 for new users and to enable precise and direct seeking.
 
-The OSC is enabled by default if mpv was compiled with Lua support. It can be
+The OSC is enabled by default if mpv was compiled with lua support. It can be
 disabled entirely using the ``--osc=no`` option.
 
 Using the OSC
@@ -20,25 +20,22 @@ The Interface
 
 ::
 
-    +---------+----------+----------------------------+-------------+
-    | pl prev | pl next  |  title                     |       cache |
-    +------+--+---+------+---------+-----------+------+-------+-----+
-    | play | skip | skip | time    |  seekbar  | time | audio | sub |
-    |      | back | frwd | elapsed |           | left |       |     |
-    +------+------+------+---------+-----------+------+-------+-----+
+    +------------------+-----------+--------------------+
+    | playlist prev    |   title   |      playlist next |
+    +-------+------+---+--+------+-+----+------+--------+
+    | audio | skip | seek |      | seek | skip |  full  |
+    +-------+ back | back | play | frwd | frwd | screen |
+    | sub   |      |      |      |      |      |        |
+    +-------+------+------+------+------+------+--------+
+    |                     seekbar                       |
+    +----------------+--------------+-------------------+
+    | time passed    | cache status |    time remaining |
+    +----------------+--------------+-------------------+
 
 
-pl prev
+playlist prev
     =============   ================================================
     left-click      play previous file in playlist
-    right-click     show playlist
-    shift+L-click   show playlist
-    =============   ================================================
-
-pl next
-    =============   ================================================
-    left-click      play next file in playlist
-    right-click     show playlist
     shift+L-click   show playlist
     =============   ================================================
 
@@ -50,47 +47,10 @@ title
     right-click     show filename
     =============   ================================================
 
-cache
-    | Shows current cache fill status
-
-play
+playlist next
     =============   ================================================
-    left-click      toggle play/pause
-    =============   ================================================
-
-skip back
-    =============   ================================================
-    left-click      go to beginning of chapter / previous chapter
-    right-click     show chapters
-    shift+L-click   show chapters
-    =============   ================================================
-
-skip frwd
-    =============   ================================================
-    left-click      go to next chapter
-    right-click     show chapters
-    shift+L-click   show chapters
-    =============   ================================================
-
-time elapsed
-    | Shows current playback position timestamp
-
-    =============   ================================================
-    left-click      toggle displaying timecodes with milliseconds
-    =============   ================================================
-
-seekbar
-    | Indicates current playback position and position of chapters
-
-    =============   ================================================
-    left-click      seek to position
-    =============   ================================================
-
-time left
-    | Shows remaining playback time timestamp
-
-    =============   ================================================
-    left-click      toggle between total and remaining time
+    left-click      play next file in playlist
+    shift+L-click   show playlist
     =============   ================================================
 
 audio and sub
@@ -102,6 +62,66 @@ audio and sub
     shift+L-click   show available audio/sub tracks
     =============   ================================================
 
+skip back
+    =============   ================================================
+    left-click      go to beginning of chapter / previous chapter
+    shift+L-click   show chapters
+    =============   ================================================
+
+seek back
+    =============   ================================================
+    left-click      skip back  5 seconds
+    right-click     skip back 30 seconds
+    shift-L-click   skip back  1 frame
+    =============   ================================================
+
+play
+    =============   ================================================
+    left-click      toggle play/pause
+    =============   ================================================
+
+seek frwd
+    =============   ================================================
+    left-click      skip forward 10 seconds
+    right-click     skip forward 60 seconds
+    shift-L-click   skip forward  1 frame
+    =============   ================================================
+
+skip frwd
+    =============   ================================================
+    left-click      go to next chapter
+    shift+L-click   show chapters
+    =============   ================================================
+
+fullscreen
+    =============   ================================================
+    left-click      toggle fullscreen
+    =============   ================================================
+
+seekbar
+    | Indicates current playback position and position of chapters
+
+    =============   ================================================
+    left-click      seek to position
+    =============   ================================================
+
+time passed
+    | Shows current playback position timestamp
+
+    =============   ================================================
+    left-click      toggle displaying timecodes with milliseconds
+    =============   ================================================
+
+cache status
+    | Shows current cache fill status (only visible when below 45%)
+
+time remaining
+    | Shows remaining playback time timestamp
+
+    =============   ================================================
+    left-click      toggle between total and remaining time
+    =============   ================================================
+
 Key Bindings
 ~~~~~~~~~~~~
 
@@ -110,7 +130,7 @@ these keys. In case of collision, the function needs to be bound to a
 different key. See the `Script Commands`_ section.
 
 =============   ================================================
-del             Cycles visibility between never / auto (mouse-move) / always
+del             Hide the OSC permanently until mpv is restarted.
 =============   ================================================
 
 Configuration
@@ -149,40 +169,35 @@ Configurable Options
 
 ``showwindowed``
     | Default: yes
-    | Enable the OSC when windowed
+    | Show OSC when windowed?
 
 ``showfullscreen``
     | Default: yes
-    | Enable the OSC when fullscreen
+    | Show OSC when fullscreen?
 
 ``scalewindowed``
-    | Default: 1.5
-    | Scale factor of the OSC when windowed
+    | Default: 1
+    | Scaling of the controller when windowed
 
 ``scalefullscreen``
-    | Default: 1.5
-    | Scale factor of the OSC when fullscreen
+    | Default: 1
+    | Scaling of the controller when fullscreen
 
 ``scaleforcedwindow``
-    | Default: 2.0
-    | Scale factor of the OSC when rendered on a forced (dummy) window
+    | Default: 2
+    | Scaling of the controller when rendered on a forced (dummy) window
 
 ``vidscale``
     | Default: yes
-    | Scale the OSC with the video
-    | ``no`` tries to keep the OSC size constant as much as the window size allows
+    | Scale the controller with the video?
 
 ``valign``
     | Default: 0.8
     | Vertical alignment, -1 (top) to 1 (bottom)
 
 ``halign``
-    | Default: 0.0
-    | Horizontal alignment, -1 (left) to 1 (right)
-
-``barmargin``
     | Default: 0
-    | Margin from bottom (bottombar) or top (topbar), in pixels
+    | Horizontal alignment, -1 (left) to 1 (right)
 
 ``boxalpha``
     | Default: 80
@@ -190,72 +205,57 @@ Configurable Options
 
 ``hidetimeout``
     | Default: 500
-    | Duration in ms until the OSC hides if no mouse movement, must not be
-      negative
+    | Duration in ms until the OSC hides if no mouse movement, negative value
+      disables auto-hide
 
 ``fadeduration``
     | Default: 200
     | Duration of fade out in ms, 0 = no fade
 
 ``deadzonesize``
-    | Default: 1
+    | Default: 0
     | Size of the deadzone. The deadzone is an area that makes the mouse act
       like leaving the window. Movement there won't make the OSC show up and
       it will hide immediately if the mouse enters it. The deadzone starts
       at the window border opposite to the OSC and the size controls how much
-      of the window it will span. Values between 0 and 1, where 0 means the
-      OSC will always popup with mouse movement in the window, and 1 means the
-      OSC will only show up when the mouse hovers it.
+      of the window it will span. Values between 0 and 1.
 
 ``minmousemove``
-    | Default: 0
+    | Default: 3
     | Minimum amount of pixels the mouse has to move between ticks to make
       the OSC show up
 
 ``layout``
-    | Default: bottombar
+    | Default: box
     | The layout for the OSC. Currently available are: box, slimbox,
       bottombar and topbar.
 
 ``seekbarstyle``
-    | Default: bar
+    | Default: slider
     | Sets the style of the seekbar, slider (diamond marker) or bar (fill)
 
-``tooltipborder``
-    | Default: 1
-    | Size of the tooltip outline when using bottombar or topbar layouts
-
-``timetotal``
-    | Default: no
-    | Show total time instead of time remaining
-
-``timems``
-    | Default: no
-    | Display timecodes with milliseconds
-
-``visibility``
-    | Default: auto (auto hide/show on mouse move)
-    | Also supports ``never`` and ``always``
-
 Script Commands
 ~~~~~~~~~~~~~~~
 
 The OSC script listens to certain script commands. These commands can bound
 in ``input.conf``, or sent by other scripts.
 
+``enable-osc``
+    Undoes ``disable-osc`` or the effect of the ``del`` key.
+
+``disable-osc``
+    Hide the OSC permanently. This is also what the ``del`` key does.
+
 ``osc-message``
     Show a message on screen using the OSC. First argument is the message,
     second the duration in seconds.
 
-``osc-visibility``
-    Controls visibility mode ``never`` / ``auto`` (on mouse move) / ``always``
-    and also ``cycle`` to cycle between the modes
 
 Example
 
 You could put this into ``input.conf`` to hide the OSC with the ``a`` key and
-to set auto mode (the default) with ``b``::
+to unhide it with ``b``::
 
-    a script-message osc-visibility never
-    b script-message osc-visibility auto
+    a script_message disable-osc
+    b script_message enable-osc
 

DOCS/man/vf.rst

@@ -17,10 +17,6 @@ normal filter parameters.
 
     To get a full list of available video filters, see ``--vf=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.
-
 Video filters are managed in lists. There are a few commands to manage the
 filter list.
 
@@ -101,7 +97,7 @@ Available filters are:
 
     All parameters are optional.
 
-    ``<w>:<h>``
+    ``<w>,<h>``
         scaled width/height (default: original width/height)
 
         :0:      scaled d_width/d_height
@@ -151,15 +147,15 @@ Available filters are:
         :yes: Enable accurate rounding.
 
 ``dsize[=w:h:aspect-method:r:aspect]``
-    Changes the intended display aspect at an arbitrary point in the
+    Changes the intended display size/aspect at an arbitrary point in the
     filter chain. Aspect can be given as a fraction (4/3) or floating point
-    number (1.33). Note that this filter does *not* do any scaling itself; it
+    number (1.33). Alternatively, you may specify the exact display width and
+    height desired. Note that this filter does *not* do any scaling itself; it
     just affects what later scalers (software or hardware) will do when
-    auto-scaling to the correct aspect.
+    auto-scaling to correct aspect.
 
     ``<w>,<h>``
-        New aspect ratio given by a display width and height. Unlike older mpv
-        versions or MPlayer, this does not set the display size.
+        New display width and height.
 
         Can also be these special values:
 
@@ -202,7 +198,7 @@ Available filters are:
     ``<aspect>``
         Force an aspect ratio.
 
-``format=fmt=<value>:colormatrix=<value>:...``
+``format[=fmt[:outfmt]]``
     Restricts the color space for the next filter without doing any conversion.
     Use together with the scale filter for a real conversion.
 
@@ -211,141 +207,19 @@ Available filters are:
         For a list of available formats, see ``format=fmt=help``.
 
     ``<fmt>``
-        Format name, e.g. rgb15, bgr24, 420p, etc. (default: don't change).
+        Format name, e.g. rgb15, bgr24, 420p, etc. (default: yuyv).
     ``<outfmt>``
-        Format name that should be substituted for the output. If they do not
-        have the same bytes per pixel and chroma subsampling, it will fail.
-    ``<colormatrix>``
-        Controls the YUV to RGB color space conversion when playing video. There
-        are various standards. Normally, BT.601 should be used for SD video, and
-        BT.709 for HD video. (This is done by default.) Using incorrect color space
-        results in slightly under or over saturated and shifted colors.
+        Format name that should be substituted for the output. If this is not
+        100% compatible with the ``<fmt>`` value, it will crash.
 
-        These options are not always supported. Different video outputs provide
-        varying degrees of support. The ``opengl`` and ``vdpau`` video output
-        drivers usually offer full support. The ``xv`` output can set the color
-        space if the system video driver supports it, but not input and output
-        levels. The ``scale`` video filter can configure color space and input
-        levels, but only if the output format is RGB (if the video output driver
-        supports RGB output, you can force this with ``-vf scale,format=rgba``).
-
-        If this option is set to ``auto`` (which is the default), the video's
-        color space flag will be used. If that flag is unset, the color space
-        will be selected automatically. This is done using a simple heuristic that
-        attempts to distinguish SD and HD video. If the video is larger than
-        1279x576 pixels, BT.709 (HD) will be used; otherwise BT.601 (SD) is
-        selected.
-
-        Available color spaces are:
-
-        :auto:          automatic selection (default)
-        :bt.601:        ITU-R BT.601 (SD)
-        :bt.709:        ITU-R BT.709 (HD)
-        :bt.2020-ncl:   ITU-R BT.2020 non-constant luminance system
-        :bt.2020-cl:    ITU-R BT.2020 constant luminance system
-        :smpte-240m:    SMPTE-240M
-
-    ``<colorlevels>``
-        YUV color levels used with YUV to RGB conversion. This option is only
-        necessary when playing broken files which do not follow standard color
-        levels or which are flagged wrong. If the video does not specify its
-        color range, it is assumed to be limited range.
-
-        The same limitations as with ``<colormatrix>`` apply.
-
-        Available color ranges are:
-
-        :auto:      automatic selection (normally limited range) (default)
-        :limited:   limited range (16-235 for luma, 16-240 for chroma)
-        :full:      full range (0-255 for both luma and chroma)
-
-    ``<primaries>``
-        RGB primaries the source file was encoded with. Normally this should be set
-        in the file header, but when playing broken or mistagged files this can be
-        used to override the setting.
-
-        This option only affects video output drivers that perform color
-        management, for example ``opengl`` with the ``target-prim`` or
-        ``icc-profile`` suboptions set.
-
-        If this option is set to ``auto`` (which is the default), the video's
-        primaries flag will be used. If that flag is unset, the color space will
-        be selected automatically, using the following heuristics: If the
-        ``<colormatrix>`` is set or determined as BT.2020 or BT.709, the
-        corresponding primaries are used. Otherwise, if the video height is
-        exactly 576 (PAL), BT.601-625 is used. If it's exactly 480 or 486 (NTSC),
-        BT.601-525 is used. If the video resolution is anything else, BT.709 is
-        used.
-
-        Available primaries are:
-
-        :auto:         automatic selection (default)
-        :bt.601-525:   ITU-R BT.601 (SD) 525-line systems (NTSC, SMPTE-C)
-        :bt.601-625:   ITU-R BT.601 (SD) 625-line systems (PAL, SECAM)
-        :bt.709:       ITU-R BT.709 (HD) (same primaries as sRGB)
-        :bt.2020:      ITU-R BT.2020 (UHD)
-        :apple:        Apple RGB
-        :adobe:        Adobe RGB (1998)
-        :prophoto:     ProPhoto RGB (ROMM)
-        :cie1931:      CIE 1931 RGB
-        :dci-p3:       DCI-P3 (Digital Cinema)
-        :v-gamut:      Panasonic V-Gamut primaries
-
-    ``<gamma>``
-       Gamma function the source file was encoded with. Normally this should be set
-       in the file header, but when playing broken or mistagged files this can be
-       used to override the setting.
-
-       This option only affects video output drivers that perform color management.
-
-       If this option is set to ``auto`` (which is the default), the gamma will
-       be set to BT.1886 for YCbCr content, sRGB for RGB content and Linear for
-       XYZ content.
-
-       Available gamma functions are:
-
-       :auto:         automatic selection (default)
-       :bt.1886:      ITU-R BT.1886 (EOTF corresponding to BT.601/BT.709/BT.2020)
-       :srgb:         IEC 61966-2-4 (sRGB)
-       :linear:       Linear light
-       :gamma1.8:     Pure power curve (gamma 1.8)
-       :gamma2.2:     Pure power curve (gamma 2.2)
-       :gamma2.8:     Pure power curve (gamma 2.8)
-       :prophoto:     ProPhoto RGB (ROMM) curve
-       :st2084:       SMPTE ST2084 (HDR) curve
-       :std-b67:      ARIB STD-B67 (Hybrid Log-gamma) curve
-       :v-log:        Panasonic V-Log transfer curve
-
-    ``<peak>``
-        Reference peak illumination for the video file. This is mostly
-        interesting for HDR, but it can also be used tone map SDR content
-        to a darker or brighter exposure.
-
-        The default of 0.0 will default to the display's reference brightness
-        for SDR and the source's reference brightness for HDR.
-
-    ``<stereo-in>``
-        Set the stereo mode the video is assumed to be encoded in. Takes the
-        same values as the ``--video-stereo-mode`` option.
-
-    ``<stereo-out>``
-        Set the stereo mode the video should be displayed as. Takes the
-        same values as the ``--video-stereo-mode`` option.
-
-    ``<rotate>``
-        Set the rotation the video is assumed to be encoded with in degrees.
-        The special value ``-1`` uses the input format.
-
-    ``<dw>``, ``<dh>``
-        Set the display size. Note that setting the display size such that
-        the video is scaled in both directions instead of just changing the
-        aspect ratio is an implementation detail, and might change later.
-
-    ``<dar>``
-        Set the display aspect ratio of the video frame. This is a float,
-        but values such as ``[16:9]`` can be passed too (``[...]`` for quoting
-        to prevent the option parser from interpreting the ``:`` character).
+        .. admonition:: Examples
 
+            ====================== =====================
+            Valid                  Invalid (will crash)
+            ====================== =====================
+            ``format=rgb24:bgr24`` ``format=rgb24:420p``
+            ``format=yuyv:uyvy``
+            ====================== =====================
 
 ``noformat[=fmt]``
     Restricts the color space for the next filter without doing any conversion.
@@ -406,6 +280,41 @@ Available filters are:
             ``'--vf=lavfi=yadif:o="threads=2,thread_type=slice"'``
                 forces a specific threading configuration.
 
+``noise[=<strength>[:averaged][:pattern][:temporal][:uniform][:hq]``
+    Adds noise.
+
+    ``strength``
+        Set the noise for all components. If you want different strength
+        values for luma and chroma, use libavfilter's noise filter directly
+        (using ``--vf=lavfi=[noise=...]``), or tell the libavfilter developers
+        to stop being stupid.
+
+    ``averaged``
+        averaged temporal noise (smoother, but a lot slower)
+
+    ``pattern``
+        mix random noise with a (semi)regular pattern
+
+    ``temporal``
+        temporal noise (noise pattern changes between frames)
+
+    ``uniform``
+        uniform noise (Gaussian otherwise)
+
+``hqdn3d[=luma_spatial:chroma_spatial:luma_tmp:chroma_tmp]``
+    This filter aims to reduce image noise producing smooth images and making
+    still images really still (This should enhance compressibility.).
+
+    ``<luma_spatial>``
+        spatial luma strength (default: 4)
+    ``<chroma_spatial>``
+        spatial chroma strength (default: 3)
+    ``<luma_tmp>``
+        luma temporal strength (default: 6)
+    ``<chroma_tmp>``
+        chroma temporal strength (default:
+        ``luma_tmp*chroma_spatial/luma_spatial``)
+
 ``eq[=gamma:contrast:brightness:saturation:rg:gg:bg:weight]``
     Software equalizer that uses lookup tables (slow), allowing gamma correction
     in addition to simple brightness and contrast adjustment. The parameters are
@@ -432,6 +341,23 @@ Available filters are:
         and just plain white. A value of 0.0 turns the gamma correction all
         the way down while 1.0 leaves it at its full strength (default: 1.0).
 
+``unsharp[=lx:ly:la:cx:cy:ca]``
+    unsharp mask / Gaussian blur
+
+    ``l`` is for the luma component, ``c`` for the chroma component. ``x``/``y``
+    is the filter size. ``a`` is the amount.
+
+    ``lx``, ``ly``, ``cx``, ``cy``
+        width and height of the matrix, odd sized in both directions (min =
+        3:3, max = 13:11 or 11:13, usually something between 3:3 and 7:7)
+
+    ``la``, ``ca``
+        Relative amount of sharpness/blur to add to the image (a sane range
+        should be -1.5-1.5).
+
+        :<0: blur
+        :>0: sharpen
+
 ``pullup[=jl:jr:jt:jb:sb:mp]``
     Pulldown reversal (inverse telecine) filter, capable of handling mixed
     hard-telecine, 24000/1001 fps progressive, and 30000/1001 fps progressive
@@ -451,8 +377,9 @@ Available filters are:
         generating an occasional mismatched frame, but it may also cause an
         excessive number of frames to be dropped during high motion sequences.
         Conversely, setting it to -1 will make ``pullup`` match fields more
-        easily. This may help process video with slight blurring between the
-        fields, but may also cause interlaced frames in the output.
+        easily. This may help processing of video where there is slight
+        blurring between the fields, but may also cause there to be interlaced
+        frames in the output.
 
     ``mp`` (metric plane)
         This option may be set to ``u`` or ``v`` to use a chroma plane instead of the
@@ -462,32 +389,55 @@ Available filters are:
         video. The main purpose of setting ``mp`` to a chroma plane is to reduce
         CPU load and make pullup usable in realtime on slow machines.
 
-``yadif=[mode:interlaced-only]``
+``yadif=[mode[:enabled=yes|no]]``
     Yet another deinterlacing filter
 
     ``<mode>``
         :frame: Output 1 frame for each frame.
-        :field: Output 1 frame for each field (default).
+        :field: Output 1 frame for each field.
         :frame-nospatial: Like ``frame`` but skips spatial interlacing check.
         :field-nospatial: Like ``field`` but skips spatial interlacing check.
 
-    ``<interlaced-only>``
-        :no:  Deinterlace all frames.
-        :yes: Only deinterlace frames marked as interlaced (default).
+    ``<enabled>``
+        :yes: Filter is active (default).
+        :no:  Filter is not active, but can be activated with the ``D`` key
+              (or any other key that toggles the ``deinterlace`` property).
 
-    This filter is automatically inserted when using the ``d`` key (or any
+    This filter, is automatically inserted when using the ``D`` key (or any
     other key that toggles the ``deinterlace`` property or when using the
     ``--deinterlace`` switch), assuming the video output does not have native
     deinterlacing support.
 
     If you just want to set the default mode, put this filter and its options
-    into ``--vf-defaults`` instead, and enable deinterlacing with ``d`` or
+    into ``--vf-defaults`` instead, and enable deinterlacing with ``D`` or
     ``--deinterlace``.
 
-    Also, note that the ``d`` key is stupid enough to insert a deinterlacer twice
+    Also note that the ``D`` key is stupid enough to insert an interlacer twice
     when inserting yadif with ``--vf``, so using the above methods is
     recommended.
 
+``delogo[=x:y:w:h:t:show]``
+    Suppresses a TV station logo by a simple interpolation of the surrounding
+    pixels. Just set a rectangle covering the logo and watch it disappear (and
+    sometimes something even uglier appear - your mileage may vary).
+
+    ``<x>,<y>``
+        top left corner of the logo
+    ``<w>,<h>``
+        width and height of the cleared rectangle
+    ``<t>``
+        Thickness of the fuzzy edge of the rectangle (added to ``w`` and
+        ``h``). When set to -1, a green rectangle is drawn on the screen to
+        simplify finding the right ``x``,``y``,``w``,``h`` parameters.
+    ``show``
+        Draw a rectangle showing the area defined by x/y/w/h.
+
+``screenshot``
+    Optional filter for screenshot support. This is only needed if the video
+    output does not provide working direct screenshot support. Note that it is
+    not always safe to insert this filter by default. See `TAKING SCREENSHOTS`_
+    for details.
+
 ``sub=[=bottom-margin:top-margin]``
     Moves subtitle rendering to an arbitrary point in the filter chain, or force
     subtitle rendering in the video filter as opposed to using video output OSD
@@ -495,9 +445,9 @@ Available filters are:
 
     ``<bottom-margin>``
         Adds a black band at the bottom of the frame. The SSA/ASS renderer can
-        place subtitles there (with ``--sub-use-margins``).
+        place subtitles there (with ``--ass-use-margins``).
     ``<top-margin>``
-        Black band on the top for toptitles  (with ``--sub-use-margins``).
+        Black band on the top for toptitles  (with ``--ass-use-margins``).
 
     .. admonition:: Examples
 
@@ -596,8 +546,6 @@ Available filters are:
     Loads an external library to filter the image. The library interface
     is the ``vf_dlopen`` interface specified using ``libmpcodecs/vf_dlopen.h``.
 
-    .. warning:: This filter is deprecated.
-
     ``dll=<library>``
         Specify the library to load. This may require a full file system path
         in some cases. This argument is required.
@@ -656,11 +604,10 @@ Available filters are:
     ``buffered-frames``
         Maximum number of decoded video frames that should be buffered before
         the filter (default: 4). This specifies the maximum number of frames
-        the script can request in reverse direction.
-        E.g. if ``buffered-frames=5``, and the script just requested frame 15,
-        it can still request frame 10, but frame 9 is not available anymore.
-        If it requests frame 30, mpv will decode 15 more frames, and keep only
-        frames 25-30.
+        the script can requests backwards. E.g. if ``buffered-frames=5``, and
+        the script just requested frame 15, it can still request frame 10, but
+        frame 9 is not available anymore. If it requests frame 30, mpv will
+        decode 15 more frames, and keep only frames 25-30.
 
         The actual number of buffered frames also depends on the value of the
         ``concurrent-frames`` option. Currently, both option values are
@@ -708,7 +655,7 @@ Available filters are:
 ``vapoursynth-lazy``
     The same as ``vapoursynth``, but doesn't load Python scripts. Instead, a
     custom backend using Lua and the raw VapourSynth API is used. The syntax
-    is completely different, and absolutely no convenience features are
+    is completely different, and absolutely no conveniencve features are
     provided. There's no type checking either, and you can trigger crashes.
 
     .. admonition:: Example:
@@ -733,7 +680,7 @@ Available filters are:
 ``vavpp``
     VA-AP-API video post processing. Works with ``--vo=vaapi`` and ``--vo=opengl``
     only. Currently deinterlaces. This filter is automatically inserted if
-    deinterlacing is requested (either using the ``d`` key, by default mapped to
+    deinterlacing is requested (either using the ``D`` key, by default mapped to
     the command ``cycle deinterlace``, or the ``--deinterlace`` option).
 
     ``deint=<method>``
@@ -750,14 +697,10 @@ Available filters are:
             depends on the GPU hardware, the GPU drivers, driver bugs, and
             mpv bugs.
 
-    ``<interlaced-only>``
-        :no:  Deinterlace all frames.
-        :yes: Only deinterlace frames marked as interlaced (default).
-
 ``vdpaupp``
     VDPAU video post processing. Works with ``--vo=vdpau`` and ``--vo=opengl``
     only. This filter is automatically inserted if deinterlacing is requested
-    (either using the ``d`` key, by default mapped to the command
+    (either using the ``D`` key, by default mapped to the command
     ``cycle deinterlace``, or the ``--deinterlace`` option). When enabling
     deinterlacing, it is always preferred over software deinterlacer filters
     if the ``vdpau`` VO is used, and also if ``opengl`` is used and hardware
@@ -798,38 +741,14 @@ Available filters are:
     ``pullup``
         Try to apply inverse telecine, needs motion adaptive temporal
         deinterlacing.
-    ``interlaced-only=<yes|no>``
-        If ``yes`` (default), only deinterlace frames marked as interlaced.
     ``hqscaling=<0-9>``
         0
             Use default VDPAU scaling (default).
         1-9
             Apply high quality VDPAU scaling (needs capable hardware).
 
-``vdpaurb``
-    VDPAU video read back. Works with ``--vo=vdpau`` and ``--vo=opengl`` only.
-    This filter will read back frames decoded by VDPAU so that other filters,
-    which are not normally compatible with VDPAU, can be used like normal.
-    This filter must be specified before ``vdpaupp`` in the filter chain if
-    ``vdpaupp`` is used.
-
-``d3d11vpp``
-    Direct3D 11 video post processing. Currently requires D3D11 hardware
-    decoding for use.
-
-    ``deint=<yes|no>``
-        Whether deinterlacing is enabled (default: no).
-    ``interlaced-only=<yes|no>``
-        If ``yes`` (default), only deinterlace frames marked as interlaced.
-    ``mode=<blend|bob|adaptive|mocomp|ivctc|none>``
-        Tries to select a video processor with the given processing capability.
-        If a video processor supports multiple capabilities, it is not clear
-        which algorithm is actually selected. ``none`` always falls back. On
-        most if not all hardware, this option will probably do nothing, because
-        a video processor usually supports all modes or none.
-
 ``buffer=<num>``
     Buffer ``<num>`` frames in the filter chain. This filter is probably pretty
-    useless, except for debugging. (Note that this won't help to smooth out
+    useless, except for debugging. (Note that this won't help smoothing out
     latencies with decoding, because the filter will never output a frame if
     the buffer isn't full, except on EOF.)

DOCS/man/vo.rst

@@ -4,25 +4,29 @@ VIDEO OUTPUT DRIVERS
 Video output drivers are interfaces to different video output facilities. The
 syntax is:
 
-``--vo=<driver1,driver2,...[,]>``
+``--vo=<driver1[:suboption1[=value]:...],driver2,...[,]>``
     Specify a priority list of video output drivers to be used.
 
-If the list has a trailing ``,``, mpv will fall back on drivers not contained
-in the list.
+If the list has a trailing ',', mpv will fall back on drivers not contained
+in the list. Suboptions are optional and can mostly be omitted.
+
+You can also set defaults for each driver. The defaults are applied before the
+normal driver parameters.
 
 ``--vo-defaults=<driver1[:parameter1:parameter2:...],driver2,...>``
     Set defaults for each driver.
 
-    Deprecated. No replacement.
-
 .. note::
 
     See ``--vo=help`` for a list of compiled-in video output drivers.
 
-    The recommended output driver is ``--vo=opengl``, which is the default. All
-    other drivers are for compatibility or special purposes. If the default
-    does not work, it will fallback to other drivers (in the same order as
-    listed by ``--vo=help``).
+    The recommended output drivers are ``--vo=vdpau`` and ``--vo=opengl-hq``.
+    All other drivers are just for compatibility or special purposes.
+
+.. admonition:: Example
+
+    ``--vo=opengl,xv,``
+        Try the ``opengl`` driver, then the ``xv`` driver, then others.
 
 Available video output drivers are:
 
@@ -33,13 +37,11 @@ Available video output drivers are:
 
     .. note:: This driver is for compatibility with old systems.
 
-    The following global options are supported by this video output:
-
-    ``--xv-adaptor=<number>``
+    ``adaptor=<number>``
         Select a specific XVideo adapter (check xvinfo results).
-    ``--xv-port=<number>``
+    ``port=<number>``
         Select a specific XVideo port.
-    ``--xv-ck=<cur|use|set>``
+    ``ck=<cur|use|set>``
         Select the source from which the color key is taken (default: cur).
 
         cur
@@ -50,11 +52,9 @@ Available video output drivers are:
         set
           Same as use but also sets the supplied color key.
 
-    ``--xv-ck-method=<none|man|bg|auto>``
+    ``ck-method=<man|bg|auto>``
         Sets the color key drawing method (default: man).
 
-        none
-          Disables color-keying.
         man
           Draw the color key manually (reduces flicker in some cases).
         bg
@@ -62,15 +62,12 @@ Available video output drivers are:
         auto
           Let Xv draw the color key.
 
-    ``--xv-colorkey=<number>``
+    ``colorkey=<number>``
         Changes the color key to an RGB value of your choice. ``0x000000`` is
         black and ``0xffffff`` is white.
 
-    ``--xv-buffers=<number>``
-        Number of image buffers to use for the internal ringbuffer (default: 2).
-        Increasing this will use more memory, but might help with the X server
-        not responding quickly enough if video FPS is close to or higher than
-        the display refresh rate.
+    ``no-colorkey``
+        Disables color-keying.
 
 ``x11`` (X11 only)
     Shared memory video output driver without hardware acceleration that works
@@ -89,25 +86,23 @@ Available video output drivers are:
         ``chroma-deint``, ``pullup``, ``hqscaling``. These sub-options are
         deprecated, and you should use the ``vdpaupp`` video filter instead.
 
-    The following global options are supported by this video output:
-
-    ``--vo-vdpau-sharpen=<-1-1>``
+    ``sharpen=<-1-1>``
         (Deprecated. See note about ``vdpaupp``.)
 
         For positive values, apply a sharpening algorithm to the video, for
         negative values a blurring algorithm (default: 0).
-    ``--vo-vdpau-denoise=<0-1>``
+    ``denoise=<0-1>``
         (Deprecated. See note about ``vdpaupp``.)
 
         Apply a noise reduction algorithm to the video (default: 0; no noise
         reduction).
-    ``--vo-vdpau-deint=<-4-4>``
+    ``deint=<-4-4>``
         (Deprecated. See note about ``vdpaupp``.)
 
         Select deinterlacing mode (default: 0). In older versions (as well as
         MPlayer/mplayer2) you could use this option to enable deinterlacing.
         This doesn't work anymore, and deinterlacing is enabled with either
-        the ``d`` key (by default mapped to the command ``cycle deinterlace``),
+        the ``D`` key (by default mapped to the command ``cycle deinterlace``),
         or the ``--deinterlace`` option. Also, to select the default deint mode,
         you should use something like ``--vf-defaults=vdpaupp:deint-mode=temporal``
         instead of this sub-option.
@@ -124,32 +119,32 @@ Available video output drivers are:
         4
             Motion-adaptive temporal deinterlacing with edge-guided spatial
             interpolation. Needs fast video hardware.
-    ``--vo-vdpau-chroma-deint``
+    ``chroma-deint``
         (Deprecated. See note about ``vdpaupp``.)
 
         Makes temporal deinterlacers operate both on luma and chroma (default).
         Use no-chroma-deint to solely use luma and speed up advanced
         deinterlacing. Useful with slow video memory.
-    ``--vo-vdpau-pullup``
+    ``pullup``
         (Deprecated. See note about ``vdpaupp``.)
 
         Try to apply inverse telecine, needs motion adaptive temporal
         deinterlacing.
-    ``--vo-vdpau-hqscaling=<0-9>``
+    ``hqscaling=<0-9>``
         (Deprecated. See note about ``vdpaupp``.)
 
         0
             Use default VDPAU scaling (default).
         1-9
             Apply high quality VDPAU scaling (needs capable hardware).
-    ``--vo-vdpau-fps=<number>``
+    ``fps=<number>``
         Override autodetected display refresh rate value (the value is needed
         for framedrop to allow video playback rates higher than display
         refresh rate, and for vsync-aware frame timing adjustments). Default 0
         means use autodetected value. A positive value is interpreted as a
         refresh rate in Hz and overrides the autodetected value. A negative
         value disables all timing adjustment and framedrop logic.
-    ``--vo-vdpau-composite-detect``
+    ``composite-detect``
         NVIDIA's current VDPAU implementation behaves somewhat differently
         under a compositing window manager and does not give accurate frame
         timing information. With this option enabled, the player tries to
@@ -160,20 +155,20 @@ Available video output drivers are:
         with the composited mode behavior of the NVIDIA driver, there is no
         hard playback speed limit even without the disabled logic. Enabled by
         default, use ``no-composite-detect`` to disable.
-    ``--vo-vdpau-queuetime-windowed=<number>`` and ``queuetime-fs=<number>``
+    ``queuetime_windowed=<number>`` and ``queuetime_fs=<number>``
         Use VDPAU's presentation queue functionality to queue future video
         frame changes at most this many milliseconds in advance (default: 50).
         See below for additional information.
-    ``--vo-vdpau-output-surfaces=<2-15>``
+    ``output_surfaces=<2-15>``
         Allocate this many output surfaces to display video frames (default:
         3). See below for additional information.
-    ``--vo-vdpau-colorkey=<#RRGGBB|#AARRGGBB>``
+    ``colorkey=<#RRGGBB|#AARRGGBB>``
         Set the VDPAU presentation queue background color, which in practice
         is the colorkey used if VDPAU operates in overlay mode (default:
         ``#020507``, some shade of black). If the alpha component of this value
         is 0, the default VDPAU colorkey will be used instead (which is usually
         green).
-    ``--vo-vdpau-force-yuv``
+    ``force-yuv``
         Never accept RGBA input. This means mpv will insert a filter to convert
         to a YUV format before the VO. Sometimes useful to force availability
         of certain YUV-only features, like video equalizer or deinterlacing.
@@ -200,40 +195,31 @@ Available video output drivers are:
     driver implementation may also have limits on the length of maximum
     queuing time or number of queued surfaces that work well or at all.
 
-``direct3d`` (Windows only)
+``direct3d_shaders`` (Windows only)
     Video output driver that uses the Direct3D interface.
 
     .. note:: This driver is for compatibility with systems that don't provide
-              proper OpenGL drivers, and where ANGLE does not perform well.
+              proper OpenGL drivers.
 
-    .. note:: Before to 0.21.0, ``direct3d_shaders`` and ``direct3d`` were
-              different, with ``direct3d`` not using shader by default. Now
-              both use shaders by default, and ``direct3d_shaders`` is a
-              deprecated alias. Use the ``--vo-direct3d-prefer-stretchrect``
-              or the ``--vo-direct3d-disable-shaders`` options to get the old
-              behavior of ``direct3d``.
-
-    The following global options are supported by this video output:
-
-    ``--vo-direct3d-prefer-stretchrect``
+    ``prefer-stretchrect``
         Use ``IDirect3DDevice9::StretchRect`` over other methods if possible.
 
-    ``--vo-direct3d-disable-stretchrect``
+    ``disable-stretchrect``
         Never render the video using ``IDirect3DDevice9::StretchRect``.
 
-    ``--vo-direct3d-disable-textures``
+    ``disable-textures``
         Never render the video using D3D texture rendering. Rendering with
         textures + shader will still be allowed. Add ``disable-shaders`` to
         completely disable video rendering with textures.
 
-    ``--vo-direct3d-disable-shaders``
+    ``disable-shaders``
         Never use shaders when rendering video.
 
-    ``--vo-direct3d-only-8bit``
+    ``only-8bit``
         Never render YUV video with more than 8 bits per component.
         Using this flag will force software conversion to 8-bit.
 
-    ``--vo-direct3d-disable-texture-align``
+    ``disable-texture-align``
         Normally texture sizes are always aligned to 16. With this option
         enabled, the video texture will always have exactly the same size as
         the video itself.
@@ -243,11 +229,11 @@ Available video output drivers are:
     might crash, might cause slow downs, etc. Contact the developers if you
     actually need any of these for performance or proper operation.
 
-    ``--vo-direct3d-force-power-of-2``
+    ``force-power-of-2``
         Always force textures to power of 2, even if the device reports
         non-power-of-2 texture sizes as supported.
 
-    ``--vo-direct3d-texture-memory=<mode>``
+    ``texture-memory=<mode>``
         Only affects operation with shaders/texturing enabled, and (E)OSD.
         Possible values:
 
@@ -271,24 +257,26 @@ Available video output drivers are:
             Use ``D3DPOOL_SCRATCH``, with a ``D3DPOOL_SYSTEMMEM`` texture for
             locking.
 
-    ``--vo-direct3d-swap-discard``
+    ``swap-discard``
         Use ``D3DSWAPEFFECT_DISCARD``, which might be faster.
         Might be slower too, as it must(?) clear every frame.
 
-    ``--vo-direct3d-exact-backbuffer``
+    ``exact-backbuffer``
         Always resize the backbuffer to window size.
 
+``direct3d`` (Windows only)
+    Same as ``direct3d_shaders``, but with the options ``disable-textures``
+    and ``disable-shaders`` forced.
+
+    .. note:: This driver is for compatibility with old systems.
+
 ``opengl``
     OpenGL video output driver. It supports extended scaling methods, dithering
     and color management.
 
-    See `OpenGL renderer options`_ for options specific to this VO.
-
-    By default, it tries to use fast and fail-safe settings. Use the
-    ``opengl-hq`` profile to use this driver with defaults set to high
-    quality rendering. (This profile is also the replacement for
-    ``--vo=opengl-hq``.) The profile can be applied with ``--profile=opengl-hq``
-    and its contents can be viewed with ``--show-profile=opengl-hq``.
+    By default, it tries to use fast and fail-safe settings. Use the alias
+    ``opengl-hq`` to use this driver with defaults set to high quality
+    rendering.
 
     Requires at least OpenGL 2.1.
 
@@ -302,13 +290,363 @@ Available video output drivers are:
     color space conversion and chroma upsampling is generally in the hand of
     the hardware decoder APIs.
 
-    ``opengl`` makes use of FBOs by default. Sometimes you can achieve better
-    quality or performance by changing the ``--opengl-fbo-format`` option to
-    ``rgb16f``, ``rgb32f`` or ``rgb``. Known problems include Mesa/Intel not
-    accepting ``rgb16``, Mesa sometimes not being compiled with float texture
-    support, and some OS X setups being very slow with ``rgb16`` but fast
-    with ``rgb32f``. If you have problems, you can also try enabling the
-    ``--opengl-dumb-mode=yes`` option.
+    ``scale=<filter>``
+
+        ``bilinear``
+            Bilinear hardware texture filtering (fastest, very low quality).
+            This is the default for compatibility reasons.
+
+        ``spline36``
+            Mid quality and speed. This is the default when using ``opengl-hq``.
+
+        ``lanczos``
+            Lanczos scaling. Provides mid quality and speed. Generally worse
+            than ``spline36``, but it results in a slightly sharper image
+            which is good for some content types. The number of taps can be
+            controlled with ``scale-radius``, but is best left unchanged.
+
+            This filter corresponds to the old ``lanczos3`` alias if the default
+            radius is used, while ``lanczos2`` corresponds to a radius of 2.
+
+        ``ewa_lanczos``
+            Elliptic weighted average Lanczos scaling. Also known as Jinc.
+            Relatively slow, but very good quality. The number of taps can
+            be controlled with ``scale-radius``. Adding extra taps makes the
+            filter sharper but adds more ringing.
+
+            This filter supports antiringing (see ``scale-antiring``).
+
+        ``mitchell``
+            Mitchell-Netravali. The ``b`` and ``c`` parameters can be set with
+            ``scale-param1`` and ``scale-param2``. Both are set to 1/3 by default.
+            This filter is very good at downscaling (see ``scale-down``).
+
+        There are some more filters, but most are not as useful. For a complete
+        list, pass ``help`` as value, e.g.::
+
+            mpv --vo=opengl:scale=help
+
+    ``scale-param1=<value>``
+        Set filter parameters. Ignored if the filter is not tunable. These are
+        unset by default, and use the filter specific default if applicable.
+
+    ``scale-param2=<value>``
+        See ``scale-param1``.
+
+    ``scale-radius=<r>``
+        Set radius for filters listed below, must be a float number between 1.0
+        and 16.0. Defaults to be 3.0 if not specified.
+
+            ``sinc``, ``lanczos``, ``ewa_lanczos``, ``blackman``, ``gaussian``
+
+        Note that depending on filter implementation details and video scaling
+        ratio, the radius that actually being used might be different
+        (most likely being increased a bit).
+
+    ``scale-antiring=<value>``
+        Set the antiringing strength. This tries to eliminate ringing, but can
+        introduce other artifacts in the process. Must be a float number
+        between 0.0 and 1.0. The default value of 0.0 disables antiringing
+        entirely.
+
+        Note that this currently only affects ``ewa_lanczos``.
+
+    ``scaler-resizes-only``
+        Disable the scaler if the video image is not resized. In that case,
+        ``bilinear`` is used instead whatever is set with ``scale``. Bilinear
+        will reproduce the source image perfectly if no scaling is performed.
+        Note that this option never affects ``cscale``.
+
+    ``srgb``
+        Convert and color correct the output to sRGB before displaying it on
+        the screen. This option enables ``linear-scaling``.
+
+        This option is equivalent to using ``icc-profile`` with an sRGB ICC
+        profile, but it is implemented without a 3DLUT and does not require
+        LittleCMS 2. If both ``srgb`` and ``icc-profile`` are present, the
+        latter takes precedence, as they are somewhat redundant.
+
+        Note: When playing back BT.2020 content with this option enabled, out
+        of gamut colors will be numerically clipped, which can potentially
+        change the hue and/or luminance. If this is not desired, it is
+        recommended to use ``icc-profile`` with an sRGB ICC profile instead,
+        when playing back wide-gamut BT.2020 content.
+
+    ``pbo``
+        Enable use of PBOs. This is slightly faster, but can sometimes lead to
+        sporadic and temporary image corruption (in theory, because reupload
+        is not retried when it fails), and perhaps actually triggers slower
+        paths with drivers that don't support PBOs properly.
+
+    ``dither-depth=<N|no|auto>``
+        Set dither target depth to N. Default: no.
+
+        no
+            Disable any dithering done by mpv.
+        auto
+            Automatic selection. If output bit depth cannot be detected,
+            8 bits per component are assumed.
+        8
+            Dither to 8 bit output.
+
+        Note that the depth of the connected video display device can not be
+        detected. Often, LCD panels will do dithering on their own, which
+        conflicts with ``opengl``'s dithering and leads to ugly output.
+
+    ``dither-size-fruit=<2-8>``
+        Set the size of the dither matrix (default: 6). The actual size of
+        the matrix is ``(2^N) x (2^N)`` for an option value of ``N``, so a
+        value of 6 gives a size of 64x64. The matrix is generated at startup
+        time, and a large matrix can take rather long to compute (seconds).
+
+        Used in ``dither=fruit`` mode only.
+
+    ``dither=<fruit|ordered|no>``
+        Select dithering algorithm (default: fruit). (Normally, the
+        ``dither-depth`` option controls whether dithering is enabled.)
+
+    ``temporal-dither``
+        Enable temporal dithering. (Only active if dithering is enabled in
+        general.) This changes between 8 different dithering pattern on each
+        frame by changing the orientation of the tiled dithering matrix.
+        Unfortunately, this can lead to flicker on LCD displays, since these
+        have a high reaction time.
+
+    ``debug``
+        Check for OpenGL errors, i.e. call ``glGetError()``. Also request a
+        debug OpenGL context (which does nothing with current graphics drivers
+        as of this writing).
+
+    ``swapinterval=<n>``
+        Interval in displayed frames between two buffer swaps.
+        1 is equivalent to enable VSYNC, 0 to disable VSYNC.
+
+    ``cscale=<filter>``
+        As ``scale``, but for interpolating chroma information. If the image
+        is not subsampled, this option is ignored entirely. Note that the
+        implementation is currently always done as a single pass, so using
+        it with separable filters will result in slow performance for very
+        little visible benefit.
+
+    ``scale-down=<filter>``
+        Like ``scale``, but apply these filters on downscaling instead. If this
+        option is unset, the filter implied by ``scale`` will be applied.
+
+    ``cscale-param1``, ``cscale-param2``, ``cscale-radius``, ``cscale-antiring``
+        Set filter parameters and radius for ``cscale``.
+
+        See ``scale-param1``, ``scale-param2``, ``scale-radius`` and
+        ``scale-antiring``.
+
+    ``linear-scaling``
+        Scale in linear light. This is automatically enabled if ``srgb``,
+        ``icc-profile`` or ``sigmoid-upscaling`` is set. It should only
+        be used with a ``fbo-format`` that has at least 16 bit precision.
+
+    ``fancy-downscaling``
+        When using convolution based filters, extend the filter size
+        when downscaling. Trades quality for reduced downscaling performance.
+
+        This is automatically disabled for anamorphic video, because this
+        feature doesn't work correctly with different scale factors in
+        different directions.
+
+    ``sigmoid-upscaling``
+        When upscaling, use a sigmoidal color transform to avoid emphasizing
+        ringing artifacts. This also enables ``linear-scaling``.
+
+    ``sigmoid-center``
+        The center of the sigmoid curve used for ``sigmoid-upscaling``, must
+        be a float between 0.0 and 1.0. Defaults to 0.75 if not specified.
+
+    ``sigmoid-slope``
+        The slope of the sigmoid curve used for ``sigmoid-upscaling``, must
+        be a float between 1.0 and 20.0. Defaults to 6.5 if not specified.
+
+    ``no-npot``
+        Force use of power-of-2 texture sizes. For debugging only.
+        Borders will be distorted due to filtering.
+
+    ``glfinish``
+        Call ``glFinish()`` before and after swapping buffers (default: disabled).
+        Slower, but might help getting better results when doing framedropping.
+        Can completely ruin performance. The details depend entirely on the
+        OpenGL driver.
+
+    ``waitvsync``
+        Call ``glXWaitVideoSyncSGI`` after each buffer swap (default: disabled).
+        This may or may not help with video timing accuracy and frame drop. It's
+        possible that this makes video output slower, or has no effect at all.
+
+        X11/GLX only.
+
+    ``sw``
+        Continue even if a software renderer is detected.
+
+    ``backend=<sys>``
+        The value ``auto`` (the default) selects the windowing backend. You
+        can also pass ``help`` to get a complete list of compiled in backends
+        (sorted by autoprobe order).
+
+        auto
+            auto-select (default)
+        cocoa
+            Cocoa/OS X
+        win
+            Win32/WGL
+        x11, x11es
+            X11/GLX (the ``es`` variant forces GLES)
+        wayland
+            Wayland/EGL
+        x11egl, x11egles
+            X11/EGL (the ``es`` variant forces GLES)
+
+    ``fbo-format=<fmt>``
+        Selects the internal format of textures used for FBOs. The format can
+        influence performance and quality of the video output. (FBOs are not
+        always used, and typically only when using extended scalers.)
+        ``fmt`` can be one of: rgb, rgba, rgb8, rgb10, rgb10_a2, rgb16, rgb16f,
+        rgb32f, rgba12, rgba16, rgba16f, rgba32f.
+        Default: rgba.
+
+    ``gamma=<0.1..2.0>``
+        Set a gamma value (default: 1.0). If gamma is adjusted in other ways
+        (like with the ``--gamma`` option or key bindings and the ``gamma``
+        property), the value is multiplied with the other gamma value.
+
+        Recommended values based on the environmental brightness:
+
+        1.0
+            Brightly illuminated (default)
+        0.9
+            Slightly dim
+        0.8
+            Pitch black room
+
+    ``icc-profile=<file>``
+        Load an ICC profile and use it to transform linear RGB to screen output.
+        Needs LittleCMS 2 support compiled in. This option overrides the ``srgb``
+        property, as using both is somewhat redundant. It also enables
+        ``linear-scaling``.
+
+
+    ``icc-profile-auto``
+        Automatically select the ICC display profile currently specified by
+        the display settings of the operating system.
+
+        NOTE: Only implemented on OS X and X11
+
+    ``icc-cache=<file>``
+        Store and load the 3D LUT created from the ICC profile in this file.
+        This can be used to speed up loading, since LittleCMS 2 can take a while
+        to create the 3D LUT. Note that this file contains an uncompressed LUT.
+        Its size depends on the ``3dlut-size``, and can be very big.
+
+    ``icc-intent=<value>``
+        Specifies the ICC Intent used for transformations between color spaces.
+        This affects the rendering when using ``icc-profile`` or ``srgb`` and
+        also affects the way DCP XYZ content gets converted to RGB.
+
+        0
+            perceptual
+        1
+            relative colorimetric (default)
+        2
+            saturation
+        3
+            absolute colorimetric
+
+    ``3dlut-size=<r>x<g>x<b>``
+        Size of the 3D LUT generated from the ICC profile in each dimension.
+        Default is 128x256x64.
+        Sizes must be a power of two, and 512 at most.
+
+    ``alpha=<blend|yes|no>``
+        Decides what to do if the input has an alpha component (default: blend).
+
+        blend
+            Blend the frame against a black background.
+        yes
+            Try to create a framebuffer with alpha component. This only makes sense
+            if the video contains alpha information (which is extremely rare). May
+            not be supported on all platforms. If alpha framebuffers are
+            unavailable, it silently falls back on a normal framebuffer. Note
+            that if you set the ``fbo-format`` option to a non-default value,
+            a format with alpha must be specified, or this won't work.
+        no
+            Ignore alpha component.
+
+    ``chroma-location=<auto|center|left>``
+        Set the YUV chroma sample location. auto means use the bitstream
+        flags (default: auto).
+
+    ``rectangle-textures``
+        Force use of rectangle textures (default: no). Normally this shouldn't
+        have any advantages over normal textures. Note that hardware decoding
+        overrides this flag.
+
+    ``background=<color>``
+        Color used to draw parts of the mpv window not covered by video.
+        See ``--osd-color`` option how colors are defined.
+
+    ``smoothmotion``
+        Reduce stuttering caused by mismatches in video fps and display
+        refresh rate (also known as judder).
+
+        Instead of drawing source frames for variable durations, smoothmotion
+        will blend frames that overlap the transition between two frames in
+        the source material.
+
+        For example, a 24 Hz clip played back on a 60 Hz display would normally
+        result in a pattern like this::
+
+            A A A B B C C C D D E E E F F
+
+        which has different lengths, alternating between 3 and 2. This
+        difference in frame duration is what causes judder.
+
+        With smoothmotion enabled, the pattern changes to::
+
+            A A A+B B B C C C+D D D E E E+F F F
+
+        where A+B is a blend of A and B. In this pattern, each frame gets a
+        (consistent) duration of roughly 2.5 - resulting in smooth motion.
+
+        GPU drivers or compositing window managers overriding vsync behavior
+        can lead to bad results. If the framerate is close to or over the
+        display refresh rate, results can be bad as well.
+
+        .. note:: On systems other than Linux or OS X, you currently must set
+                  the ``--display-fps`` option, or the results will be bad.
+
+    ``smoothmotion-threshold=<0.0-0.5>``
+        Mix threshold at which interpolation is skipped (default: 0.0 – never
+        skip).
+
+        For example, with a ``smoothmotion-threshold`` of 0.1, if the
+        smoothmotion algorithm would try to blend two frames by a ratio of
+        95% A + 5% B, it would simply display A instead. (Since the
+        distance, 0.05, is lower than the threshold)
+
+        Setting this to 0.5 would be similar to disabling smoothmotion
+        completely, since it would always just display the nearest frame.
+
+``opengl-hq``
+    Same as ``opengl``, but with default settings for high quality rendering.
+
+    This is equivalent to::
+
+        --vo=opengl:scale=spline36:scale-down=mitchell:dither-depth=auto:fbo-format=rgba16:fancy-downscaling:sigmoid-upscaling
+
+    Note that some cheaper LCDs do dithering that gravely interferes with
+    ``opengl``'s dithering. Disabling dithering with ``dither-depth=no`` helps.
+
+    Unlike ``opengl``, ``opengl-hq`` makes use of FBOs by default. Sometimes you
+    can achieve better quality or performance by changing the ``fbo-format``
+    suboption to ``rgb16f``, ``rgb32f`` or ``rgb``. Known problems include
+    Mesa/Intel not accepting ``rgb16``, Mesa sometimes not being compiled with
+    float texture support, and some OS X setups being very slow with ``rgb16``
+    but fast with ``rgb32f``.
 
 ``sdl``
     SDL 2.0+ Render video output driver, depending on system with or without
@@ -318,12 +656,10 @@ Available video output drivers are:
     .. note:: This driver is for compatibility with systems that don't provide
               proper graphics drivers, or which support GLES only.
 
-    The following global options are supported by this video output:
-
-    ``--sdl-sw``
+    ``sw``
         Continue even if a software renderer is detected.
 
-    ``--sdl-switch-mode``
+    ``switch-mode``
         Instruct SDL to switch the monitor video mode when going fullscreen.
 
 ``vaapi``
@@ -335,9 +671,7 @@ Available video output drivers are:
     .. note:: This driver is for compatibility with crappy systems. You can
               use vaapi hardware decoding with ``--vo=opengl`` too.
 
-    The following global options are supported by this video output:
-
-    ``--vo-vaapi-scaling=<algorithm>``
+    ``scaling=<algorithm>``
         default
             Driver default (mpv default as well).
         fast
@@ -347,9 +681,9 @@ Available video output drivers are:
         nla
             ``non-linear anamorphic scaling``
 
-    ``--vo-vaapi-deint-mode=<mode>``
+    ``deint-mode=<mode>``
         Select deinterlacing algorithm. Note that by default deinterlacing is
-        initially always off, and needs to be enabled with the ``d`` key
+        initially always off, and needs to be enabled with the ``D`` key
         (default key binding for ``cycle deinterlace``).
 
         This option doesn't apply if libva supports video post processing (vpp).
@@ -366,7 +700,7 @@ Available video output drivers are:
         bob
             bob deinterlacing (default for older libva).
 
-    ``--vo-vaapi-scaled-osd=<yes|no>``
+    ``scaled-osd=<yes|no>``
         If enabled, then the OSD is rendered at video resolution and scaled to
         display resolution. By default, this is disabled, and the OSD is
         rendered at display resolution if the driver supports it.
@@ -374,14 +708,6 @@ Available video output drivers are:
 ``null``
     Produces no video output. Useful for benchmarking.
 
-    Usually, it's better to disable video with ``--no-video`` instead.
-
-    The following global options are supported by this video output:
-
-    ``--vo-null-fps=<value>``
-        Simulate display FPS. This artificially limits how many frames the
-        VO accepts per second.
-
 ``caca``
     Color ASCII art video output driver that works on a text console.
 
@@ -391,9 +717,7 @@ Available video output drivers are:
     Output each frame into an image file in the current directory. Each file
     takes the frame number padded with leading zeros as name.
 
-    The following global options are supported by this video output:
-
-    ``--vo-image-format=<format>``
+    ``format=<format>``
         Select the image file format.
 
         jpg
@@ -411,24 +735,24 @@ Available video output drivers are:
         tga
             Truevision TGA.
 
-    ``--vo-image-png-compression=<0-9>``
+    ``png-compression=<0-9>``
         PNG compression factor (speed vs. file size tradeoff) (default: 7)
-    ``--vo-image-png-filter=<0-5>``
+    ``png-filter=<0-5>``
         Filter applied prior to PNG compression (0 = none; 1 = sub; 2 = up;
         3 = average; 4 = Paeth; 5 = mixed) (default: 5)
-    ``--vo-image-jpeg-quality=<0-100>``
+    ``jpeg-quality=<0-100>``
         JPEG quality factor (default: 90)
-    ``--vo-image-jpeg-progressive=<yes|no>``
+    ``(no-)jpeg-progressive``
         Specify standard or progressive JPEG (default: no).
-    ``--vo-image-jpeg-baseline=<yes|no>``
+    ``(no-)jpeg-baseline``
         Specify use of JPEG baseline or not (default: yes).
-    ``--vo-image-jpeg-optimize=<0-100>``
+    ``jpeg-optimize=<0-100>``
         JPEG optimization factor (default: 100)
-    ``--vo-image-jpeg-smooth=<0-100>``
+    ``jpeg-smooth=<0-100>``
         smooth factor (default: 0)
-    ``--vo-image-jpeg-dpi=<1->``
+    ``jpeg-dpi=<1->``
         JPEG DPI (default: 72)
-    ``--vo-image-outdir=<dirname>``
+    ``outdir=<dirname>``
         Specify the directory to save the image files to (default: ``./``).
 
 ``wayland`` (Wayland only)
@@ -437,73 +761,41 @@ Available video output drivers are:
     .. note:: This driver is for compatibility with systems that don't provide
               working OpenGL drivers.
 
-    The following global options are supported by this video output:
-
-    ``--vo-wayland-alpha``
+    ``alpha``
         Use a buffer format that supports videos and images with alpha
         information
-    ``--vo-wayland-rgb565``
+    ``rgb565``
         Use RGB565 as buffer format. This format is implemented on most
         platforms, especially on embedded where it is far more efficient then
         RGB8888.
-    ``--vo-wayland-triple-buffering``
+    ``triple-buffering``
         Use 3 buffers instead of 2. This can lead to more fluid playback, but
         uses more memory.
 
 ``opengl-cb``
     For use with libmpv direct OpenGL embedding; useless in any other contexts.
     (See ``<mpv/opengl_cb.h>``.)
+    Usually, ``opengl-cb`` renders frames asynchronously by client and this
+    can cause some frame drops. In order to provide a way to handle this
+    situation, ``opengl-cb`` has its own frame queue and calls update callback
+    more frequently if the queue is not empty regardless of existence of new frame.
+    Once the queue is filled, ``opengl-cb`` drops frames automatically.
 
-    This also supports many of the options the ``opengl`` VO has.
+    With default options, ``opengl-cb`` renders only the latest frame and drops
+    all frames handed over while waiting render function after update callback.
 
-``rpi`` (Raspberry Pi)
-    Native video output on the Raspberry Pi using the MMAL API.
+    ``frame-queue-size=<1..100>``
+        The maximum count of frames which the frame queue can hold (default: 1)
 
-    This is deprecated. Use ``--vo=opengl`` instead, which is the default and
-    provides the same functionality. The ``rpi`` VO will be removed in
-    mpv 0.22.0. Its functionality was folded into --vo=opengl, which now uses
-    RPI hardware decoding by treating it as a hardware overlay (without applying
-    GL filtering). Also to be changed in 0.22.0: the --fs flag will be reset to
-    "no" by default (like on the other platforms).
+    ``frame-drop-mode=<pop|clear>``
+        Select the behavior when the frame queue is full.
 
-    The following deprecated global options are supported by this video output:
+        pop
+            Drop the oldest frame in the frame queue. (default)
+        clear
+            Drop all frames in the frame queue.
 
-    ``--rpi-display=<number>``
-        Select the display number on which the video overlay should be shown
-        (default: 0).
-
-    ``--rpi-layer=<number>``
-        Select the dispmanx layer on which the video overlay should be shown
-        (default: -10). Note that mpv will also use the 2 layers above the
-        selected layer, to handle the window background and OSD. Actual video
-        rendering will happen on the layer above the selected layer.
-
-    ``--rpi-background=<yes|no>``
-        Whether to render a black background behind the video (default: no).
-        Normally it's better to kill the console framebuffer instead, which
-        gives better performance.
-
-    ``--rpi-osd=<yes|no>``
-        Enabled by default. If disabled with ``no``, no OSD layer is created.
-        This also means there will be no subtitles rendered.
-
-``drm`` (Direct Rendering Manager)
-    Video output driver using Kernel Mode Setting / Direct Rendering Manager.
-    Should be used when one doesn't want to install full-blown graphical
-    environment (e.g. no X). Does not support hardware acceleration (if you
-    need this, check the ``drm-egl`` backend for ``opengl`` VO).
-
-    The following global options are supported by this video output:
-
-    ``--drm-connector=[<gpu_number>.]<name>``
-        Select the connector to use (usually this is a monitor.) If ``<name>``
-        is empty or ``auto``, mpv renders the output on the first available
-        connector. Use ``--drm-connector=help`` to get list of available
-        connectors. When using multiple graphic cards, use the ``<gpu_number>``
-        argument to disambiguate.
-        (default: empty)
-
-    ``--drm-mode=<number>``
-        Mode ID to use (resolution, bit depth and frame rate).
-        (default: 0)
+    This also supports many of the suboptions the ``opengl`` VO has. Runs
+    ``mpv --vo=opengl-cb:help`` for a list.
 
+    This also supports the ``vo_cmdline`` command.

DOCS/mplayer-changes.rst

@@ -7,8 +7,8 @@ large part of which is incompatible or completely changes how the player
 behaves. Although there are still many similarities to its ancestors, **mpv**
 should generally be treated as a completely different program.
 
-.. admonition:: Warning
-    This document is not updated anymore, and is incomplete and outdated.
+.. note::
+    These lists are incomplete.
 
 General Changes from MPlayer to mpv
 -----------------------------------
@@ -30,7 +30,7 @@ Player
 * Slave mode compatibility broken (see below).
 * Re-enable screensaver while the player is paused.
 * Allow resuming playback at a later point with ``Shift+q``, also see the
-  ``quit-watch-later`` input command.
+  ``quit_watch_later`` input command.
 * ``--keep-open`` option to stop the player from closing the window and
   exiting after playback ends.
 * A client API, that allows embedding **mpv** into applications
@@ -46,13 +46,6 @@ Input
 * Allow customizing whether a key binding for seeking shows the video time, the
   OSD bar, or nothing (see the `Input Command Prefixes`_ section).
 * Support mapping multiple commands to one key.
-* Classic LIRC support was removed. Install remotes as input devices instead.
-  This way they will send X11 key events to the mpv window, which can be bound
-  using the normal ``input.conf``.
-  Also see: http://github.com/mpv-player/mpv/wiki/IR-remotes
-* Joystick support was removed. It was considered useless and was the cause
-  of some problems (e.g. a laptop's accelerator being recognized as joystick).
-* Support for relative seeking by percentage.
 
 Audio
 ~~~~~
@@ -79,8 +72,7 @@ Video
   using most of FFmpeg's filters, which improve greatly on the old MPlayer
   filters in features, performance, and correctness.
 * More correct color reproduction (color matrix generation), including support
-  for BT.2020 (Ultra HD). linear XYZ (Digital Cinema) and SMPTE ST2084 (HDR)
-  inputs.
+  for BT.2020 (Ultra HD) and linear XYZ (Digital Cinema) inputs.
 * Support for color managed displays, via ICC profiles.
 * High-quality image resamplers (see the ``opengl`` ``scale`` suboption).
 * Support for scaling in (sigmoidized) linear light.
@@ -95,8 +87,6 @@ Video
 
 * Image subtitles (DVDs etc.) are rendered in color and use more correct
   positioning (color for image subs can be disabled with ``--sub-gray``).
-* Support for the X11 video output is removed, since it was considered
-  deprecated. SDL video output can still be used as a fallback.
 
 OSD and terminal
 ~~~~~~~~~~~~~~~~
@@ -237,6 +227,7 @@ Command Line Switches
     ``-idx``                    ``--index``
     ``-lavdopts ...``           ``--vd-lavc-...``
     ``-lavfdopts``              ``--demuxer-lavf-...``
+    ``-lircconf``               ``--input-lirc-conf``
     ``-loop 0``                 ``--loop=inf``
     ``-mixer-channel``          AO suboptions (``alsa``, ``oss``)
     ``-mixer``                  AO suboptions (``alsa``, ``oss``)
@@ -248,6 +239,7 @@ Command Line Switches
     ``-noar``                   ``--no-input-appleremote``
     ``-noautosub``              ``--no-sub-auto``
     ``-noconsolecontrols``      ``--no-input-terminal``
+    ``-nojoystick``             ``--no-input-joystick``
     ``-nosound``                ``--no-audio``
     ``-osdlevel``               ``--osd-level``
     ``-panscanrange``           ``--video-zoom``, ``--video-pan-x/y``
@@ -262,14 +254,13 @@ Command Line Switches
     ``-ssf <sub>``              ``--sws-...``
     ``-stop-xscreensaver``      ``--stop-screensaver``
     ``-sub-fuzziness``          ``--sub-auto``
-    ``-sub-text-*``             ``--sub-*``
     ``-sub``                    ``--sub-file``
     ``-subcp``                  ``--sub-codepage``
     ``-subdelay``               ``--sub-delay``
     ``-subfile``                ``--sub-file``
-    ``-subfont-*``              ``--sub-*``, ``--osd-*``
+    ``-subfont-*``              ``--sub-text-*``, ``--osd-*``
     ``-subfont-text-scale``     ``--sub-scale``
-    ``-subfont``                ``--sub-font``
+    ``-subfont``                ``--sub-text-font``
     ``-subfps``                 ``--sub-fps``
     ``-subpos``                 ``--sub-pos``
     ``-sws``                    ``--sws-scaler``
@@ -281,7 +272,7 @@ Command Line Switches
     ``-xineramascreen``         ``--screen`` (different values)
     ``-xy W``                   ``--autofit=W``
     ``-zoom``                   Inverse available as ``--video-unscaled``
-    ``dvdnav://``               Removed.
+    ``dvdnav://``               ``dvdnav://menu``
     ``dvd://1``                 ``dvd://0`` (0-based offset)
     =========================== ========================================
 
@@ -313,11 +304,11 @@ input.conf and Slave Commands
     +--------------------------------+----------------------------------------+
     | Old                            | New                                    |
     +================================+========================================+
-    | ``pt_step 1 [0|1]``            | ``playlist-next [weak|force]``         |
+    | ``pt_step 1 [0|1]``            | ``playlist_next [weak|force]``         |
     |                                | (translation layer cannot deal with    |
     |                                | whitespace)                            |
     +--------------------------------+----------------------------------------+
-    | ``pt_step -1 [0|1]``           | ``playlist-prev [weak|force] (same)``  |
+    | ``pt_step -1 [0|1]``           | ``playlist_prev [weak|force] (same)``  |
     +--------------------------------+----------------------------------------+
     | ``switch_ratio [<ratio>]``     | ``set video-aspect <ratio>``           |
     |                                |                                        |
@@ -332,7 +323,7 @@ input.conf and Slave Commands
     | ``<step> <dir>``               | ``no-osd``: ``no-osd cycle <prop>``    |
     |                                | ``<step>``                             |
     +--------------------------------+----------------------------------------+
-    | ``osd_show_property_text``     | ``show-text <text>``                   |
+    | ``osd_show_property_text``     | ``show_text <text>``                   |
     | ``<text>``                     | The property expansion format string   |
     |                                | syntax slightly changed.               |
     +--------------------------------+----------------------------------------+
@@ -341,9 +332,9 @@ input.conf and Slave Commands
     |                                | ``raw`` prefix to disable property     |
     |                                | expansion.                             |
     +--------------------------------+----------------------------------------+
-    | ``show_tracks``                | ``show-text ${track-list}``            |
+    | ``show_tracks``                | ``show_text ${track-list}``            |
     +--------------------------------+----------------------------------------+
-    | ``show_chapters``              | ``show-text ${chapter-list}``          |
+    | ``show_chapters``              | ``show_text ${chapter-list}``          |
     +--------------------------------+----------------------------------------+
     | ``af_switch``, ``af_add``, ... | ``af set|add|...``                     |
     +--------------------------------+----------------------------------------+
@@ -401,8 +392,7 @@ Slave mode
 
   Assuming the system supports ``/dev/stdin``.
 
-  (The option was added back in 0.5.1 and sets exactly these options. It was
-  removed in 0.10.x again.)
+  (The option was readded in 0.5.1 and sets exactly these options.)
 
 * A JSON RPC protocol giving access to the client API is also supported. See
   `JSON IPC`_ for more information.

DOCS/release-policy.md

@@ -1,107 +1,64 @@
 Release Policy
 ==============
 
-Once or twice a month, a new release is cut off of the master branch and is
-assigned a 0.X.Y version number, where X is incremented each time a release
-contains breaking changes, such as changed options or added/removed features,
-and Y is incremented if a release contains only bugfixes and other minor
-changes.
+Every few months, a new release is cut off of the master branch and is assigned
+a 0.X.0 version number.
 
-There is only one release branch that keeps track of the latest version and
-will not be maintained separately.
+As part of the maintenance process, minor releases are made, which are assigned
+0.X.Y version numbers. Minor releases contain bug fixes only. They never merge
+the master branch, and no features are added to it. Only the latest release is
+maintained.
 
-The goal of releases is to provide Linux distributions with something to
-package. If you want the newest features, just use the master branch.
-We try our best to keep it deployable at all times.
+The goal of releases is to provide stability and an unchanged base for the sake
+of Linux distributions. If you want the newest features, just use the master
+branch, which is stable most of the time, except sometimes, when it's not.
 
 Releases other than the latest release are unsupported and unmaintained.
 
 Release procedure
 -----------------
 
-- Merge master into branch release/current.
+- Create branch release/0.X or cherry-pick commits to the relevant branch.
 
-- Create and/or update the `RELEASE_NOTES` file.
+- Create and/or update the ``RELEASE_NOTES`` file.
 
-- Create and/or update the `VERSION` file.
+- Create and/or update the ``VERSION`` file.
 
-- Update `DOCS/client-api-changes.rst` and `DOCS/interface-changes.rst`
-  (in particular, update the last version numbers if necessary)
+- Update ``DOCS/client-api-changes.rst`` (on major releases).
 
 - Create tag v0.X.Y.
 
 - Push branch and tag to GitHub.
 
-- Create a new GitHub release using the content of `RELEASE_NOTES` related to
+- Create a new GitHub release using the content of ``RELEASE_NOTES`` related to
   the new version.
 
 Release notes template
 ----------------------
 
-Here is a template that can be used for writing the `RELEASE_NOTES` file.
+Here is a template that can be used for writing the ``RELEASE_NOTES`` file.
 
 ```markdown
 Release 0.X.Y
 =============
 
-Features
---------
+Changes
+-------
 
-New
-~~~
+- List of changes.
 
-- List of new features
+Bug fixes
+---------
 
-Removed
-~~~~~~~
+- List of bug fixes.
 
-- List of removed features
+New features
+------------
 
-Deprecated
-~~~~~~~~~~
-
-- List of deprecated features
-
-Behavior
---------
-
-- List of user-visible changes in behavior
-
-Options and Commands
---------------------
-
-Added
-~~~~~
-
-- List of added options and commands
-
-Changed
-~~~~~~~
-
-- List of changed options and commands
-
-Renamed
-~~~~~~~
-
-- List of renamed options and commands
-
-Deprecated
-~~~~~~~~~~
-
-- List of deprecated options and commands
-
-Removed
-~~~~~~~
-
-- List of removed options and commands
-
-Fixes and Minor Enhancements
-----------------------------
-
-- List of fixes and minor enhancements
+- List of new features.
 
 This listing is not complete. There are many more bug fixes and changes. The
-complete change log can be viewed by running `git log <start>..<end>` in
+complete change log can be viewed by running ``git log <start>..<end>`` in
 the git repository.
 ```
 
@@ -109,6 +66,6 @@ Note that the "Release 0.X.Y" title should be removed when creating a new GitHub
 release.
 
 When creating a new point release its changes should be added on top of the
-`RELEASE_NOTES` file (with the appropriate title) so that all the changes in
-the current 0.X branch will be included. This way the `RELEASE_NOTES` file
+``RELEASE_NOTES`` file (with the appropriate title) so that all the changes in
+the current 0.X branch will be included. This way the ``RELEASE_NOTES`` file
 can be used by distributors as changelog for point releases too.

DOCS/tech-overview.txt

@@ -75,7 +75,8 @@ talloc.h & talloc.c:
     allocation call will never return NULL.
 
     One very useful feature of talloc is fast tracking of memory leaks. ("Fast"
-    as in it doesn't require valgrind.) You can enable it by setting the
+    as in it doesn't require valgrind.) You can enable it by passing the option
+    --leak-report as first parameter, or better, setting the
     MPV_LEAK_REPORT environment variable to "1":
         export MPV_LEAK_REPORT=1
     This will list all unfree'd allocations on exit.
@@ -123,7 +124,7 @@ options/options.h, options/options.c
     parser-mpcmd.c, and uses the option table in options.c.
 
 input/input.c:
-    This translates keyboard input coming from VOs and other sources (such
+    This translates keyboard input comming from VOs and other sources (such
     as remote control devices like Apple IR or client API commands) to the
     key bindings listed in the user's (or the builtin) input.conf and turns
     them into items of type struct mp_cmd. These commands are queued, and read

DOCS/waf-buildsystem.rst

@@ -1,7 +1,7 @@
 waf build system overview
 =========================
 
-mpv's new build system is based on waf and it should completely replace the
+mpv's new build system is based on waf and it should completly replace the
 custom ./configure + Makefile based system inherited from MPlayer.
 
 Goals and the choice of waf
@@ -20,9 +20,8 @@ shortcomings:
    part is this pieces are spread apart in the configure and copy pasted for
    any single case. That brings us to..
 
-2) --enable-feature has to be overridden by the user and helps them understand that
-   they have libraries missing and should install them for the feature to be
-   enabled.
+2) --enable-feature has to override the user and help him understand that he
+   has libraries missing and should install them for the feature to be enabled.
 
 3) Must be customizable, hackable, pleasant to the developer eyes and to work
    with in general.
@@ -65,7 +64,7 @@ This defines a feature called ``vdpau`` which can be enabled or disabled by
 the users with configure flags (that's the meaning of ``--``). This feature
 depends on another feature whose name is ``x11``, and the autodetection check
 consists of running ``pkg-config`` and looking for ``vdpau`` with version
-``>= 0.2``. If the check succeeds a ``#define HAVE_VDPAU 1`` will be added to
+``>= 0.2``. If the check succeds a ``#define HAVE_VDPAU 1`` will be added to
 ``config.h``, if not ``#define HAVE_VDPAU 0`` will be added.
 
 The defines names are automatically prepended with ``HAVE_``, capitalized and

README.md

@@ -1,54 +1,17 @@
-![http://mpv.io/](https://raw.githubusercontent.com/mpv-player/mpv.io/master/source/images/mpv-logo-128.png)
-
-## mpv
-
---------------
-
-
-* [Overview](#overview)
-* [Downloads](#downloads)
-* [Compilation](#compilation)
-* [FFmpeg vs. Libav](#ffmpeg-vs-libav)
-* [Release cycle](#release-cycle)
-* [Bug reports](#bug-reports)
-* [Contributing](#contributing)
-* [Relation to MPlayer and mplayer2](#relation-to-mplayer-and-mplayer2)
-* [Wiki](https://github.com/mpv-player/mpv/wiki)
-* [Man pages](http://mpv.io/manual/master/)
-* [Contact](#contact)
-* [License](#license)
-
-## Overview
+mpv
+===
 
+Overview
+--------
 
 **mpv** is a media player based on MPlayer and mplayer2. It supports a wide
 variety of video file formats, audio and video codecs, and subtitle types.
 
-Releases can be found on the [release list][releases].
-
-## System requirements
-
-- A not too ancient Linux, or Windows Vista or later, or OSX 10.8 or later.
-- A somewhat capable CPU. Hardware decoding might sometimes help if the CPU
-  is too slow to decode video realtime, but must be explicitly enabled with
-  the `--hwdec` option. On Windows, a CPU with SSE4 instruction set is required
-  to get decent hardware decoding performance.
-- A not too crappy GPU. mpv is not intended to be used with bad GPUs. There are
-  many caveats with drivers or system compositors causing tearing, stutter,
-  etc. On Windows, you might want to make sure the graphics drivers are
-  current, especially OpenGL. In some cases, ancient fallback video output
-  methods can help (such as `--vo=xv` on Linux), but this use is not
-  recommended or supported.
-
-
-## Downloads
-
-
-For semi-official builds and third-party packages please see
-[mpv.io](http://mpv.io/installation/).
-
-## Compilation
+If you are wondering what's different from mplayer2 and MPlayer you can read
+more about the [changes][changes].
 
+Compilation
+-----------
 
 Compiling with full features requires development files for several
 external libraries. Below is a list of some important requirements.
@@ -72,6 +35,9 @@ 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
@@ -79,13 +45,13 @@ Essential dependencies (incomplete list):
 - Audio output development headers (libasound/ALSA, pulseaudio)
 - FFmpeg libraries (libavutil libavcodec libavformat libswscale libavfilter
   and either libswresample or libavresample)
-  At least FFmpeg 2.4.0 or Libav 11 is required.
+  At least FFmpeg 2.1.4 or Libav 10 is required.
 - zlib
 - iconv (normally provided by the system libc)
-- libass (OSD, OSC, text subtitles)
+- libass
 - Lua (optional, required for the OSC pseudo-GUI and youtube-dl integration)
 - libjpeg (optional, used for screenshots only)
-- uchardet (optional, for subtitle charset detection)
+- Enca (optional, for subtitle charset detection)
 - vdpau and vaapi libraries for hardware decoding on Linux (optional)
 
 Libass dependencies:
@@ -111,117 +77,74 @@ the separately available build wrapper ([mpv-build][mpv-build]) that first compi
 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][homebrew-mpv], an up
+to date formula that compiles mpv with sensible dependencies and defaults for
+OSX.
+
 If you want to build a Windows binary, you either have to use MSYS2 and MinGW,
 or cross-compile from Linux with MinGW. See [Windows compilation][windows_compilation].
 
-
-## FFmpeg vs. Libav
-
+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 (subtitle formats in particular).
+with FFmpeg only. See the [wiki article][ffmpeg_vs_libav] about the issue.
 
 
-## Preferred FFmpeg version
+Release cycle
+-------------
 
+Every few months, a new release is cut off of the master branch and is assigned
+a 0.X.0 version number.
 
-Using the latest FFmpeg release (or FFmpeg git master) is strongly recommended.
-Older versions are unsupported, even if the build system still happens to
-accept them. The main reason mpv still builds with older FFmpeg versions is to
-evade arguing with people (users, distros) who insist on using older FFmpeg
-versions for no rational reason.
+As part of the maintenance process, minor releases are made, which are assigned
+0.X.Y version numbers. Minor releases contain bug fixes only. They never merge
+the master branch, and no features are added to it. Only the latest release is
+maintained.
 
-If you want to use a stable FFmpeg release, use the latest release, which has
-most likely the best maintenance out of all stable releases. Older releases
-are for distros, and at best receive basic changes like fixing critical security
-issues or build fixes, and at worst are completely abandoned.
-
-## FFmpeg ABI compatibility
-
-mpv does not support linking against FFmpeg versions it was not built with, even
-if the linked version is supposedly ABI-compatible with the version it was
-compiled against. Expect malfunctions, crashes, and security issues if you
-do it anyway.
-
-The reason for not supporting this is because it creates far too much complexity
-with little to no benefit, coupled with absurd and unusable FFmpeg API
-artifacts.
-
-Newer mpv versions will refuse to start if runtime and compile time FFmpeg
-library versions mismatch.
-
-## Release cycle
-
-Every other month, an arbitrary git snapshot is made, and is assigned
-a 0.X.0 version number. No further maintenance is done.
-
-The goal of releases is to make Linux distributions happy. Linux distributions
-are also expected to apply their own patches in case of bugs and security
-issues.
+The goal of releases is to provide stability and an unchanged base for the sake
+of Linux distributions. If you want the newest features, just use the master
+branch, which is stable most of the time, except sometimes, when it's not.
 
 Releases other than the latest release are unsupported and unmaintained.
 
 See the [release policy document][release-policy] for more information.
 
-## Bug reports
-
+Bug reports
+-----------
 
 Please use the [issue tracker][issue-tracker] provided by GitHub to send us bug
 reports or feature requests.
 
-## Contributing
-
+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.
 
-## Relation to MPlayer and mplayer2
-
-
-mpv is based on mplayer2, which in turn is based on the original MPlayer
-(also called mplayer, mplayer-svn, mplayer1). Many changes have been made, a
-large part of which is incompatible or completely changes how the player
-behaves. Although there are still many similarities to its ancestors, mpv
-should generally be treated as a completely different program.
-
-mpv was forked because we wanted to modernize MPlayer. This includes
-removing cruft (including features which stopped making sense 10 years ago),
-and of course adding modern features. Such huge and intrusive changes made it
-infeasible to work directly with MPlayer, which is mostly focused on
-preservation, so a fork had to be made. (Actually, mpv is based on mplayer2,
-which already started this process of removing cruft.)
-
-In general, mpv should be considered a completely new program, rather than a
-MPlayer drop-in replacement.
-
-If you are wondering what's different from mplayer2 and MPlayer, an incomplete
-list of changes is located [here][mplayer-changes].
-
-## Contact
-
+Contact
+-------
 
 Most activity happens on the IRC channel and the github issue tracker. The
 mailing lists are mostly unused.
 
- - **GitHub issue tracker**: [issue tracker][issue-tracker] (report bugs here)
- - **User IRC Channel**: `#mpv` on `irc.freenode.net`
- - **Developer IRC Channel**: `#mpv-devel` on `irc.freenode.net`
+ - **Github issue tracker**: [issue tracker][issue-tracker] (report bugs here)
+ - **User IRC Channel**: `#mpv-player` on `irc.freenode.net`
+ - **Developer IRC Channel**: `#mpv-player-dev` on `irc.freenode.net`
+ - **Users Mailing List**: `mpv-users@googlegroups.com` ([Archive / Subscribe][mpv-users]).
+ - **Devel Mailing List**: `mpv-devel@googlegroups.com` ([Archive / Subscribe][mpv-devel])
 
 To contact the `mpv` team in private write to `mpv-team@googlegroups.com`. Use
 only if discretion is required.
 
-[releases]: https://github.com/mpv-player/mpv/releases
+[changes]: https://github.com/mpv-player/mpv/blob/master/DOCS/man/changes.rst
 [mpv-build]: https://github.com/mpv-player/mpv-build
 [homebrew-mpv]: https://github.com/mpv-player/homebrew-mpv
 [issue-tracker]:  https://github.com/mpv-player/mpv/issues
+[mpv-users]: https://groups.google.com/forum/?hl=en#!forum/mpv-users
+[mpv-devel]: https://groups.google.com/forum/?hl=en#!forum/mpv-devel
 [ffmpeg_vs_libav]: https://github.com/mpv-player/mpv/wiki/FFmpeg-versus-Libav
 [release-policy]: https://github.com/mpv-player/mpv/blob/master/DOCS/release-policy.md
 [windows_compilation]: https://github.com/mpv-player/mpv/blob/master/DOCS/compile-windows.md
-[mplayer-changes]: https://github.com/mpv-player/mpv/blob/master/DOCS/mplayer-changes.rst
-
-## License
-
-
-Mostly GPLv2 or later. See [details.](https://github.com/mpv-player/mpv/blob/master/Copyright)

TOOLS/appveyor-build.sh

@@ -1,22 +0,0 @@
-#!/usr/bin/bash
-set -e
-
-export DEST_OS=win32
-export CC=gcc
-export PKG_CONFIG=/usr/bin/pkg-config
-export PERL=/usr/bin/perl
-export PYTHON=/usr/bin/python3
-
-"$PYTHON" bootstrap.py
-"$PYTHON" waf configure \
-    --check-c-compiler=gcc \
-    --disable-cdda \
-    --enable-egl-angle \
-    --enable-jpeg \
-    --enable-lcms2 \
-    --enable-libarchive \
-    --enable-libass \
-    --enable-lua \
-    --enable-rubberband \
-    --enable-uchardet
-"$PYTHON" waf build

TOOLS/appveyor-install.sh

@@ -1,35 +0,0 @@
-#!/usr/bin/bash
-set -e
-
-case $MSYSTEM in
-MINGW32)
-    export MINGW_PACKAGE_PREFIX=mingw-w64-i686
-    ;;
-MINGW64)
-    export MINGW_PACKAGE_PREFIX=mingw-w64-x86_64
-    ;;
-esac
-
-# Write an empty fonts.conf to speed up fc-cache
-export FONTCONFIG_FILE=/dummy-fonts.conf
-cat >"$FONTCONFIG_FILE" <<EOF
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig></fontconfig>
-EOF
-
-# Install build dependencies for mpv
-pacman -S --noconfirm --needed \
-    $MINGW_PACKAGE_PREFIX-gcc \
-    $MINGW_PACKAGE_PREFIX-angleproject-git \
-    $MINGW_PACKAGE_PREFIX-ffmpeg \
-    $MINGW_PACKAGE_PREFIX-lcms2 \
-    $MINGW_PACKAGE_PREFIX-libarchive \
-    $MINGW_PACKAGE_PREFIX-libass \
-    $MINGW_PACKAGE_PREFIX-libjpeg-turbo \
-    $MINGW_PACKAGE_PREFIX-lua51 \
-    $MINGW_PACKAGE_PREFIX-rubberband \
-    $MINGW_PACKAGE_PREFIX-uchardet-git
-
-# Delete unused packages to reduce space used in the Appveyor cache
-pacman -Sc --noconfirm

TOOLS/file2string.pl

@@ -9,8 +9,8 @@ use warnings;
 # the exact contents of the original file.
 # FIXME: why not a char array?
 
-# treat only alphanumeric and punctuations (excluding " and ?) as safe
-my $unsafe_chars = qr{[^][A-Za-z0-9!#%&'()*+,./:;<=>^_{|}~ -]};
+# treat only alphanumeric and not-" punctuation as safe
+my $unsafe_chars = qr{[^][A-Za-z0-9!#%&'()*+,./:;<=>?^_{|}~ -]};
 
 for my $file (@ARGV) {
     open my $fh, '<:raw', $file or next;

TOOLS/gen-x11-icon.sh

@@ -5,7 +5,7 @@
 
 conv() {
     echo
-    echo `identify -format "icon: %w %h" "$1"`
+    identify -format "icon: %w %h" "$1"
     convert "$1" -depth 8 rgba:-
 }
 

TOOLS/idet.sh

@@ -47,7 +47,7 @@ judge()
         progressive=$((progressive + progressive1))
         undetermined=$((undetermined + undetermined1))
     done <<EOF
-$(testfun "$@" | sed 's/:/: /g')
+$(testfun "$@")
 EOF
 
     interlaced=$((bff + tff))
@@ -95,18 +95,18 @@ case "$verdict" in
         exit 0
         ;;
     interlaced-tff)
-        judge "$@" --vf-clr --vf-pre=lavfi=\[setfield=tff\],pullup
+        judge "$@" --vf-clr --vf-pre=pullup --field-dominance=top
         case "$verdict" in
             progressive)
                 [ -n "$ILDETECT_DRY_RUN" ] || \
-                    $ILDETECT_MPV "$@" --vf-pre=lavfi=\[setfield=tff\],pullup
+                    $ILDETECT_MPV "$@" --vf-pre=pullup --field-dominance=top
                 r=$?
                 [ $r -eq 0 ] || exit $((r | 16))
                 exit 1
                 ;;
             *)
                 [ -n "$ILDETECT_DRY_RUN" ] || \
-                    $ILDETECT_MPV "$@" --vf-pre=lavfi=\[setfield=tff\],yadif
+                    $ILDETECT_MPV "$@" --vf-pre=yadif --field-dominance=top
                 r=$?
                 [ $r -eq 0 ] || exit $((r | 16))
                 exit 2
@@ -114,18 +114,18 @@ case "$verdict" in
         esac
         ;;
     interlaced-bff)
-        judge "$@" --vf-clr --vf-pre=lavfi=\[setfield=bff\],pullup
+        judge "$@" --vf-clr --vf-pre=pullup --field-dominance=bottom
         case "$verdict" in
             progressive)
                 [ -n "$ILDETECT_DRY_RUN" ] || \
-                    $ILDETECT_MPV "$@" --vf-pre=lavfi=\[setfield=bff\],pullup
+                    $ILDETECT_MPV "$@" --vf-pre=pullup --field-dominance=bottom
                 r=$?
                 [ $r -eq 0 ] || exit $((r | 16))
                 exit 1
                 ;;
             *)
                 [ -n "$ILDETECT_DRY_RUN" ] || \
-                    $ILDETECT_MPV "$@" --vf-pre=lavfi=\[setfield=bff\],yadif
+                    $ILDETECT_MPV "$@" --vf-pre=yadif --field-dominance=bottom
                 r=$?
                 [ $r -eq 0 ] || exit $((r | 16))
                 exit 2

TOOLS/lib/Parse/Matroska/Definitions.pm

@@ -84,7 +84,7 @@ sub elem_by_hexid {
 # used by elem when setting the 'valname' key
 use constant TYPE_MAP => {
     uint    => 'uint64_t',
-    str     => 'char *',
+    str     => 'struct bstr',
     binary  => 'struct bstr',
     ebml_id => 'uint32_t',
     float   => 'double',

TOOLS/lua/README.md

@@ -10,11 +10,3 @@ to mpv's command line.
 
 Where appropriate, they may also be placed in ~/.config/mpv/scripts/ from
 where they will be automatically loaded when mpv starts.
-
-This is only a small selection of internally maintained scripts. Some of them
-are just for testing mpv internals, or serve as examples. An extensive
-user-edited list of 3rd party scripts is available here:
-
-    https://github.com/mpv-player/mpv/wiki/User-Scripts
-
-(Anyone can add their own scripts to that list.)

TOOLS/lua/ao-null-reload.lua

@@ -1,20 +0,0 @@
--- Handles the edge case where previous attempts to init audio have failed, but
--- might start working due to a newly added device. This is required in
--- particular for ao=wasapi, since the internal IMMNotificationClient code that
--- normally triggers ao-reload will not be running in this case.
-
-function do_reload()
-    mp.command("ao-reload")
-    reloading = nil
-end
-
-function on_audio_device_list_change()
-    if mp.get_property("current-ao") == "null" and not reloading then
-        mp.msg.verbose("audio-device-list changed: reloading audio")
-        -- avoid calling ao-reload too often
-        reloading = mp.add_timeout(0.5, do_reload)
-    end
-end
-
-mp.set_property("options/audio-fallback-to-null", "yes")
-mp.observe_property("audio-device-list", "native", on_audio_device_list_change)

TOOLS/lua/audio-hotplug-test.lua

@@ -1,13 +0,0 @@
-local utils = require("mp.utils")
-
-mp.observe_property("audio-device-list", "native", function(name, val)
-    print("Audio device list changed:")
-    for index, e in ipairs(val) do
-        print("  - '" .. e.name .. "' (" .. e.description .. ")")
-    end
-end)
-
-mp.observe_property("audio-out-detected-device", "native", function(name, val)
-    print("Detected audio device changed:")
-    print("  - '" .. val)
-end)

TOOLS/lua/autodeint.lua

@@ -2,16 +2,21 @@
 -- appropriate deinterlacing filter based on a short section of the
 -- currently playing video.
 --
--- It registers the key-binding ctrl+d, which when pressed, inserts the filters
--- ``vf=lavfi=idet,pullup,vf=lavfi=idet``. After 4 seconds, it removes these
--- filters and decides whether the content is progressive, interlaced, or
--- telecined and the interlacing field dominance.
+-- It registers the key-binding ctrl+d, which when pressed, inserts
+-- the filter vf=lavfi=idet. After 4 second, it examines the results
+-- to determine whether the content progressive or interlaced and the
+-- interlacing field dominance. It immediately sets the latter within
+-- mpv.
 --
--- Based on this information, it may set mpv's ``deinterlace`` property (which
--- usually inserts the yadif filter), or insert the ``pullup`` filter if the
--- content is telecined.  It also sets mpv's ``field-dominance`` property.
+-- If the content is judged not to be progressive, it may be either
+-- interlaced or telecined. To determine which one, the video is
+-- seeked back to the detection starting point with the "pullup"
+-- filter inserted. After another four seconds, if idet thinks that
+-- the pulled up viedo is "progressive", then pullup is the correct
+-- filter and this script leaves it in places while removing the idet
+-- filter. Otherwise, the content plain interlaced and mpv's deinterlace
+-- property is set. This will usually insert the yadif deinterlacing filter.
 --
--- OPTIONS:
 -- The default detection time may be overridden by adding
 --
 -- --script-opts=autodeint.detect_seconds=<number of seconds>
@@ -32,7 +37,6 @@ require "mp.msg"
 script_name = mp.get_script_name()
 detect_label = string.format("%s-detect", script_name)
 pullup_label = string.format("%s", script_name)
-ivtc_detect_label = string.format("%s-ivtc-detect", script_name)
 
 -- number of seconds to gather cropdetect data
 detect_seconds = tonumber(mp.get_opt(string.format("%s.detect_seconds", script_name)))
@@ -65,29 +69,30 @@ function start_detect()
     mp.set_property("deinterlace","no")
     del_filter_if_present(pullup_label)
 
+    percent_pos = mp.get_property("percent-pos")
+
     -- insert the detection filter
-    local cmd = string.format('vf add @%s:lavfi=graph="idet",@%s:pullup,@%s:lavfi=graph="idet"',
-                              detect_label, pullup_label, ivtc_detect_label)
+    local cmd = string.format('vf add @%s:lavfi=graph="idet"', detect_label)
     if not mp.command(cmd) then
-        mp.msg.error("failed to insert detection filters")
+        mp.msg.error("failed to insert detection filter")
         return
     end
 
     -- wait to gather data
-    timer = mp.add_timeout(detect_seconds, select_filter)
+    timer = mp.add_timeout(detect_seconds, judge_field_dominance)
 end
 
 function stop_detect()
     del_filter_if_present(detect_label)
-    del_filter_if_present(ivtc_detect_label)
     timer = nil
+    mp.set_property("playback-pos", percent_pos)
 end
 
 progressive, interlaced_tff, interlaced_bff, interlaced = 0, 1, 2, 3, 4
 
-function judge(label)
+function judge()
     -- get the metadata
-    local result = mp.get_property_native(string.format("vf-metadata/%s", label))
+    local result = mp.get_property_native(string.format("vf-metadata/%s", detect_label))
     num_tff          = tonumber(result["lavfi.idet.multiple.tff"])
     num_bff          = tonumber(result["lavfi.idet.multiple.bff"])
     num_progressive  = tonumber(result["lavfi.idet.multiple.progressive"])
@@ -95,10 +100,10 @@ function judge(label)
     num_interlaced   = num_tff + num_bff
     num_determined   = num_interlaced + num_progressive
 
-    mp.msg.verbose(label.." progressive    = "..num_progressive)
-    mp.msg.verbose(label.." interlaced-tff = "..num_tff)
-    mp.msg.verbose(label.." interlaced-bff = "..num_bff)
-    mp.msg.verbose(label.." undetermined   = "..num_undetermined)
+    mp.msg.verbose("progressive    = "..num_progressive)
+    mp.msg.verbose("interlaced-tff = "..num_tff)
+    mp.msg.verbose("interlaced-bff = "..num_bff) 
+    mp.msg.verbose("undetermined   = "..num_undetermined)
 
     if num_determined < num_undetermined then
         mp.msg.warn("majority undetermined frames")
@@ -114,12 +119,11 @@ function judge(label)
     end
 end
 
-function select_filter()
-    -- handle the first detection filter results
-    verdict = judge(detect_label)
+function judge_field_dominance()
+    verdict = judge()
     if verdict == progressive then
-        mp.msg.info("progressive: doing nothing")
         stop_detect()
+        mp.msg.info("progressive: doing nothing")
         return
     elseif verdict == interlaced_tff then
         mp.set_property("field-dominance", "top")
@@ -129,8 +133,21 @@ function select_filter()
         mp.set_property("field-dominance", "auto")
     end
 
-    -- handle the ivtc detection filter results
-    verdict = judge(ivtc_detect_label)
+    local cmd = string.format("vf pre @%s:pullup", pullup_label)
+    if not mp.command(cmd) then
+        mp.msg.error("failed to insert pullup filter")
+        stop_detect()
+        return
+    end
+
+    -- redo the detection with the pullup filter to see if it's telecined
+    mp.set_property("percent-pos", percent_pos)
+    timer = mp.add_timeout(detect_seconds, judge_ivtc)
+end
+
+function judge_ivtc()
+    verdict = judge()
+
     if verdict == progressive then
         mp.msg.info(string.format("telecinied with %s field dominance: using pullup", mp.get_property("field-dominance")))
         stop_detect()
@@ -140,6 +157,8 @@ function select_filter()
         mp.set_property("deinterlace","yes")
         stop_detect()
     end
+
+    return
 end
 
 mp.add_key_binding("ctrl+d", script_name, start_detect)

TOOLS/lua/autoload.lua

@@ -4,19 +4,8 @@
 -- alphabetically, and adds entries before and after the current file to
 -- the internal playlist. (It stops if the it would add an already existing
 -- playlist entry at the same position - this makes it "stable".)
--- Add at most 5000 * 2 files when starting a file (before + after).
-MAXENTRIES = 5000
-
-function Set (t)
-    local set = {}
-    for _, v in pairs(t) do set[v] = true end
-    return set
-end
-
-EXTENSIONS = Set {
-    'mkv', 'avi', 'mp4', 'ogv', 'webm', 'rmvb', 'flv', 'wmv', 'mpeg', 'mpg', 'm4v', '3gp',
-    'mp3', 'wav', 'ogv', 'flac', 'm4a', 'wma',
-}
+-- Add at most 5 * 2 files when starting a file (before + after).
+MAXENTRIES = 5
 
 mputils = require 'mp.utils'
 
@@ -25,24 +14,7 @@ function add_files_at(index, files)
     local oldcount = mp.get_property_number("playlist-count", 1)
     for i = 1, #files do
         mp.commandv("loadfile", files[i], "append")
-        mp.commandv("playlist-move", oldcount + i - 1, index + i - 1)
-    end
-end
-
-function get_extension(path)
-    match = string.match(path, "%.([^%.]+)$" )
-    if match == nil then
-        return "nomatch"
-    else
-        return match
-    end
-end
-
-table.filter = function(t, iter)
-    for i = #t, 1, -1 do
-        if not iter(t[i]) then
-            table.remove(t, i)
-        end
+        mp.commandv("playlist_move", oldcount + i - 1, index + i - 1)
     end
 end
 
@@ -52,38 +24,14 @@ function find_and_add_entries()
     if #dir == 0 then
         return
     end
-    local pl_count = mp.get_property_number("playlist-count", 1)
-    if (pl_count > 1 and autoload == nil) or
-       (pl_count == 1 and EXTENSIONS[string.lower(get_extension(filename))] == nil) then
-        return
-    else
-        autoload = true
-    end
-
     local files = mputils.readdir(dir, "files")
     if files == nil then
         return
     end
-    table.filter(files, function (v, k)
-        local ext = get_extension(v)
-        if ext == nil then
-            return false
-        end
-        return EXTENSIONS[string.lower(ext)]
-    end)
-    table.sort(files, function (a, b)
-        local len = string.len(a) - string.len(b)
-        if len ~= 0 then -- case for ordering filename ending with such as X.Y.Z
-            local ext = string.len(get_extension(a)) + 1
-            return string.sub(a, 1, -ext) < string.sub(b, 1, -ext)
-        end
-        return string.lower(a) < string.lower(b)
-    end)
-
+    table.sort(files)
     if dir == "." then
         dir = ""
     end
-
     local pl = mp.get_property_native("playlist", {})
     local pl_current = mp.get_property_number("playlist-pos", 0) + 1
     -- Find the current pl entry (dir+"/"+filename) in the sorted dir list
@@ -97,7 +45,6 @@ function find_and_add_entries()
     if current == nil then
         return
     end
-
     local append = {[-1] = {}, [1] = {}}
     for direction = -1, 1, 2 do -- 2 iterations, with direction = -1 and +1
         for i = 1, MAXENTRIES do
@@ -106,7 +53,6 @@ function find_and_add_entries()
             if file == nil or file[1] == "." then
                 break
             end
-
             local filepath = dir .. file
             if pl_e then
                 -- If there's a playlist entry, and it's the same file, stop.
@@ -114,7 +60,6 @@ function find_and_add_entries()
                     break
                 end
             end
-
             if direction == -1 then
                 if pl_current == 1 then -- never add additional entries in the middle
                     mp.msg.info("Prepending " .. file)
@@ -126,7 +71,6 @@ function find_and_add_entries()
             end
         end
     end
-
     add_files_at(pl_current + 1, append[1])
     add_files_at(pl_current, append[-1])
 end

TOOLS/lua/drc-control.lua

@@ -4,7 +4,7 @@
 -- parameters. See the entry for "drc" under the "AUDIO FILTERS"
 -- section of the man page for a complete description of the filter.
 --
--- This script registers the key-binding "\" to toggle the filter between
+-- This script registers the key-binding "\" to toggle the filter between 
 --
 -- * off
 -- * method=1 (single-sample smoothing)
@@ -92,7 +92,7 @@ function drc_quieter_handler()
     drc_scale_target(0.5)
 end
 
--- toggle between off, method 1 and method 2
+-- toggle between off, method 1 and method 2 
 mp.add_key_binding("\\", "drc_toggle_method", drc_toggle_method_handler)
 -- increase or decrease target volume
 mp.add_key_binding("ctrl+9", "drc_quieter", drc_quieter_handler)

TOOLS/lua/observe-all.lua

@@ -6,17 +6,9 @@
 
 local utils = require("mp.utils")
 
-function observe(name)
+for i,name in ipairs(mp.get_property_native("property-list")) do
     mp.observe_property(name, "native", function(name, val)
         print("property '" .. name .. "' changed to '" ..
               utils.to_string(val) .. "'")
     end)
 end
-
-for i,name in ipairs(mp.get_property_native("property-list")) do
-    observe(name)
-end
-
-for i,name in ipairs(mp.get_property_native("options")) do
-    observe("options/" .. name)
-end

TOOLS/lua/ontop-playback.lua

@@ -1,19 +0,0 @@
---makes mpv disable ontop when pausing and re-enable it again when resuming playback
---please note that this won't do anything if ontop was not enabled before pausing
-
-local was_ontop = false
-
-mp.observe_property("pause", "bool", function(name, value)
-    local ontop = mp.get_property_native("ontop")
-    if value then
-        if ontop then
-            mp.set_property_native("ontop", false)
-            was_ontop = true
-        end
-    else
-        if was_ontop and not ontop then
-            mp.set_property_native("ontop", true)
-        end
-        was_ontop = false
-    end
-end)

TOOLS/lua/pause-when-minimize.lua

@@ -2,6 +2,8 @@
 -- if it's brought back again. If the player was already paused when minimizing,
 -- then try not to mess with the pause state.
 
+-- Note: currently works with X11 only.
+
 local did_minimize = false
 
 mp.observe_property("window-minimized", "bool", function(name, value)

TOOLS/lua/status-line.lua

@@ -1,7 +1,5 @@
 -- Rebuild the terminal status line as a lua script
 -- Be aware that this will require more cpu power!
--- Also, this is based on a rather old version of the
--- builtin mpv status line.
 
 -- Add a string to the status line
 function atsl(s)
@@ -30,7 +28,7 @@ function update_status_line()
     atsl(mp.get_property_osd("time-pos"))
 
     atsl(" / ");
-    atsl(mp.get_property_osd("duration"));
+    atsl(mp.get_property_osd("length"));
 
     atsl(" (")
     atsl(mp.get_property_osd("percent-pos", -1))

TOOLS/matroska.pl

@@ -64,7 +64,7 @@ sub generate_c_header {
 
         # Output a counter variable for each element
         # (presence/absence for scalars, item count for arrays)
-        for my $subel (sort values %{$el->{subelements}}) {
+        for my $subel (values %{$el->{subelements}}) {
             print "    int n_$subel->{fieldname};\n"
         }
         print "};\n";

TOOLS/osxbundle.py

@@ -39,17 +39,8 @@ def apply_plist_template(plist_file, version):
     for line in fileinput.input(plist_file, inplace=1):
         print (line.rstrip().replace('${VERSION}', version))
 
-def bundle_version():
-    if os.path.exists('VERSION'):
-        x = open('VERSION')
-        version = x.read()
-        x.close()
-    else:
-        version = sh("./version.sh").strip()
-    return version
-
 def main():
-    version = bundle_version().rstrip()
+    version = sh("./version.sh --print").strip()
 
     usage = "usage: %prog [options] arg"
     parser = OptionParser(usage)

TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf

@@ -1 +1,3 @@
-player-operation-mode=pseudo-gui
+screenshot-template=~/Desktop/shot%n
+quiet
+idle=once

TOOLS/stats-conv.py

@@ -1,15 +1,11 @@
 #!/usr/bin/env python3
-from pyqtgraph.Qt import QtGui, QtCore
-import pyqtgraph as pg
+import matplotlib.pyplot as plot
 import sys
 import re
 
 filename = sys.argv[1]
 
-events = ".*"
-if len(sys.argv) > 2:
-    events = sys.argv[2]
-event_regex = re.compile(events)
+event_regex = re.compile(".*")
 
 """
 This script is meant to display stats written by mpv --dump-stats=filename.
@@ -30,8 +26,8 @@ Currently, the following event types are supported:
     'end' <name>                end of the named event
     'value' <float> <name>      a normal value (as opposed to event)
     'event-timed' <ts> <name>   singular event at the given timestamp
-    'value-timed' <ts> <float> <name>       a value for an event at the given timestamp
-    'range-timed' <ts1> <ts2> <name>        like start/end, but explicit times
+    'value-timed' <ts> <float> <name>
+                                a value for an event at the given timestamp
     <name>                      singular event (same as 'signal')
 
 """
@@ -39,8 +35,8 @@ Currently, the following event types are supported:
 class G:
     events = {}
     start = None
-    markers = ["o", "s", "t", "d"]
-    curveno = {}
+    # http://matplotlib.org/api/markers_api.html#module-matplotlib.markers
+    markers = ["o", "8", "s", "p", "*", "h", "+", "x", "D"]
 
 def find_marker():
     if len(G.markers) == 0:
@@ -66,10 +62,6 @@ def get_event(event, evtype):
         G.events[event] = e
     return G.events[event]
 
-colors = [(0.0, 0.5, 0.0), (0.0, 0.0, 1.0), (0.0, 0.0, 0.0), (1.0, 0.0, 0.0), (0.75, 0.75, 0), (0.0, 0.75, 0.75), (0.75, 0, 0.75)]
-def mkColor(t):
-    return pg.mkColor(int(t[0] * 255), int(t[1] * 255), int(t[2] * 255))
-
 SCALE = 1e6 # microseconds to seconds
 
 for line in [line.split("#")[0].strip() for line in open(filename, "r")]:
@@ -99,15 +91,6 @@ for line in [line.split("#")[0].strip() for line in open(filename, "r")]:
         val = int(val) / SCALE - G.start
         e = get_event(name, "event-signal")
         e.vals.append((val, 1))
-    elif event.startswith("range-timed "):
-        _, ts1, ts2, name = event.split(" ", 3)
-        ts1 = int(ts1) / SCALE - G.start
-        ts2 = int(ts2) / SCALE - G.start
-        e = get_event(name, "event")
-        e.vals.append((ts1, 0))
-        e.vals.append((ts1, 1))
-        e.vals.append((ts2, 1))
-        e.vals.append((ts2, 0))
     elif event.startswith("value-timed "):
         _, tsval, val, name = event.split(" ", 3)
         tsval = int(tsval) / SCALE - G.start
@@ -133,34 +116,20 @@ for e, index in zip(G.sevents, range(len(G.sevents))):
     else:
         e.vals = [(x, y * (m - index) / m) for (x, y) in e.vals]
 
-pg.setConfigOption('background', 'w')
-pg.setConfigOption('foreground', 'k')
-app = QtGui.QApplication([])
-win = pg.GraphicsWindow()
-#win.resize(1500, 900)
-
+fig = plot.figure()
+fig.hold(True)
 ax = [None, None]
 plots = 2 if hasval else 1
-ax[0] = win.addPlot()
+ax[0] = fig.add_subplot(plots, 1, 1)
 if hasval:
-    win.nextRow()
-    ax[1] = win.addPlot()
-    ax[1].setXLink(ax[0])
-for cur in ax:
-   if cur is not None:
-       cur.addLegend(offset = (-1, 1))
+    ax[1] = fig.add_subplot(plots, 1, 2, sharex=ax[0])
+legends = [[], []]
 for e in G.sevents:
     cur = ax[1 if e.type == "value" else 0]
-    if not cur in G.curveno:
-        G.curveno[cur] = 0
-    args = {'name': e.name,'antialias':True}
-    color = mkColor(colors[G.curveno[cur] % len(colors)])
+    pl, = cur.plot([x for x,y in e.vals], [y for x,y in e.vals], label=e.name)
     if e.type == "event-signal":
-        args['symbol'] = e.marker
-        args['symbolBrush'] = pg.mkBrush(color, width=0)
-    else:
-        args['pen'] = pg.mkPen(color, width=0)
-    G.curveno[cur] += 1
-    n = cur.plot([x for x,y in e.vals], [y for x,y in e.vals], **args)
-
-QtGui.QApplication.instance().exec_()
+        plot.setp(pl, marker = e.marker, linestyle = "None")
+for cur in ax:
+    if cur is not None:
+        cur.legend()
+plot.show()

TOOLS/travis-rebuild-website

@@ -1,29 +0,0 @@
-#!/bin/sh
-
-if [ "x$LIBAV" != "xffmpeg-git" ] || [ "x$TRAVIS_OS_NAME" != "xlinux" ]; then
-  # trigger build only on one of the matrix nodes
-  exit;
-fi
-
-if [ "x$TRAVIS_BRANCH" != "xmaster" ]; then
-  # only rebuild website with pushes to master
-  exit;
-fi
-
-TRAVIS_COMMIT_RANGE=${TRAVIS_COMMIT_RANGE:-HEAD^..}
-if git diff --quiet --name-only --exit-code "$TRAVIS_COMMIT_RANGE" DOCS/; then
-  exit;
-fi
-
-body='{
-"request": {
-  "branch":"master"
-}}'
-
-curl -s -X POST \
--H "Content-Type: application/json" \
--H "Accept: application/json" \
--H "Travis-API-Version: 3" \
--H "Authorization: token $WEBSITE_TRAVIS_TOKEN" \
--d "$body" \
-https://api.travis-ci.org/repo/mpv-player%2Fmpv.io/requests

TOOLS/umpv

@@ -21,7 +21,7 @@ script after that will start a new mpv instance.
 
 Note that you can control the mpv instance by writing to the command fifo:
 
-    echo "cycle fullscreen" > ~/.umpv_fifo
+    echo "cycle fullscreen" > ~/.umpv-fifo
 
 Note: you can supply custom mpv path and options with the MPV environment
       variable. The environment variable will be split on whitespace, and the

TOOLS/youtube-dl_mpv.sh

@@ -0,0 +1,22 @@
+#!/bin/sh
+# Example of script for using mpv with youtube-dl
+set -e
+
+cookies_dir="$(mktemp -d /tmp/youtube-dl_mpv.XXXX)"
+cookies_file="${cookies_dir}/cookies"
+user_agent="$(youtube-dl --dump-user-agent)" # or set whatever you want
+
+video_url=$(youtube-dl \
+    --user-agent="${user_agent}" \
+    --cookies="${cookies_file}" \
+    --get-url \
+    "$@")
+
+set -f
+${MPV:-mpv} \
+    --cookies \
+    --cookies-file="${cookies_file}" \
+    --user-agent="${user_agent}" \
+    -- ${video_url}
+
+rm -rf "${cookies_dir}"

TOOLS/zsh.pl

@@ -4,21 +4,18 @@
 
 use strict;
 use warnings;
-use warnings FATAL => 'uninitialized';
 
 my $mpv = $ARGV[0] || 'mpv';
 
-my @opts = parse_main_opts('--list-options', '^ (\-\-[^\s\*]*)\*?\s*(.*)');
+my @opts = parse_main_opts("$mpv --list-options", '^ (\-\-[^\s\*]*)\*?\s*(.*)');
 
-die "Couldn't find any options" unless (@opts);
+my @ao = parse_opts("$mpv --ao=help", '^  ([^\s\:]*)\s*: (.*)');
+my @vo = parse_opts("$mpv --vo=help", '^  ([^\s\:]*)\s*: (.*)');
 
-my @ao = parse_opts('--ao=help', '^  ([^\s\:]*)\s*: (.*)');
-my @vo = parse_opts('--vo=help', '^  ([^\s\:]*)\s*: (.*)');
+my @af = parse_opts("$mpv --af=help", '^  ([^\s\:]*)\s*: (.*)');
+my @vf = parse_opts("$mpv --vf=help", '^  ([^\s\:]*)\s*: (.*)');
 
-my @af = parse_opts('--af=help', '^  ([^\s\:]*)\s*: (.*)');
-my @vf = parse_opts('--vf=help', '^  ([^\s\:]*)\s*: (.*)');
-
-my @protos = parse_opts('--list-protocols', '^ ([^\s]*)');
+my @protos = parse_opts("$mpv --list-protocols", '^ ([^\s]*)');
 
 my ($opts_str, $ao_str, $vo_str, $af_str, $vf_str, $protos_str);
 
@@ -37,70 +34,47 @@ chomp $af_str;
 $vf_str .= qq{      '$_' \\\n} foreach (@vf);
 chomp $vf_str;
 
-$protos_str = join(' ', @protos);
+$protos_str .= qq{$_ } foreach (@protos);
+chomp $protos_str;
 
-my $runtime_completions = <<'EOS';
-  profile|show-profile)
-    local -a profiles
-    local current
-    for current in "${(@f)$($words[1] --profile=help)}"; do
-      current=${current//\*/\\\*}
-      current=${current//\:/\\\:}
-      current=${current//\[/\\\[}
-      current=${current//\]/\\\]}
-      if [[ $current =~ $'\t'([^$'\t']*)$'\t'(.*) ]]; then
-        if [[ -n $match[2] ]]; then
-          current="$match[1][$match[2]]"
-        else
-          current="$match[1]"
+my $profile_comp = <<'EOS';
+      local -a profiles
+      local current
+      for current in "${(@f)$($words[1] --profile=help)}"; do
+        current=${current//\*/\\\*}
+        current=${current//\:/\\\:}
+        current=${current//\[/\\\[}
+        current=${current//\]/\\\]}
+        if [[ $current =~ $'\t'([^$'\t']*)$'\t'(.*) ]]; then
+          if [[ -n $match[2] ]]; then
+            current="$match[1][$match[2]]"
+          else
+            current="$match[1]"
+          fi
+          profiles=($profiles $current)
         fi
-        profiles=($profiles $current)
+      done
+      if [[ $state == show-profile ]]; then
+        # For --show-profile, only one allowed
+        if (( ${#profiles} > 0 )); then
+          _values 'profile' $profiles && rc=0
+        fi
+      else
+        # For --profile, multiple allowed
+        profiles=($profiles 'help[list profiles]')
+        _values -s , 'profile(s)' $profiles && rc=0
       fi
-    done
-    if [[ $state == show-profile ]]; then
-      # For --show-profile, only one allowed
-      if (( ${#profiles} > 0 )); then
-        _values 'profile' $profiles && rc=0
-      fi
-    else
-      # For --profile, multiple allowed
-      profiles=($profiles 'help[list profiles]')
-      _values -s , 'profile(s)' $profiles && rc=0
-    fi
-  ;;
-
-  audio-device)
-    local -a audio_devices
-    local current
-    for current in "${(@f)$($words[1] --audio-device=help)}"; do
-      current=${current//\*/\\\*}
-      current=${current//\:/\\\:}
-      current=${current//\[/\\\[}
-      current=${current//\]/\\\]}
-      if [[ $current =~ '  '\'([^\']*)\'' \('(.*)'\)' ]]; then
-        audio_devices=($audio_devices "$match[1][$match[2]]")
-      fi
-    done
-    audio_devices=($audio_devices 'help[list audio devices]')
-    _values 'audio device' $audio_devices && rc=0
-  ;;
 EOS
-chomp $runtime_completions;
+chomp $profile_comp;
 
 my $tmpl = <<"EOS";
 #compdef mpv
 
-# For customization, see:
-#  https://github.com/mpv-player/mpv/wiki/Zsh-completion-customization
+# mpv zsh completion
 
 local curcontext="\$curcontext" state state_descr line
 typeset -A opt_args
 
-# By default, don't complete URLs unless no files match
-local -a tag_order
-zstyle -a ":completion:*:*:\$service:*" tag-order tag_order || \
-  zstyle  ":completion:*:*:\$service:*" tag-order '!urls'
-
 local rc=1
 
 _arguments -C -S \\
@@ -109,30 +83,44 @@ $opts_str
 
 case \$state in
   ao)
-    _values -s , 'audio outputs' \\
+    local -a values
+    values=(
 $ao_str
-    && rc=0
+    )
+
+    _describe -t values 'audio outputs' values && rc=0
   ;;
 
   vo)
-    _values -s , 'video outputs' \\
+    local -a values
+    values=(
 $vo_str
-    && rc=0
+    )
+
+    _describe -t values 'video outputs' values && rc=0
   ;;
 
   af)
-    _values -s , 'audio filters' \\
+    local -a values
+    values=(
 $af_str
-    && rc=0
+    )
+
+    _describe -t values 'audio filters' values && rc=0
   ;;
 
   vf)
-    _values -s , 'video filters' \\
+    local -a values
+    values=(
 $vf_str
-    && rc=0
+    )
+
+    _describe -t values 'video filters' values && rc=0
   ;;
 
-$runtime_completions
+  profile|show-profile)
+$profile_comp
+  ;;
 
   files)
     compset -P '*,'
@@ -144,7 +132,8 @@ $runtime_completions
     local expl
     _tags files urls
     while _tags; do
-      _requested files expl 'media file' _files && rc=0
+      _requested files expl 'media file' _files -g \\
+        "*.(#i)(asf|asx|avi|flac|flv|m1v|m2p|m2v|m4v|mjpg|mka|mkv|mov|mp3|mp4|mpe|mpeg|mpg|ogg|ogm|ogv|qt|rm|ts|vob|wav|webm|wma|wmv)(-.)" && rc=0
       if _requested urls; then
         while _next_label urls expl URL; do
           _urls "\$expl[@]" && rc=0
@@ -165,7 +154,7 @@ sub parse_main_opts {
     my ($cmd, $regex) = @_;
 
     my @list;
-    my @lines = call_mpv($cmd);
+    my @lines = split /\n/, `$cmd`;
 
     foreach my $line (@lines) {
         my ($name, $desc) = ($line =~ /^$regex/) or next;
@@ -207,7 +196,7 @@ sub parse_main_opts {
                 }
             } elsif ($line =~ /\[file\]/) {
                 $entry .= '->files';
-            } elsif ($name =~ /^--(ao|vo|af|vf|profile|show-profile|audio-device)$/) {
+            } elsif ($name =~ /^--(ao|vo|af|vf|profile|show-profile)$/) {
                 $entry .= "->$1";
             }
             push @list, $entry;
@@ -230,7 +219,7 @@ sub parse_opts {
     my ($cmd, $regex) = @_;
 
     my @list;
-    my @lines = call_mpv($cmd);
+    my @lines = split /\n/, `$cmd`;
 
     foreach my $line (@lines) {
         if ($line !~ /^$regex/) {
@@ -242,7 +231,7 @@ sub parse_opts {
         if (defined $2) {
             my $desc = $2;
             $desc =~ s/\:/\\:/g;
-            $entry .= "[$desc]";
+            $entry .= ':' . $desc;
         }
 
         push @list, $entry
@@ -250,14 +239,3 @@ sub parse_opts {
 
     return @list;
 }
-
-sub call_mpv {
-    my ($cmd) = @_;
-    my $output = `"$mpv" --no-config $cmd`;
-    if ($? == -1) {
-        die "Could not run mpv: $!";
-    } elsif ((my $exit_code = $? >> 8) != 0) {
-        die "mpv returned $exit_code with output:\n$output";
-    }
-    return split /\n/, $output;
-}

VERSION

@@ -1 +1 @@
-0.21.0
+0.8.2

appveyor.yml

@@ -1,29 +0,0 @@
-branches:
-  only:
-    - master
-    - appveyor
-
-environment:
-  matrix:
-    - MSYSTEM: MINGW64
-    - MSYSTEM: MINGW32
-
-shallow_clone: true
-test: off
-
-install:
-  # Update core packages
-  - C:\msys64\usr\bin\pacman -Syyuu --noconfirm
-  # Update non-core packages
-  - C:\msys64\usr\bin\pacman -Suu --noconfirm
-  # Install required MSYS2 packages
-  - C:\msys64\usr\bin\pacman -S --noconfirm --needed perl python pkg-config
-  # Now MSYS2 is up to date, do the rest of the install from a bash script
-  - C:\msys64\usr\bin\bash -lc "cd \"$APPVEYOR_BUILD_FOLDER\" && exec ./TOOLS/appveyor-install.sh"
-build_script:
-  - C:\msys64\usr\bin\bash -lc "cd \"$APPVEYOR_BUILD_FOLDER\" && exec ./TOOLS/appveyor-build.sh"
-on_failure:
-  - type "%APPVEYOR_BUILD_FOLDER%\build\config.log"
-
-cache:
-  - C:\msys64\var\cache\pacman\pkg

audio/audio.c

@@ -22,10 +22,9 @@
 
 #include <libavutil/buffer.h>
 #include <libavutil/frame.h>
-#include <libavutil/mem.h>
 #include <libavutil/version.h>
 
-#include "mpv_talloc.h"
+#include "talloc.h"
 #include "common/common.h"
 #include "fmt-conversion.h"
 #include "audio.h"
@@ -35,7 +34,7 @@ static void update_redundant_info(struct mp_audio *mpa)
     assert(mp_chmap_is_empty(&mpa->channels) ||
            mp_chmap_is_valid(&mpa->channels));
     mpa->nch = mpa->channels.num;
-    mpa->bps = af_fmt_to_bytes(mpa->format);
+    mpa->bps = af_fmt2bps(mpa->format);
     if (af_fmt_is_planar(mpa->format)) {
         mpa->spf = 1;
         mpa->num_planes = mpa->nch;
@@ -59,6 +58,13 @@ void mp_audio_set_num_channels(struct mp_audio *mpa, int num_channels)
     update_redundant_info(mpa);
 }
 
+// Use old MPlayer/ALSA channel layout.
+void mp_audio_set_channels_old(struct mp_audio *mpa, int num_channels)
+{
+    mp_chmap_from_channels_alsa(&mpa->channels, num_channels);
+    update_redundant_info(mpa);
+}
+
 void mp_audio_set_channels(struct mp_audio *mpa, const struct mp_chmap *chmap)
 {
     mpa->channels = *chmap;
@@ -87,13 +93,9 @@ bool mp_audio_config_valid(const struct mp_audio *mpa)
 
 char *mp_audio_config_to_str_buf(char *buf, size_t buf_sz, struct mp_audio *mpa)
 {
-    char ch[128];
-    mp_chmap_to_str_buf(ch, sizeof(ch), &mpa->channels);
-    char *hr_ch = mp_chmap_to_str_hr(&mpa->channels);
-    if (strcmp(hr_ch, ch) != 0)
-        mp_snprintf_cat(ch, sizeof(ch), " (%s)", hr_ch);
     snprintf(buf, buf_sz, "%dHz %s %dch %s", mpa->rate,
-             ch, mpa->channels.num, af_fmt_to_str(mpa->format));
+             mp_chmap_to_str(&mpa->channels), mpa->channels.num,
+             af_fmt_to_str(mpa->format));
     return buf;
 }
 
@@ -138,9 +140,6 @@ static void mp_audio_destructor(void *ptr)
  * available on every plane. The previous data is kept (for the smallest
  * common number of samples before/after resize).
  *
- * This also makes sure the resulting buffer is writable (even in the case
- * the buffer has the correct size).
- *
  * mpa->samples is not set or used.
  *
  * This function is flexible enough to handle format and channel layout
@@ -156,18 +155,12 @@ void mp_audio_realloc(struct mp_audio *mpa, int samples)
     int size = get_plane_size(mpa, samples);
     if (size < 0)
         abort(); // oom or invalid parameters
-    if (!mp_audio_is_writeable(mpa)) {
-        for (int n = 0; n < MP_NUM_CHANNELS; n++) {
-            av_buffer_unref(&mpa->allocated[n]);
-            mpa->planes[n] = NULL;
-        }
-    }
     for (int n = 0; n < mpa->num_planes; n++) {
         if (!mpa->allocated[n] || size != mpa->allocated[n]->size) {
             if (av_buffer_realloc(&mpa->allocated[n], size) < 0)
                 abort(); // OOM
+            mpa->planes[n] = mpa->allocated[n]->data;
         }
-        mpa->planes[n] = mpa->allocated[n]->data;
     }
     for (int n = mpa->num_planes; n < MP_NUM_CHANNELS; n++) {
         av_buffer_unref(&mpa->allocated[n]);
@@ -180,7 +173,7 @@ void mp_audio_realloc(struct mp_audio *mpa, int samples)
 // If the buffer is reallocated, also preallocate.
 void mp_audio_realloc_min(struct mp_audio *mpa, int samples)
 {
-    if (samples > mp_audio_get_allocated_size(mpa) || !mp_audio_is_writeable(mpa)) {
+    if (samples > mp_audio_get_allocated_size(mpa)) {
         size_t alloc = ta_calc_prealloc_elems(samples);
         if (alloc > INT_MAX)
             abort(); // oom
@@ -198,18 +191,8 @@ int mp_audio_get_allocated_size(struct mp_audio *mpa)
 {
     int size = 0;
     for (int n = 0; n < mpa->num_planes; n++) {
-        for (int i = 0; i < MP_NUM_CHANNELS && mpa->allocated[i]; i++) {
-            uint8_t *start = mpa->allocated[i]->data;
-            uint8_t *end = start + mpa->allocated[i]->size;
-            uint8_t *plane = mpa->planes[n];
-            if (plane >= start && plane < end) {
-                int s = MPMIN((end - plane) / mpa->sstride, INT_MAX);
-                size = n == 0 ? s : MPMIN(size, s);
-                goto next;
-            }
-        }
-        return 0; // plane is not covered by any buffer
-    next: ;
+        int s = mpa->allocated[n] ? mpa->allocated[n]->size / mpa->sstride : 0;
+        size = n == 0 ? s : MPMIN(size, s);
     }
     return size;
 }
@@ -261,51 +244,8 @@ void mp_audio_skip_samples(struct mp_audio *data, int samples)
         data->planes[n] = (uint8_t *)data->planes[n] + samples * data->sstride;
 
     data->samples -= samples;
-
-    if (data->pts != MP_NOPTS_VALUE)
-        data->pts += samples / (double)data->rate;
 }
 
-// Return the timestamp of the sample just after the end of this frame.
-double mp_audio_end_pts(struct mp_audio *f)
-{
-    if (f->pts == MP_NOPTS_VALUE || f->rate < 1)
-        return MP_NOPTS_VALUE;
-    return f->pts + f->samples / (double)f->rate;
-}
-
-// Clip the given frame to the given timestamp range. Adjusts the frame size
-// and timestamp.
-void mp_audio_clip_timestamps(struct mp_audio *f, double start, double end)
-{
-    double f_end = mp_audio_end_pts(f);
-    if (f_end == MP_NOPTS_VALUE)
-        return;
-    if (end != MP_NOPTS_VALUE) {
-        if (f_end >= end) {
-            if (f->pts >= end) {
-                f->samples = 0;
-            } else {
-                int new = (end - f->pts) * f->rate;
-                f->samples = MPCLAMP(new, 0, f->samples);
-            }
-        }
-    }
-    if (start != MP_NOPTS_VALUE) {
-        if (f->pts < start) {
-            if (f_end <= start) {
-                f->samples = 0;
-                f->pts = f_end;
-            } else {
-                int skip = (start - f->pts) * f->rate;
-                skip = MPCLAMP(skip, 0, f->samples);
-                mp_audio_skip_samples(f, skip);
-            }
-        }
-    }
-}
-
-
 // Return false if the frame data is shared, true otherwise.
 // Will return true for non-refcounted frames.
 bool mp_audio_is_writeable(struct mp_audio *data)
@@ -356,9 +296,9 @@ struct mp_audio *mp_audio_from_avframe(struct AVFrame *avframe)
     mp_chmap_from_lavc(&lavc_chmap, avframe->channel_layout);
 
 #if LIBAVUTIL_VERSION_MICRO >= 100
-    // FFmpeg being stupid POS again
-    if (lavc_chmap.num != av_frame_get_channels(avframe))
-        mp_chmap_from_channels(&lavc_chmap, av_frame_get_channels(avframe));
+    // FFmpeg being special again
+    if (lavc_chmap.num != avframe->channels)
+        mp_chmap_from_channels(&lavc_chmap, avframe->channels);
 #endif
 
     new->rate = avframe->sample_rate;
@@ -376,23 +316,21 @@ struct mp_audio *mp_audio_from_avframe(struct AVFrame *avframe)
     }
 
     // If we can't handle the format (e.g. too many channels), bail out.
-    if (!mp_audio_config_valid(new))
+    if (!mp_audio_config_valid(new) || avframe->nb_extended_buf)
         goto fail;
 
-    for (int n = 0; n < AV_NUM_DATA_POINTERS + avframe->nb_extended_buf; n++) {
-        AVBufferRef *buf = n < AV_NUM_DATA_POINTERS ? avframe->buf[n]
-                            : avframe->extended_buf[n - AV_NUM_DATA_POINTERS];
-        if (!buf)
+    for (int n = 0; n < AV_NUM_DATA_POINTERS; n++) {
+        if (!avframe->buf[n])
             break;
         if (n >= MP_NUM_CHANNELS)
             goto fail;
-        new->allocated[n] = av_buffer_ref(buf);
+        new->allocated[n] = av_buffer_ref(avframe->buf[n]);
         if (!new->allocated[n])
             goto fail;
     }
 
     for (int n = 0; n < new->num_planes; n++)
-        new->planes[n] = avframe->extended_data[n];
+        new->planes[n] = avframe->data[n];
     new->samples = avframe->nb_samples;
 
     return new;
@@ -403,92 +341,6 @@ fail:
     return NULL;
 }
 
-int mp_audio_to_avframe(struct mp_audio *frame, struct AVFrame *avframe)
-{
-    av_frame_unref(avframe);
-
-    avframe->nb_samples = frame->samples;
-    avframe->format = af_to_avformat(frame->format);
-    if (avframe->format == AV_SAMPLE_FMT_NONE)
-        goto fail;
-
-    avframe->channel_layout = mp_chmap_to_lavc(&frame->channels);
-    if (!avframe->channel_layout)
-        goto fail;
-#if LIBAVUTIL_VERSION_MICRO >= 100
-    // FFmpeg being a stupid POS again
-    av_frame_set_channels(avframe, frame->channels.num);
-#endif
-    avframe->sample_rate = frame->rate;
-
-    if (frame->num_planes > AV_NUM_DATA_POINTERS) {
-        avframe->extended_data =
-            av_mallocz_array(frame->num_planes, sizeof(avframe->extended_data[0]));
-        int extbufs = frame->num_planes - AV_NUM_DATA_POINTERS;
-        avframe->extended_buf =
-            av_mallocz_array(extbufs, sizeof(avframe->extended_buf[0]));
-        if (!avframe->extended_data || !avframe->extended_buf)
-            goto fail;
-        avframe->nb_extended_buf = extbufs;
-    }
-
-    for (int p = 0; p < frame->num_planes; p++)
-        avframe->extended_data[p] = frame->planes[p];
-    avframe->linesize[0] = frame->samples * frame->sstride;
-
-    for (int p = 0; p < AV_NUM_DATA_POINTERS; p++)
-        avframe->data[p] = avframe->extended_data[p];
-
-    for (int p = 0; p < frame->num_planes; p++) {
-        if (!frame->allocated[p])
-            break;
-        AVBufferRef *nref = av_buffer_ref(frame->allocated[p]);
-        if (!nref)
-            goto fail;
-        if (p < AV_NUM_DATA_POINTERS) {
-            avframe->buf[p] = nref;
-        } else {
-            avframe->extended_buf[p - AV_NUM_DATA_POINTERS] = nref;
-        }
-    }
-
-    // Force refcounted frame.
-    if (!avframe->buf[0]) {
-        AVFrame *tmp = av_frame_alloc();
-        if (!tmp)
-            goto fail;
-        if (av_frame_ref(tmp, avframe) < 0)
-            goto fail;
-        av_frame_free(&avframe);
-        avframe = tmp;
-    }
-
-    return 0;
-
-fail:
-    av_frame_unref(avframe);
-    return -1;
-}
-
-// Returns NULL on failure. The input is always unreffed.
-struct AVFrame *mp_audio_to_avframe_and_unref(struct mp_audio *frame)
-{
-    struct AVFrame *avframe = av_frame_alloc();
-    if (!avframe)
-        goto fail;
-
-    if (mp_audio_to_avframe(frame, avframe) < 0)
-        goto fail;
-
-    talloc_free(frame);
-    return avframe;
-
-fail:
-    av_frame_free(&avframe);
-    talloc_free(frame);
-    return NULL;
-}
-
 struct mp_audio_pool {
     AVBufferPool *avpool;
     int element_size;

audio/audio.h

@@ -35,19 +35,15 @@ struct mp_audio {
     int nch;            // number of channels (redundant with chmap)
     int spf;            // sub-samples per sample on each plane
     int num_planes;     // number of planes
-    int bps;            // size of sub-samples (af_fmt_to_bytes(format))
+    int bps;            // size of sub-samples (af_fmt2bps(format))
 
-    double pts;         // currently invalid within the filter chain
-
-    // --- private
-    // These do not necessarily map directly to planes[]. They can have
-    // different order or count. There shouldn't be more buffers than planes.
-    // If allocated[n] is NULL, allocated[n+1] must also be NULL.
+    // private
     struct AVBufferRef *allocated[MP_NUM_CHANNELS];
 };
 
 void mp_audio_set_format(struct mp_audio *mpa, int format);
 void mp_audio_set_num_channels(struct mp_audio *mpa, int num_channels);
+void mp_audio_set_channels_old(struct mp_audio *mpa, int num_channels);
 void mp_audio_set_channels(struct mp_audio *mpa, const struct mp_chmap *chmap);
 void mp_audio_copy_config(struct mp_audio *dst, const struct mp_audio *src);
 bool mp_audio_config_equals(const struct mp_audio *a, const struct mp_audio *b);
@@ -72,16 +68,12 @@ void mp_audio_copy(struct mp_audio *dst, int dst_offset,
                    struct mp_audio *src, int src_offset, int length);
 void mp_audio_copy_attributes(struct mp_audio *dst, struct mp_audio *src);
 void mp_audio_skip_samples(struct mp_audio *data, int samples);
-void mp_audio_clip_timestamps(struct mp_audio *f, double start, double end);
-double mp_audio_end_pts(struct mp_audio *data);
 
 bool mp_audio_is_writeable(struct mp_audio *data);
 int mp_audio_make_writeable(struct mp_audio *data);
 
 struct AVFrame;
 struct mp_audio *mp_audio_from_avframe(struct AVFrame *avframe);
-struct AVFrame *mp_audio_to_avframe_and_unref(struct mp_audio *frame);
-int mp_audio_to_avframe(struct mp_audio *frame, struct AVFrame *avframe);
 
 struct mp_audio_pool;
 struct mp_audio_pool *mp_audio_pool_create(void *ta_parent);

audio/audio_buffer.c

@@ -1,18 +1,18 @@
 /*
  * This file is part of mpv.
  *
- * mpv is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * mpv is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * mpv is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with mpv.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License along
+ * with mpv.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <stddef.h>
@@ -119,15 +119,6 @@ void mp_audio_buffer_prepend_silence(struct mp_audio_buffer *ab, int samples)
     mp_audio_fill_silence(ab->buffer, 0, samples);
 }
 
-void mp_audio_buffer_duplicate(struct mp_audio_buffer *ab, int samples)
-{
-    assert(samples >= 0 && samples <= ab->buffer->samples);
-    int oldlen = ab->buffer->samples;
-    ab->buffer->samples += samples;
-    mp_audio_realloc_min(ab->buffer, ab->buffer->samples);
-    mp_audio_copy(ab->buffer, oldlen, ab->buffer, oldlen - samples, samples);
-}
-
 // Get the start of the current readable buffer.
 void mp_audio_buffer_peek(struct mp_audio_buffer *ab, struct mp_audio *out_mpa)
 {

audio/audio_buffer.h

@@ -1,18 +1,18 @@
 /*
  * This file is part of mpv.
  *
- * mpv is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * mpv is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * mpv is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with mpv.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License along
+ * with mpv.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef MP_AUDIO_BUFFER_H
@@ -35,7 +35,6 @@ void mp_audio_buffer_get_write_buffer(struct mp_audio_buffer *ab, int minsamples
 void mp_audio_buffer_finish_write(struct mp_audio_buffer *ab, int samples);
 void mp_audio_buffer_append(struct mp_audio_buffer *ab, struct mp_audio *mpa);
 void mp_audio_buffer_prepend_silence(struct mp_audio_buffer *ab, int samples);
-void mp_audio_buffer_duplicate(struct mp_audio_buffer *ab, int samples);
 void mp_audio_buffer_peek(struct mp_audio_buffer *ab, struct mp_audio *out_mpa);
 void mp_audio_buffer_skip(struct mp_audio_buffer *ab, int samples);
 void mp_audio_buffer_clear(struct mp_audio_buffer *ab);

audio/chmap.c

@@ -1,25 +1,23 @@
 /*
  * This file is part of mpv.
  *
- * mpv is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * mpv is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * mpv is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with mpv.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License along
+ * with mpv.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <stdlib.h>
 #include <assert.h>
 
-#include <libavutil/common.h>
-
 #include "common/common.h"
 #include "common/msg.h"
 #include "chmap.h"
@@ -52,7 +50,6 @@ static const char *const speaker_names[MP_SPEAKER_ID_COUNT][2] = {
     [MP_SPEAKER_ID_SDL]         = {"sdl",  "surround direct left"},
     [MP_SPEAKER_ID_SDR]         = {"sdr",  "surround direct right"},
     [MP_SPEAKER_ID_LFE2]        = {"lfe2", "low frequency 2"},
-    [MP_SPEAKER_ID_NA]          = {"na",   "not available"},
 };
 
 // Names taken from libavutil/channel_layout.c (Not accessible by API.)
@@ -60,9 +57,7 @@ static const char *const speaker_names[MP_SPEAKER_ID_COUNT][2] = {
 static const char *const std_layout_names[][2] = {
     {"empty",           ""}, // not in lavc
     {"mono",            "fc"},
-    {"1.0",             "fc"}, // not in lavc
     {"stereo",          "fl-fr"},
-    {"2.0",             "fl-fr"}, // not in lavc
     {"2.1",             "fl-fr-lfe"},
     {"3.0",             "fl-fr-fc"},
     {"3.0(back)",       "fl-fr-bc"},
@@ -70,7 +65,6 @@ static const char *const std_layout_names[][2] = {
     {"quad",            "fl-fr-bl-br"},
     {"quad(side)",      "fl-fr-sl-sr"},
     {"3.1",             "fl-fr-fc-lfe"},
-    {"3.1(back)",       "fl-fr-lfe-bc"}, // not in lavc
     {"5.0",             "fl-fr-fc-bl-br"},
     {"5.0(alsa)",       "fl-fr-bl-br-fc"}, // not in lavc
     {"5.0(side)",       "fl-fr-fc-sl-sr"},
@@ -84,23 +78,21 @@ static const char *const std_layout_names[][2] = {
     {"hexagonal",       "fl-fr-fc-bl-br-bc"},
     {"6.1",             "fl-fr-fc-lfe-bc-sl-sr"},
     {"6.1(back)",       "fl-fr-fc-lfe-bl-br-bc"}, // lavc calls this "6.1" too
-    {"6.1(top)",        "fl-fr-fc-lfe-bl-br-tc"}, // not in lavc
     {"6.1(front)",      "fl-fr-lfe-flc-frc-sl-sr"},
     {"7.0",             "fl-fr-fc-bl-br-sl-sr"},
     {"7.0(front)",      "fl-fr-fc-flc-frc-sl-sr"},
-    {"7.0(rear)",       "fl-fr-fc-bl-br-sdl-sdr"}, // not in lavc
     {"7.1",             "fl-fr-fc-lfe-bl-br-sl-sr"},
     {"7.1(alsa)",       "fl-fr-bl-br-fc-lfe-sl-sr"}, // not in lavc
     {"7.1(wide)",       "fl-fr-fc-lfe-bl-br-flc-frc"},
     {"7.1(wide-side)",  "fl-fr-fc-lfe-flc-frc-sl-sr"},
-    {"7.1(rear)",       "fl-fr-fc-lfe-bl-br-sdl-sdr"}, // not in lavc
+    {"7.1(rear)",       "fl-fr-fc-lfe-bl-br-sdl-sdr"},
     {"octagonal",       "fl-fr-fc-bl-br-bc-sl-sr"},
     {"downmix",         "dl-dr"},
     {"auto",            ""}, // not in lavc
     {0}
 };
 
-static const struct mp_chmap default_layouts[] = {
+static const struct mp_chmap default_layouts[MP_NUM_CHANNELS + 1] = {
     {0},                                        // empty
     MP_CHMAP_INIT_MONO,                         // mono
     MP_CHMAP2(FL, FR),                          // stereo
@@ -112,6 +104,19 @@ static const struct mp_chmap default_layouts[] = {
     MP_CHMAP8(FL, FR, FC, LFE, BL, BR, SL, SR), // 7.1
 };
 
+// The channel order was lavc/waveex, but differs from lavc for 5, 6 and 8
+// channels. 3 and 7 channels were likely undefined (no ALSA support).
+// I'm not sure about the 4 channel case: ALSA uses "quad", while the ffmpeg
+// default layout is "4.0".
+static const char *const mplayer_layouts[MP_NUM_CHANNELS + 1] = {
+    [1] = "mono",
+    [2] = "stereo",
+    [4] = "quad",
+    [5] = "5.0(alsa)",
+    [6] = "5.1(alsa)",
+    [8] = "7.1(alsa)",
+};
+
 // Returns true if speakers are mapped uniquely, and there's at least 1 channel.
 bool mp_chmap_is_valid(const struct mp_chmap *src)
 {
@@ -120,8 +125,7 @@ bool mp_chmap_is_valid(const struct mp_chmap *src)
         int sp = src->speaker[n];
         if (sp >= MP_SPEAKER_ID_COUNT || mapped[sp])
             return false;
-        if (sp != MP_SPEAKER_ID_NA)
-            mapped[sp] = true;
+        mapped[sp] = true;
     }
     return src->num > 0;
 }
@@ -136,10 +140,12 @@ bool mp_chmap_is_empty(const struct mp_chmap *src)
 bool mp_chmap_is_unknown(const struct mp_chmap *src)
 {
     for (int n = 0; n < src->num; n++) {
-        if (src->speaker[n] != MP_SPEAKER_ID_NA)
-            return false;
+        int speaker = src->speaker[n];
+        if (speaker >= MP_SPEAKER_ID_UNKNOWN0 &&
+            speaker <= MP_SPEAKER_ID_UNKNOWN_LAST)
+            return true;
     }
-    return mp_chmap_is_valid(src);
+    return false;
 }
 
 // Note: empty channel maps compare as equal. Invalid ones can equal too.
@@ -163,6 +169,15 @@ bool mp_chmap_equals_reordered(const struct mp_chmap *a, const struct mp_chmap *
     return mp_chmap_equals(&t1, &t2);
 }
 
+bool mp_chmap_is_compatible(const struct mp_chmap *a, const struct mp_chmap *b)
+{
+    if (mp_chmap_equals(a, b))
+        return true;
+    if (a->num == b->num && (mp_chmap_is_unknown(a) || mp_chmap_is_unknown(b)))
+        return true;
+    return false;
+}
+
 bool mp_chmap_is_stereo(const struct mp_chmap *src)
 {
     static const struct mp_chmap stereo = MP_CHMAP_INIT_STEREO;
@@ -182,43 +197,34 @@ void mp_chmap_reorder_norm(struct mp_chmap *map)
     qsort(arr, map->num, 1, comp_uint8);
 }
 
-// Remove silent (NA) channels, if any.
-void mp_chmap_remove_na(struct mp_chmap *map)
-{
-    struct mp_chmap new = {0};
-    for (int n = 0; n < map->num; n++) {
-        int sp = map->speaker[n];
-        if (sp != MP_SPEAKER_ID_NA)
-            new.speaker[new.num++] = map->speaker[n];
-    }
-    *map = new;
-}
-
-// Add silent (NA) channels to map until map->num >= num.
-void mp_chmap_fill_na(struct mp_chmap *map, int num)
-{
-    assert(num <= MP_NUM_CHANNELS);
-    while (map->num < num)
-        map->speaker[map->num++] = MP_SPEAKER_ID_NA;
-}
-
 // Set *dst to a standard layout with the given number of channels.
 // If the number of channels is invalid, an invalid map is set, and
 // mp_chmap_is_valid(dst) will return false.
 void mp_chmap_from_channels(struct mp_chmap *dst, int num_channels)
 {
-    *dst = (struct mp_chmap) {0};
-    if (num_channels >= 0 && num_channels < MP_ARRAY_SIZE(default_layouts))
+    if (num_channels < 0 || num_channels > MP_NUM_CHANNELS) {
+        *dst = (struct mp_chmap) {0};
+    } else {
         *dst = default_layouts[num_channels];
-    if (!dst->num)
-        mp_chmap_set_unknown(dst, num_channels);
+    }
+}
+
+// Try to do what mplayer/mplayer2/mpv did before channel layouts were
+// introduced, i.e. get the old default channel order.
+void mp_chmap_from_channels_alsa(struct mp_chmap *dst, int num_channels)
+{
+    if (num_channels < 0 || num_channels > MP_NUM_CHANNELS) {
+        *dst = (struct mp_chmap) {0};
+    } else {
+        mp_chmap_from_str(dst, bstr0(mplayer_layouts[num_channels]));
+        if (!dst->num)
+            mp_chmap_from_channels(dst, num_channels);
+    }
 }
 
 // Set *dst to an unknown layout for the given numbers of channels.
 // If the number of channels is invalid, an invalid map is set, and
 // mp_chmap_is_valid(dst) will return false.
-// A mp_chmap with all entries set to NA is treated specially in some
-// contexts (watch out for mp_chmap_is_unknown()).
 void mp_chmap_set_unknown(struct mp_chmap *dst, int num_channels)
 {
     if (num_channels < 0 || num_channels > MP_NUM_CHANNELS) {
@@ -226,31 +232,60 @@ void mp_chmap_set_unknown(struct mp_chmap *dst, int num_channels)
     } else {
         dst->num = num_channels;
         for (int n = 0; n < dst->num; n++)
-            dst->speaker[n] = MP_SPEAKER_ID_NA;
+            dst->speaker[n] = MP_SPEAKER_ID_UNKNOWN0 + n;
+    }
+}
+
+// Return channel index of the given speaker, or -1.
+static int mp_chmap_find_speaker(const struct mp_chmap *map, int speaker)
+{
+    for (int n = 0; n < map->num; n++) {
+        if (map->speaker[n] == speaker)
+            return n;
+    }
+    return -1;
+}
+
+static void mp_chmap_remove_speaker(struct mp_chmap *map, int speaker)
+{
+    int index = mp_chmap_find_speaker(map, speaker);
+    if (index >= 0) {
+        for (int n = index; n < map->num - 1; n++)
+            map->speaker[n] = map->speaker[n + 1];
+        map->num--;
+    }
+}
+
+// Some decoders output additional, redundant channels, which are usually
+// useless and will mess up proper audio output channel handling.
+// map: channel map from which the channels should be removed
+// requested: if not NULL, and if it contains any of the "useless" channels,
+//            don't remove them (this is for convenience)
+void mp_chmap_remove_useless_channels(struct mp_chmap *map,
+                                      const struct mp_chmap *requested)
+{
+    if (requested &&
+        mp_chmap_find_speaker(requested, MP_SPEAKER_ID_DL) >= 0)
+        return;
+
+    if (map->num > 2) {
+        mp_chmap_remove_speaker(map, MP_SPEAKER_ID_DL);
+        mp_chmap_remove_speaker(map, MP_SPEAKER_ID_DR);
     }
 }
 
 // Return the ffmpeg/libav channel layout as in <libavutil/channel_layout.h>.
-// Speakers not representable by ffmpeg/libav are dropped.
 // Warning: this ignores the order of the channels, and will return a channel
 //          mask even if the order is different from libavcodec's.
-//          Also, "unknown" channel maps are translated to non-sense channel
-//          maps with the same number of channels.
 uint64_t mp_chmap_to_lavc_unchecked(const struct mp_chmap *src)
 {
+    // lavc has no concept for unknown layouts yet, so pick a default
     struct mp_chmap t = *src;
-    if (t.num > 64)
-        return 0;
-    // lavc has no concept for unknown layouts yet, so pick something that does
-    // the job of signaling the number of channels, even if it makes no sense
-    // as a proper layout.
     if (mp_chmap_is_unknown(&t))
-        return t.num == 64 ? (uint64_t)-1 : (1ULL << t.num) - 1;
+        mp_chmap_from_channels(&t, t.num);
     uint64_t mask = 0;
-    for (int n = 0; n < t.num; n++) {
-        if (t.speaker[n] < 64) // ignore MP_SPEAKER_ID_NA etc.
-            mask |= 1ULL << t.speaker[n];
-    }
+    for (int n = 0; n < t.num; n++)
+        mask |= 1ULL << t.speaker[n];
     return mask;
 }
 
@@ -301,8 +336,6 @@ bool mp_chmap_is_lavc(const struct mp_chmap *src)
     return true;
 }
 
-// Warning: for "unknown" channel maps, this returns something that may not
-//          make sense. Invalid channel maps are not changed.
 void mp_chmap_reorder_to_lavc(struct mp_chmap *map)
 {
     if (!mp_chmap_is_valid(map))
@@ -313,43 +346,56 @@ void mp_chmap_reorder_to_lavc(struct mp_chmap *map)
 
 // Get reordering array for from->to reordering. from->to must have the same set
 // of speakers (i.e. same number and speaker IDs, just different order). Then,
-// for each speaker n, src[n] will be set such that:
-//      to->speaker[n] = from->speaker[src[n]]
-// (src[n] gives the source channel for destination channel n)
-// If *from and *to don't contain the same set of speakers, then the above
-// invariant is not guaranteed. Instead, src[n] can be set to -1 if the channel
-// at to->speaker[n] is unmapped.
-void mp_chmap_get_reorder(int src[MP_NUM_CHANNELS], const struct mp_chmap *from,
+// for each speaker n, dst[n] will be set such that:
+//      to->speaker[dst[n]] = from->speaker[n]
+// (dst[n] gives the source channel for destination channel n)
+void mp_chmap_get_reorder(int dst[MP_NUM_CHANNELS], const struct mp_chmap *from,
                           const struct mp_chmap *to)
 {
-    for (int n = 0; n < MP_NUM_CHANNELS; n++)
-        src[n] = -1;
-
+    assert(from->num == to->num);
     if (mp_chmap_is_unknown(from) || mp_chmap_is_unknown(to)) {
-        for (int n = 0; n < to->num; n++)
-            src[n] = n < from->num ? n : -1;
+        for (int n = 0; n < from->num; n++)
+            dst[n] = n;
         return;
     }
-
-    for (int n = 0; n < to->num; n++) {
-        for (int i = 0; i < from->num; i++) {
-            if (to->speaker[n] == from->speaker[i]) {
-                src[n] = i;
+    // Same set of speakers required
+    assert(mp_chmap_equals_reordered(from, to));
+    for (int n = 0; n < from->num; n++) {
+        int src = from->speaker[n];
+        dst[n] = -1;
+        for (int i = 0; i < to->num; i++) {
+            if (src == to->speaker[i]) {
+                dst[n] = i;
                 break;
             }
         }
+        assert(dst[n] != -1);
     }
-
-    for (int n = 0; n < to->num; n++)
-        assert(src[n] < 0 || (to->speaker[n] == from->speaker[src[n]]));
+    for (int n = 0; n < from->num; n++)
+        assert(to->speaker[dst[n]] == from->speaker[n]);
 }
 
-// Return the number of channels only in a.
-int mp_chmap_diffn(const struct mp_chmap *a, const struct mp_chmap *b)
+// Performs the difference between a and b, and store it in diff. If b has
+// channels that do not appear in a, those will not appear in the difference.
+// To get to those the argument ordering in the function call has to be
+// inverted. For the same reason, the diff with a superset will return no
+// speakers.
+void mp_chmap_diff(const struct mp_chmap *a, const struct mp_chmap *b,
+                   struct mp_chmap *diff)
 {
     uint64_t a_mask = mp_chmap_to_lavc_unchecked(a);
     uint64_t b_mask = mp_chmap_to_lavc_unchecked(b);
-    return av_popcount64((a_mask ^ b_mask) & a_mask);
+    mp_chmap_from_lavc(diff, (a_mask ^ b_mask) & a_mask);
+}
+
+// Checks whether a contains all the speakers in b
+bool mp_chmap_contains(const struct mp_chmap *a, const struct mp_chmap *b)
+{
+    struct mp_chmap d1;
+    struct mp_chmap d2;
+    mp_chmap_diff(a, b, &d1);
+    mp_chmap_diff(b, a, &d2);
+    return a->num >= b->num && d1.num >= 0 && d2.num == 0;
 }
 
 // Returns something like "fl-fr-fc". If there's a standard layout in lavc
@@ -452,25 +498,6 @@ bool mp_chmap_from_str(struct mp_chmap *dst, bstr src)
     return true;
 }
 
-// Output a human readable "canonical" channel map string. Converting this from
-// a string back to a channel map can yield a different map, but the string
-// looks nicer. E.g. "fc-fl-fr-na" becomes "3.0".
-char *mp_chmap_to_str_hr_buf(char *buf, size_t buf_size, const struct mp_chmap *src)
-{
-    struct mp_chmap map = *src;
-    mp_chmap_remove_na(&map);
-    for (int n = 0; std_layout_names[n][0]; n++) {
-        struct mp_chmap s;
-        if (mp_chmap_from_str(&s, bstr0(std_layout_names[n][0])) &&
-            mp_chmap_equals_reordered(&s, &map))
-        {
-            map = s;
-            break;
-        }
-    }
-    return mp_chmap_to_str_buf(buf, buf_size, &map);
-}
-
 void mp_chmap_print_help(struct mp_log *log)
 {
     mp_info(log, "Speakers:\n");

audio/chmap.h

@@ -1,18 +1,18 @@
 /*
  * This file is part of mpv.
  *
- * mpv is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * mpv is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * mpv is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with mpv.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License along
+ * with mpv.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef MP_CHMAP_H
@@ -22,7 +22,7 @@
 #include <stdbool.h>
 #include "misc/bstr.h"
 
-#define MP_NUM_CHANNELS 16
+#define MP_NUM_CHANNELS 8
 
 // Speaker a channel can be assigned to.
 // This corresponds to WAVEFORMATEXTENSIBLE channel mask bit indexes.
@@ -47,7 +47,7 @@ enum mp_speaker_id {
     MP_SPEAKER_ID_TBL,          // TOP_BACK_LEFT
     MP_SPEAKER_ID_TBC,          // TOP_BACK_CENTER
     MP_SPEAKER_ID_TBR,          // TOP_BACK_RIGHT
-     // Unofficial/libav* extensions
+     // Inofficial/libav* extensions
     MP_SPEAKER_ID_DL = 29,      // STEREO_LEFT (stereo downmix special speakers)
     MP_SPEAKER_ID_DR,           // STEREO_RIGHT
     MP_SPEAKER_ID_WL,           // WIDE_LEFT
@@ -56,12 +56,10 @@ enum mp_speaker_id {
     MP_SPEAKER_ID_SDR,          // SURROUND_DIRECT_RIGHT
     MP_SPEAKER_ID_LFE2,         // LOW_FREQUENCY_2
 
-    // Speaker IDs >= 64 are not representable in WAVEFORMATEXTENSIBLE or libav*.
-
-    // "Silent" channels. These are sometimes used to insert padding for
-    // unused channels. Unlike other speaker types, multiple of these can
-    // occur in a single mp_chmap.
-    MP_SPEAKER_ID_NA = 64,
+    // Special mpv-specific speaker entries reserved for channels which have no
+    // known meaning.
+    MP_SPEAKER_ID_UNKNOWN0 = 64,
+    MP_SPEAKER_ID_UNKNOWN_LAST = MP_SPEAKER_ID_UNKNOWN0 + MP_NUM_CHANNELS - 1,
 
     // Including the unassigned IDs in between. This is not a valid ID anymore,
     // but is still within uint8_t.
@@ -100,14 +98,17 @@ bool mp_chmap_is_empty(const struct mp_chmap *src);
 bool mp_chmap_is_unknown(const struct mp_chmap *src);
 bool mp_chmap_equals(const struct mp_chmap *a, const struct mp_chmap *b);
 bool mp_chmap_equals_reordered(const struct mp_chmap *a, const struct mp_chmap *b);
+bool mp_chmap_is_compatible(const struct mp_chmap *a, const struct mp_chmap *b);
 bool mp_chmap_is_stereo(const struct mp_chmap *src);
 
 void mp_chmap_reorder_norm(struct mp_chmap *map);
-void mp_chmap_remove_na(struct mp_chmap *map);
-void mp_chmap_fill_na(struct mp_chmap *map, int num);
 
 void mp_chmap_from_channels(struct mp_chmap *dst, int num_channels);
 void mp_chmap_set_unknown(struct mp_chmap *dst, int num_channels);
+void mp_chmap_from_channels_alsa(struct mp_chmap *dst, int num_channels);
+
+void mp_chmap_remove_useless_channels(struct mp_chmap *map,
+                                      const struct mp_chmap *requested);
 
 uint64_t mp_chmap_to_lavc(const struct mp_chmap *src);
 uint64_t mp_chmap_to_lavc_unchecked(const struct mp_chmap *src);
@@ -116,17 +117,17 @@ void mp_chmap_from_lavc(struct mp_chmap *dst, uint64_t src);
 bool mp_chmap_is_lavc(const struct mp_chmap *src);
 void mp_chmap_reorder_to_lavc(struct mp_chmap *map);
 
-void mp_chmap_get_reorder(int src[MP_NUM_CHANNELS], const struct mp_chmap *from,
+void mp_chmap_get_reorder(int dst[MP_NUM_CHANNELS], const struct mp_chmap *from,
                           const struct mp_chmap *to);
 
-int mp_chmap_diffn(const struct mp_chmap *a, const struct mp_chmap *b);
+void mp_chmap_diff(const struct mp_chmap *a, const struct mp_chmap *b,
+                   struct mp_chmap *diff);
+
+bool mp_chmap_contains(const struct mp_chmap *a, const struct mp_chmap *b);
 
 char *mp_chmap_to_str_buf(char *buf, size_t buf_size, const struct mp_chmap *src);
 #define mp_chmap_to_str(m) mp_chmap_to_str_buf((char[64]){0}, 64, (m))
 
-char *mp_chmap_to_str_hr_buf(char *buf, size_t buf_size, const struct mp_chmap *src);
-#define mp_chmap_to_str_hr(m) mp_chmap_to_str_hr_buf((char[128]){0}, 128, (m))
-
 bool mp_chmap_from_str(struct mp_chmap *dst, bstr src);
 
 struct mp_log;

audio/chmap_sel.c

@@ -1,18 +1,18 @@
 /*
  * This file is part of mpv.
  *
- * mpv is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * mpv is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * mpv is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with mpv.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License along
+ * with mpv.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <stdlib.h>
@@ -20,7 +20,6 @@
 #include <limits.h>
 
 #include "common/common.h"
-#include "common/msg.h"
 #include "chmap_sel.h"
 
 static const struct mp_chmap speaker_replacements[][2] = {
@@ -59,29 +58,6 @@ static bool replace_speakers(struct mp_chmap *map, struct mp_chmap list[2])
     return false;
 }
 
-// These go strictly from the first to the second entry and always use the
-// full layout (possibly reordered and/or padding channels added).
-static const struct mp_chmap preferred_remix[][2] = {
-    // mono can be perfectly played as stereo
-    { MP_CHMAP_INIT_MONO, MP_CHMAP_INIT_STEREO },
-};
-
-// Conversion from src to dst is explicitly encouraged and should be preferred
-// over "mathematical" upmixes or downmixes (which minimize lost channels).
-static bool test_preferred_remix(const struct mp_chmap *src,
-                                 const struct mp_chmap *dst)
-{
-    struct mp_chmap src_p = *src, dst_p = *dst;
-    mp_chmap_remove_na(&src_p);
-    mp_chmap_remove_na(&dst_p);
-    for (int n = 0; n < MP_ARRAY_SIZE(preferred_remix); n++) {
-        if (mp_chmap_equals_reordered(&src_p, &preferred_remix[n][0]) &&
-            mp_chmap_equals_reordered(&dst_p, &preferred_remix[n][1]))
-            return true;
-    }
-    return false;
-}
-
 // Allow all channel layouts that can be expressed with mp_chmap.
 // (By default, all layouts are rejected.)
 void mp_chmap_sel_add_any(struct mp_chmap_sel *s)
@@ -95,6 +71,17 @@ void mp_chmap_sel_add_waveext(struct mp_chmap_sel *s)
     s->allow_waveext = true;
 }
 
+// Classic ALSA-based MPlayer layouts.
+void mp_chmap_sel_add_alsa_def(struct mp_chmap_sel *s)
+{
+    for (int n = 0; n < MP_NUM_CHANNELS; n++) {
+        struct mp_chmap t;
+        mp_chmap_from_channels_alsa(&t, n);
+        if (t.num)
+            mp_chmap_sel_add_map(s, &t);
+    }
+}
+
 // Add a channel map that should be allowed.
 void mp_chmap_sel_add_map(struct mp_chmap_sel *s, const struct mp_chmap *map)
 {
@@ -115,7 +102,7 @@ void mp_chmap_sel_add_map(struct mp_chmap_sel *s, const struct mp_chmap *map)
 // Allow all waveext formats in default order.
 void mp_chmap_sel_add_waveext_def(struct mp_chmap_sel *s)
 {
-    for (int n = 1; n <= MP_NUM_CHANNELS; n++) {
+    for (int n = 1; n < MP_NUM_CHANNELS; n++) {
         struct mp_chmap map;
         mp_chmap_from_channels(&map, n);
         mp_chmap_sel_add_map(s, &map);
@@ -189,10 +176,6 @@ bool mp_chmap_sel_adjust(const struct mp_chmap_sel *s, struct mp_chmap *map)
             return true;
         }
     }
-
-    if (mp_chmap_sel_fallback(s, map))
-        return true;
-
     for (int i = 0; i < MP_ARRAY_SIZE(speaker_replacements); i++) {
         struct mp_chmap  t = *map;
         struct mp_chmap *r = (struct mp_chmap *)speaker_replacements[i];
@@ -202,6 +185,9 @@ bool mp_chmap_sel_adjust(const struct mp_chmap_sel *s, struct mp_chmap *map)
         }
     }
 
+    if (mp_chmap_sel_fallback(s, map))
+        return true;
+
     // Fallback to mono/stereo as last resort
     *map = (struct mp_chmap) MP_CHMAP_INIT_STEREO;
     if (test_layout(s, map))
@@ -213,101 +199,64 @@ bool mp_chmap_sel_adjust(const struct mp_chmap_sel *s, struct mp_chmap *map)
     return false;
 }
 
-// Like mp_chmap_diffn(), but find the minimum difference with all possible
-// speaker replacements considered.
-static int mp_chmap_diffn_r(const struct mp_chmap *a, const struct mp_chmap *b)
-{
-    int mindiff = INT_MAX;
+#define UPMIX_IDX 0
+#define DOWNMIX_IDX 1
+#define FALLBACK_IDX 2
 
-    for (int i = -1; i < (int)MP_ARRAY_SIZE(speaker_replacements); i++) {
-        struct mp_chmap ar = *a;
-        if (i >= 0) {
-            struct mp_chmap *r = (struct mp_chmap *)speaker_replacements[i];
-            if (!replace_speakers(&ar, r))
-                continue;
-        }
-        int d = mp_chmap_diffn(&ar, b);
-        if (d < mindiff)
-            mindiff = d;
+static bool test_fallbacks(struct mp_chmap *a, struct mp_chmap *b,
+                           int best_diffs[2], struct mp_chmap best[2])
+{
+    struct mp_chmap diff1, diff2;
+
+    mp_chmap_diff(a, b, &diff1);
+    if (mp_chmap_contains(a, b) && best_diffs[UPMIX_IDX] > diff1.num) {
+        best[UPMIX_IDX] = *a;
+        best_diffs[UPMIX_IDX] = diff1.num;
+        return true;
     }
 
-    // Special-case: we consider stereo a replacement for mono. (This is not
-    // true in the other direction. Also, fl-fr is generally not a replacement
-    // for fc. Thus it's not part of the speaker replacement list.)
-    struct mp_chmap mono   = MP_CHMAP_INIT_MONO;
-    struct mp_chmap stereo = MP_CHMAP_INIT_STEREO;
-    if (mp_chmap_equals(&mono, b) && mp_chmap_equals(&stereo, a))
-        mindiff = 0;
+    mp_chmap_diff(b, a, &diff2);
+    if (mp_chmap_contains(b, a) && best_diffs[DOWNMIX_IDX] > diff2.num) {
+        best[DOWNMIX_IDX] = *a;
+        best_diffs[DOWNMIX_IDX] = diff2.num;
+        return true;
+    }
 
-    return mindiff;
+    if (diff1.num > 0 && best_diffs[FALLBACK_IDX] > diff1.num) {
+        best[FALLBACK_IDX] = *a;
+        best_diffs[FALLBACK_IDX] = diff1.num;
+        return true;
+    }
+
+    if (diff2.num > 0 && best_diffs[FALLBACK_IDX] > diff2.num) {
+        best[FALLBACK_IDX] = *a;
+        best_diffs[FALLBACK_IDX] = diff2.num;
+        return true;
+    }
+
+    return false;
 }
 
-// Decide whether we should prefer old or new for the requested layout.
-// Return true if new should be used, false if old should be used.
-// If old is empty, always return new (initial case).
-static bool mp_chmap_is_better(struct mp_chmap *req, struct mp_chmap *old,
-                               struct mp_chmap *new)
-{
-    // Initial case
-    if (!old->num)
-        return true;
-
-    // Exact pick - this also ensures that the best layout is chosen if the
-    // layouts are the same, but with different order of channels.
-    if (mp_chmap_equals(req, old))
-        return false;
-    if (mp_chmap_equals(req, new))
-        return true;
-
-    // If there's no exact match, strictly do a preferred conversion.
-    bool old_pref = test_preferred_remix(req, old);
-    bool new_pref = test_preferred_remix(req, new);
-    if (old_pref && !new_pref)
-        return false;
-    if (!old_pref && new_pref)
-        return true;
-
-    int old_lost_r = mp_chmap_diffn_r(req, old); // num. channels only in req
-    int new_lost_r = mp_chmap_diffn_r(req, new);
-
-    // Imperfect upmix (no real superset) - minimize lost channels
-    if (new_lost_r != old_lost_r)
-        return new_lost_r < old_lost_r;
-
-    struct mp_chmap old_p = *old, new_p = *new;
-    mp_chmap_remove_na(&old_p);
-    mp_chmap_remove_na(&new_p);
-
-    // If the situation is equal with replaced speakers, but the replacement is
-    // perfect for only one of them, let the better one win. This prefers
-    // inexact equivalents over exact supersets.
-    bool perfect_r_new = !new_lost_r && new_p.num <= old_p.num;
-    bool perfect_r_old = !old_lost_r && old_p.num <= new_p.num;
-    if (perfect_r_new != perfect_r_old)
-        return perfect_r_new;
-
-    int old_lost = mp_chmap_diffn(req, old);
-    int new_lost = mp_chmap_diffn(req, new);
-    // If the situation is equal with replaced speakers, pick the better one,
-    // even if it means an upmix.
-    if (new_lost != old_lost)
-        return new_lost < old_lost;
-
-    // Some kind of upmix. If it's perfect, prefer the smaller one. Even if not,
-    // both have equal loss, so also prefer the smaller one.
-    // Drop padding channels (NA) for the sake of this check, as the number of
-    // padding channels isn't really meaningful.
-    if (new_p.num != old_p.num)
-        return new_p.num < old_p.num;
-
-    // Again, with physical channels (minimizes number of NA channels).
-    return new->num < old->num;
-}
-
-// Determine which channel map to fallback to given a source channel map.
+// Determine which channel map to fallback to given a source channel map. It
+// uses the following heuristic:
+// 1) If mono is required always prefer stereo to a multichannel upmix.
+// 2) Search for an upmix that is an exact superset of the required chmap.
+// 3) Search for a downmix that is the exact subset of the required chmap.
+// 4) Search for either an upmix or downmix that is the closest (minimum
+//    difference of speakers) to the required chmap.
 bool mp_chmap_sel_fallback(const struct mp_chmap_sel *s, struct mp_chmap *map)
 {
-    struct mp_chmap best = {0};
+    // special case: if possible always fallback mono to stereo (instead of
+    // looking for a multichannel upmix)
+    struct mp_chmap mono   = MP_CHMAP_INIT_MONO;
+    struct mp_chmap stereo = MP_CHMAP_INIT_STEREO;
+    if (mp_chmap_equals(&mono, map) && test_layout(s, &stereo)) {
+        *map = stereo;
+        return true;
+    }
+
+    int best_diffs[] = { INT_MAX, INT_MAX, INT_MAX };
+    struct mp_chmap best[] = { {0}, {0}, {0} };
 
     for (int n = 0; n < s->num_chmaps; n++) {
         struct mp_chmap e = s->chmaps[n];
@@ -315,13 +264,25 @@ bool mp_chmap_sel_fallback(const struct mp_chmap_sel *s, struct mp_chmap *map)
         if (mp_chmap_is_unknown(&e))
             continue;
 
-        if (mp_chmap_is_better(map, &best, &e))
-            best = e;
+        if (test_fallbacks(&e, map, best_diffs, best))
+            continue;
+
+        // in case we didn't match any fallback retry after replacing speakers
+        for (int i = 0; i < MP_ARRAY_SIZE(speaker_replacements); i++) {
+            struct mp_chmap  t = e;
+            struct mp_chmap *r = (struct mp_chmap *)speaker_replacements[i];
+            if (replace_speakers(&t, r)) {
+                if (test_fallbacks(&t, map, best_diffs, best))
+                    continue;
+            }
+        }
     }
 
-    if (best.num) {
-        *map = best;
-        return true;
+    for (int i = UPMIX_IDX; i < MP_ARRAY_SIZE(best); i++) {
+        if (best_diffs[i] < INT_MAX) {
+            *map = best[i];
+            return true;
+        }
     }
 
     return false;
@@ -353,37 +314,3 @@ bool mp_chmap_sel_get_def(const struct mp_chmap_sel *s, struct mp_chmap *map,
     }
     return map->num > 0;
 }
-
-// Print the set of allowed channel layouts.
-void mp_chmal_sel_log(const struct mp_chmap_sel *s, struct mp_log *log, int lev)
-{
-    if (!mp_msg_test(log, lev))
-        return;
-
-    for (int i = 0; i < s->num_chmaps; i++)
-        mp_msg(log, lev, " - %s\n", mp_chmap_to_str(&s->chmaps[i]));
-    for (int i = 0; i < MP_SPEAKER_ID_COUNT; i++) {
-        if (!s->speakers[i])
-            continue;
-        struct mp_chmap l = {.num = 1, .speaker = { i }};
-        mp_msg(log, lev, " - #%s\n",
-                    i == MP_SPEAKER_ID_FC ? "fc" : mp_chmap_to_str_hr(&l));
-    }
-    if (s->allow_waveext)
-        mp_msg(log, lev, " - waveext\n");
-    if (s->allow_any)
-        mp_msg(log, lev, " - anything\n");
-}
-
-// Select a channel map from the given list that fits best to c. Don't change
-// *c if there's no match, or the list is empty.
-void mp_chmap_sel_list(struct mp_chmap *c, struct mp_chmap *maps, int num_maps)
-{
-    // This is a separate function to keep messing with mp_chmap_sel internals
-    // within this source file.
-    struct mp_chmap_sel sel = {
-        .chmaps = maps,
-        .num_chmaps = num_maps,
-    };
-    mp_chmap_sel_fallback(&sel, c);
-}

audio/chmap_sel.h

@@ -1,18 +1,18 @@
 /*
  * This file is part of mpv.
  *
- * mpv is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * mpv is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * mpv is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with mpv.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License along
+ * with mpv.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef MP_CHMAP_SEL_H
@@ -37,6 +37,7 @@ struct mp_chmap_sel {
 void mp_chmap_sel_add_any(struct mp_chmap_sel *s);
 void mp_chmap_sel_add_waveext(struct mp_chmap_sel *s);
 void mp_chmap_sel_add_waveext_def(struct mp_chmap_sel *s);
+void mp_chmap_sel_add_alsa_def(struct mp_chmap_sel *s);
 void mp_chmap_sel_add_map(struct mp_chmap_sel *s, const struct mp_chmap *map);
 void mp_chmap_sel_add_speaker(struct mp_chmap_sel *s, int id);
 bool mp_chmap_sel_adjust(const struct mp_chmap_sel *s, struct mp_chmap *map);
@@ -44,9 +45,4 @@ bool mp_chmap_sel_fallback(const struct mp_chmap_sel *s, struct mp_chmap *map);
 bool mp_chmap_sel_get_def(const struct mp_chmap_sel *s, struct mp_chmap *map,
                           int num);
 
-struct mp_log;
-void mp_chmal_sel_log(const struct mp_chmap_sel *s, struct mp_log *log, int lev);
-
-void mp_chmap_sel_list(struct mp_chmap *c, struct mp_chmap *maps, int num_maps);
-
 #endif

audio/decode/ad.h

@@ -1,18 +1,19 @@
 /*
- * This file is part of mpv.
+ * This file is part of MPlayer.
  *
- * mpv is free software; you can redistribute it and/or modify
+ * MPlayer is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * mpv is distributed in the hope that it will be useful,
+ * MPlayer is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with mpv.  If not, see <http://www.gnu.org/licenses/>.
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifndef MPLAYER_AD_H
@@ -35,8 +36,7 @@ struct ad_functions {
     int (*init)(struct dec_audio *da, const char *decoder);
     void (*uninit)(struct dec_audio *da);
     int (*control)(struct dec_audio *da, int cmd, void *arg);
-    int (*decode_packet)(struct dec_audio *da, struct demux_packet *pkt,
-                         struct mp_audio **out);
+    int (*decode_packet)(struct dec_audio *da, struct mp_audio **out);
 };
 
 enum ad_ctrl {

audio/decode/ad_lavc.c

@@ -1,18 +1,19 @@
 /*
- * This file is part of mpv.
+ * This file is part of MPlayer.
  *
- * mpv is free software; you can redistribute it and/or modify
+ * MPlayer is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * mpv is distributed in the hope that it will be useful,
+ * MPlayer is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with mpv.  If not, see <http://www.gnu.org/licenses/>.
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <stdio.h>
@@ -26,7 +27,7 @@
 #include <libavutil/common.h>
 #include <libavutil/intreadwrite.h>
 
-#include "mpv_talloc.h"
+#include "talloc.h"
 
 #include "config.h"
 #include "common/av_common.h"
@@ -42,11 +43,8 @@ struct priv {
     AVFrame *avframe;
     struct mp_audio frame;
     bool force_channel_map;
-    uint32_t skip_samples, trim_samples;
-    bool preroll_done;
-    double next_pts;
-    bool needs_reset;
-    AVRational codec_timebase;
+    struct demux_packet *packet;
+    uint32_t skip_samples;
 };
 
 static void uninit(struct dec_audio *da);
@@ -61,15 +59,15 @@ struct ad_lavc_params {
 
 const struct m_sub_options ad_lavc_conf = {
     .opts = (const m_option_t[]) {
-        OPT_FLOATRANGE("ac3drc", ac3drc, 0, 0, 6),
+        OPT_FLOATRANGE("ac3drc", ac3drc, 0, 0, 2),
         OPT_FLAG("downmix", downmix, 0),
-        OPT_INTRANGE("threads", threads, 0, 0, 16),
+        OPT_INTRANGE("threads", threads, 0, 1, 16),
         OPT_KEYVALUELIST("o", avopts, 0),
         {0}
     },
     .size = sizeof(struct ad_lavc_params),
     .defaults = &(const struct ad_lavc_params){
-        .ac3drc = 0,
+        .ac3drc = 1.,
         .downmix = 1,
         .threads = 1,
     },
@@ -81,14 +79,13 @@ static int init(struct dec_audio *da, const char *decoder)
     struct ad_lavc_params *opts = mpopts->ad_lavc_params;
     AVCodecContext *lavc_context;
     AVCodec *lavc_codec;
-    struct mp_codec_params *c = da->codec;
+    struct sh_stream *sh = da->header;
+    struct sh_audio *sh_audio = sh->audio;
 
     struct priv *ctx = talloc_zero(NULL, struct priv);
     da->priv = ctx;
 
-    ctx->codec_timebase = mp_get_codec_timebase(da->codec);
-
-    ctx->force_channel_map = c->force_channels;
+    ctx->force_channel_map = sh_audio->force_channels;
 
     lavc_codec = avcodec_find_decoder_by_name(decoder);
     if (!lavc_codec) {
@@ -104,13 +101,9 @@ static int init(struct dec_audio *da, const char *decoder)
     lavc_context->codec_type = AVMEDIA_TYPE_AUDIO;
     lavc_context->codec_id = lavc_codec->id;
 
-#if LIBAVCODEC_VERSION_MICRO >= 100
-    lavc_context->pkt_timebase = ctx->codec_timebase;
-#endif
-
-    if (opts->downmix && mpopts->audio_output_channels.num_chmaps == 1) {
+    if (opts->downmix) {
         lavc_context->request_channel_layout =
-            mp_chmap_to_lavc(&mpopts->audio_output_channels.chmaps[0]);
+            mp_chmap_to_lavc(&mpopts->audio_output_channels);
     }
 
     // Always try to set - option only exists for AC3 at the moment
@@ -124,19 +117,24 @@ static int init(struct dec_audio *da, const char *decoder)
 
     mp_set_avopts(da->log, lavc_context, opts->avopts);
 
-    lavc_context->codec_tag = c->codec_tag;
-    lavc_context->sample_rate = c->samplerate;
-    lavc_context->bit_rate = c->bitrate;
-    lavc_context->block_align = c->block_align;
-    lavc_context->bits_per_coded_sample = c->bits_per_coded_sample;
-    lavc_context->channels = c->channels.num;
-    if (!mp_chmap_is_unknown(&c->channels))
-        lavc_context->channel_layout = mp_chmap_to_lavc(&c->channels);
+    lavc_context->codec_tag = sh->format;
+    lavc_context->sample_rate = sh_audio->samplerate;
+    lavc_context->bit_rate = sh_audio->bitrate;
+    lavc_context->block_align = sh_audio->block_align;
+    lavc_context->bits_per_coded_sample = sh_audio->bits_per_coded_sample;
+    lavc_context->channels = sh_audio->channels.num;
+    if (!mp_chmap_is_unknown(&sh_audio->channels))
+        lavc_context->channel_layout = mp_chmap_to_lavc(&sh_audio->channels);
 
     // demux_mkv
-    mp_lavc_set_extradata(lavc_context, c->extradata, c->extradata_size);
+    if (sh_audio->codecdata_len && sh_audio->codecdata &&
+            !lavc_context->extradata) {
+        mp_lavc_set_extradata(lavc_context, sh_audio->codecdata,
+                              sh_audio->codecdata_len);
+    }
 
-    mp_set_lav_codec_headers(lavc_context, c);
+    if (sh->lav_headers)
+        mp_copy_lav_codec_headers(lavc_context, sh->lav_headers);
 
     mp_set_avcodec_threads(da->log, lavc_context, opts->threads);
 
@@ -147,7 +145,8 @@ static int init(struct dec_audio *da, const char *decoder)
         return 0;
     }
 
-    ctx->next_pts = MP_NOPTS_VALUE;
+    if (lavc_context->bit_rate != 0)
+        da->bitrate = lavc_context->bit_rate;
 
     return 1;
 }
@@ -174,53 +173,40 @@ static int control(struct dec_audio *da, int cmd, void *arg)
     switch (cmd) {
     case ADCTRL_RESET:
         avcodec_flush_buffers(ctx->avctx);
+        talloc_free(ctx->packet);
+        ctx->packet = NULL;
         ctx->skip_samples = 0;
-        ctx->trim_samples = 0;
-        ctx->preroll_done = false;
-        ctx->next_pts = MP_NOPTS_VALUE;
-        ctx->needs_reset = false;
         return CONTROL_TRUE;
     }
     return CONTROL_UNKNOWN;
 }
 
-static int decode_packet(struct dec_audio *da, struct demux_packet *mpkt,
-                         struct mp_audio **out)
+static int decode_packet(struct dec_audio *da, struct mp_audio **out)
 {
     struct priv *priv = da->priv;
     AVCodecContext *avctx = priv->avctx;
 
-    // If the decoder discards the timestamp for some reason, we use the
-    // interpolated PTS. Initialize it so that it works for the initial
-    // packet as well.
-    if (mpkt && priv->next_pts == MP_NOPTS_VALUE)
-        priv->next_pts = mpkt->pts;
+    struct demux_packet *mpkt = priv->packet;
+    if (!mpkt) {
+        if (demux_read_packet_async(da->header, &mpkt) == 0)
+            return AD_WAIT;
+    }
+
+    priv->packet = talloc_steal(priv, mpkt);
 
     int in_len = mpkt ? mpkt->len : 0;
 
     AVPacket pkt;
-    mp_set_av_packet(&pkt, mpkt, &priv->codec_timebase);
+    mp_set_av_packet(&pkt, mpkt, NULL);
+
+    // If we don't have a PTS yet, use the first packet PTS we can get.
+    if (da->pts == MP_NOPTS_VALUE && mpkt && mpkt->pts != MP_NOPTS_VALUE) {
+        da->pts = mpkt->pts;
+        da->pts_offset = 0;
+    }
 
     int got_frame = 0;
     av_frame_unref(priv->avframe);
-
-    if (priv->needs_reset)
-        control(da, ADCTRL_RESET, NULL);
-
-#if HAVE_AVCODEC_NEW_CODEC_API
-    int ret = avcodec_send_packet(avctx, &pkt);
-    if (ret >= 0 || ret == AVERROR(EAGAIN) || ret == AVERROR_EOF) {
-        if (ret >= 0 && mpkt)
-            mpkt->len = 0;
-        ret = avcodec_receive_frame(avctx, priv->avframe);
-        if (ret >= 0)
-            got_frame = 1;
-        if (ret == AVERROR_EOF)
-            priv->needs_reset = true;
-        if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF)
-            ret = 0;
-    }
-#else
     int ret = avcodec_decode_audio4(avctx, priv->avframe, &got_frame, &pkt);
     if (mpkt) {
         // At least "shorten" decodes sub-frames, instead of the whole packet.
@@ -231,71 +217,59 @@ static int decode_packet(struct dec_audio *da, struct demux_packet *mpkt,
             mpkt->len    -= ret;
             mpkt->pts = MP_NOPTS_VALUE; // don't reset PTS next time
         }
-        // LATM may need many packets to find mux info
-        if (ret == AVERROR(EAGAIN)) {
-            mpkt->len = 0;
-            return 0;
+        if (mpkt->len == 0 || ret < 0) {
+            talloc_free(mpkt);
+            priv->packet = NULL;
         }
+        // LATM may need many packets to find mux info
+        if (ret == AVERROR(EAGAIN))
+            return AD_OK;
     }
-#endif
     if (ret < 0) {
         MP_ERR(da, "Error decoding audio.\n");
-        return -1;
+        return AD_ERR;
     }
     if (!got_frame)
-        return 0;
+        return mpkt ? AD_OK : AD_EOF;
 
-    double out_pts = mp_pts_from_av(MP_AVFRAME_DEC_PTS(priv->avframe),
-                                    &priv->codec_timebase);
+    double out_pts = mp_pts_from_av(priv->avframe->pkt_pts, NULL);
+    if (out_pts != MP_NOPTS_VALUE) {
+        da->pts = out_pts;
+        da->pts_offset = 0;
+    }
 
     struct mp_audio *mpframe = mp_audio_from_avframe(priv->avframe);
     if (!mpframe)
-        return -1;
+        return AD_ERR;
 
     struct mp_chmap lavc_chmap = mpframe->channels;
     if (lavc_chmap.num != avctx->channels)
         mp_chmap_from_channels(&lavc_chmap, avctx->channels);
     if (priv->force_channel_map) {
-        if (lavc_chmap.num == da->codec->channels.num)
-            lavc_chmap = da->codec->channels;
+        struct sh_audio *sh_audio = da->header->audio;
+        if (lavc_chmap.num == sh_audio->channels.num)
+            lavc_chmap = sh_audio->channels;
     }
     mp_audio_set_channels(mpframe, &lavc_chmap);
 
-    mpframe->pts = out_pts;
-
-    if (mpframe->pts == MP_NOPTS_VALUE)
-        mpframe->pts = priv->next_pts;
-    if (mpframe->pts != MP_NOPTS_VALUE)
-        priv->next_pts = mpframe->pts + mpframe->samples / (double)mpframe->rate;
-
 #if HAVE_AVFRAME_SKIP_SAMPLES
     AVFrameSideData *sd =
         av_frame_get_side_data(priv->avframe, AV_FRAME_DATA_SKIP_SAMPLES);
     if (sd && sd->size >= 10) {
         char *d = sd->data;
         priv->skip_samples += AV_RL32(d + 0);
-        priv->trim_samples += AV_RL32(d + 4);
+        uint32_t pad = AV_RL32(d + 4);
+        uint32_t skip = MPMIN(priv->skip_samples, mpframe->samples);
+        if (skip) {
+            mp_audio_skip_samples(mpframe, skip);
+            da->pts_offset += skip;
+            priv->skip_samples -= skip;
+        }
+        if (pad <= mpframe->samples)
+            mpframe->samples -= pad;
     }
 #endif
 
-    if (!priv->preroll_done) {
-        // Skip only if this isn't already handled by AV_FRAME_DATA_SKIP_SAMPLES.
-        if (!priv->skip_samples)
-            priv->skip_samples = avctx->delay;
-        priv->preroll_done = true;
-    }
-
-    uint32_t skip = MPMIN(priv->skip_samples, mpframe->samples);
-    if (skip) {
-        mp_audio_skip_samples(mpframe, skip);
-        priv->skip_samples -= skip;
-    }
-    uint32_t trim = MPMIN(priv->trim_samples, mpframe->samples);
-    if (trim) {
-        mpframe->samples -= trim;
-        priv->trim_samples -= trim;
-    }
-
     *out = mpframe;
 
     av_frame_unref(priv->avframe);

audio/decode/ad_mpg123.c

@@ -0,0 +1,304 @@
+/*
+ * MPEG 1.0/2.0/2.5 audio layer I, II, III decoding with libmpg123
+ *
+ * Copyright (C) 2010-2013 Thomas Orgis <thomas@orgis.org>
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include "config.h"
+
+#include "ad.h"
+#include "common/msg.h"
+
+#include <mpg123.h>
+
+#if (defined MPG123_API_VERSION) && (MPG123_API_VERSION < 33)
+#error "This should not happen"
+#endif
+
+struct ad_mpg123_context {
+    mpg123_handle *handle;
+    int sample_size;
+    /* Running mean for bit rate, stream length estimation. */
+    float mean_rate;
+    unsigned int mean_count;
+    /* Time delay for updates. */
+    short delay;
+    /* If the stream is actually VBR. */
+    char vbr;
+    struct mp_audio frame;
+};
+
+static void uninit(struct dec_audio *da)
+{
+    struct ad_mpg123_context *con = da->priv;
+
+    mpg123_close(con->handle);
+    mpg123_delete(con->handle);
+    mpg123_exit();
+}
+
+/* This initializes libmpg123 and prepares the handle, including funky
+ * parameters. */
+static int init(struct dec_audio *da, const char *decoder)
+{
+    int err;
+    struct ad_mpg123_context *con;
+    /* Assumption: You always call preinit + init + uninit, on every file.
+     * But you stop at preinit in case it fails.
+     * If that is not true, one must ensure not to call mpg123_init / exit
+     * twice in a row. */
+    if (mpg123_init() != MPG123_OK)
+        return 0;
+
+    da->priv = talloc_zero(NULL, struct ad_mpg123_context);
+    con = da->priv;
+    /* Auto-choice of optimized decoder (first argument NULL). */
+    con->handle = mpg123_new(NULL, &err);
+    if (!con->handle)
+        goto bad_end;
+
+    /* Basic settings.
+     * Don't spill messages, enable better resync with non-seekable streams.
+     * Give both flags individually without error checking to keep going with
+     * old libmpg123. Generally, it is not fatal if the flags are not
+     * honored */
+    mpg123_param(con->handle, MPG123_ADD_FLAGS, MPG123_QUIET, 0.0);
+    /* Do not bail out on malformed streams at all.
+     * MPlayer does not handle a decoder throwing the towel on crappy input. */
+    mpg123_param(con->handle, MPG123_RESYNC_LIMIT, -1, 0.0);
+
+    /* Open decisions: Configure libmpg123 to force encoding (or stay open about
+     * library builds that support only float or int32 output), (de)configure
+     * gapless decoding (won't work with seeking in MPlayer, though).
+     * Don't forget to eventually enable ReplayGain/RVA support, too.
+     * Let's try to run with the default for now. */
+
+    /* That would produce floating point output.
+     * You can get 32 and 24 bit ints, even 8 bit via format matrix.
+     * If wanting a specific encoding here, configure format matrix and
+     * make sure it is in set_format(). */
+    /* mpg123_param(con->handle, MPG123_ADD_FLAGS, MPG123_FORCE_FLOAT, 0.); */
+
+    /* Example for RVA choice (available since libmpg123 1.0.0):
+    mpg123_param(con->handle, MPG123_RVA, MPG123_RVA_MIX, 0.0) */
+
+    /* Prevent funky automatic resampling.
+     * This way, we can be sure that one frame will never produce
+     * more than 1152 stereo samples.
+     * Background:
+     * Going to decode directly to the output buffer. It is important to have
+     * MPG123_AUTO_RESAMPLE disabled for the buffer size being an all-time
+     * limit.
+     * We need at least 1152 samples. dec_audio.c normally guarantees this. */
+    mpg123_param(con->handle, MPG123_REMOVE_FLAGS, MPG123_AUTO_RESAMPLE, 0.);
+
+    err = mpg123_open_feed(con->handle);
+    if (err != MPG123_OK)
+        goto bad_end;
+
+    return 1;
+
+  bad_end:
+    if (!con->handle) {
+        MP_ERR(da, "mpg123 preinit error: %s\n", mpg123_plain_strerror(err));
+    } else {
+        MP_ERR(da, "mpg123 preinit error: %s\n", mpg123_strerror(con->handle));
+    }
+
+    uninit(da);
+    return 0;
+}
+
+static int mpg123_format_to_af(int mpg123_encoding)
+{
+    /* Without external force, mpg123 will always choose signed encoding,
+     * and non-16-bit only on builds that don't support it.
+     * Be reminded that it doesn't matter to the MPEG file what encoding
+     * is produced from it. */
+    switch (mpg123_encoding) {
+    case MPG123_ENC_SIGNED_8:   return AF_FORMAT_S8;
+    case MPG123_ENC_SIGNED_16:  return AF_FORMAT_S16;
+    case MPG123_ENC_SIGNED_32:  return AF_FORMAT_S32;
+    case MPG123_ENC_FLOAT_32:   return AF_FORMAT_FLOAT;
+    }
+    return 0;
+}
+
+/* Compute bitrate from frame size. */
+static int compute_bitrate(struct mpg123_frameinfo *i)
+{
+    static const int samples_per_frame[4][4] = {
+        {-1, 384, 1152, 1152},  /* MPEG 1 */
+        {-1, 384, 1152,  576},  /* MPEG 2 */
+        {-1, 384, 1152,  576},  /* MPEG 2.5 */
+        {-1,  -1,   -1,   -1},  /* Unknown */
+    };
+    return (int) ((i->framesize + 4) * 8 * i->rate /
+                  samples_per_frame[i->version][i->layer] + 0.5);
+}
+
+/* Update mean bitrate. This could be dropped if accurate time display
+ * on audio file playback is not desired. */
+static void update_info(struct dec_audio *da)
+{
+    struct ad_mpg123_context *con = da->priv;
+    struct mpg123_frameinfo finfo;
+    if (mpg123_info(con->handle, &finfo) != MPG123_OK)
+        return;
+
+    /* finfo.bitrate is expressed in kilobits */
+    const int bitrate = finfo.bitrate * 1000;
+
+    if (finfo.vbr != MPG123_CBR) {
+        if (--con->delay < 1) {
+            if (++con->mean_count > ((unsigned int) -1) / 2)
+                con->mean_count = ((unsigned int) -1) / 4;
+
+            /* Might not be numerically optimal, but works fine enough. */
+            con->mean_rate = ((con->mean_count - 1) * con->mean_rate +
+                              bitrate) / con->mean_count;
+            da->bitrate = (int) (con->mean_rate + 0.5);
+
+            con->delay = 10;
+        }
+    } else {
+        da->bitrate = bitrate ? bitrate : compute_bitrate(&finfo);
+        con->delay      = 1;
+        con->mean_rate  = 0.;
+        con->mean_count = 0;
+    }
+}
+
+/* libmpg123 has a new format ready; query and store, return return value
+   of mpg123_getformat() */
+static int set_format(struct dec_audio *da)
+{
+    struct ad_mpg123_context *con = da->priv;
+    int ret;
+    long rate;
+    int channels;
+    int encoding;
+    ret = mpg123_getformat(con->handle, &rate, &channels, &encoding);
+    if (ret == MPG123_OK) {
+        mp_audio_set_num_channels(&con->frame, channels);
+        con->frame.rate = rate;
+        int af = mpg123_format_to_af(encoding);
+        if (!af) {
+            /* This means we got a funny custom build of libmpg123 that only supports an unknown format. */
+            MP_ERR(da, "Bad encoding from mpg123: %i.\n", encoding);
+            return MPG123_ERR;
+        }
+        mp_audio_set_format(&con->frame, af);
+        con->sample_size = channels * af_fmt2bps(af);
+    }
+    return ret;
+}
+
+static int decode_packet(struct dec_audio *da, struct mp_audio **out)
+{
+    struct ad_mpg123_context *con = da->priv;
+    int ret;
+
+    struct demux_packet *pkt;
+    if (demux_read_packet_async(da->header, &pkt) == 0)
+        return AD_WAIT;
+    if (!pkt)
+        return AD_EOF;
+
+    /* Next bytes from that presentation time. */
+    if (pkt->pts != MP_NOPTS_VALUE) {
+        da->pts        = pkt->pts;
+        da->pts_offset = 0;
+    }
+
+    /* Have to use mpg123_feed() to avoid decoding here. */
+    ret = mpg123_feed(con->handle, pkt->buffer, pkt->len);
+    talloc_free(pkt);
+
+    if (ret != MPG123_OK)
+        goto mpg123_fail;
+
+    unsigned char *audio = NULL;
+    size_t bytes = 0;
+    ret = mpg123_decode_frame(con->handle, NULL, &audio, &bytes);
+
+    if (ret == MPG123_NEED_MORE)
+        return 0;
+
+    if (ret != MPG123_OK && ret != MPG123_DONE && ret != MPG123_NEW_FORMAT)
+        goto mpg123_fail;
+
+    ret = set_format(da);
+    if (ret != MPG123_OK)
+        goto mpg123_fail;
+
+    if (con->sample_size < 1) {
+        MP_ERR(da, "no sample size\n");
+        return AD_ERR;
+    }
+
+    int got_samples = bytes / con->sample_size;
+    *out = mp_audio_pool_get(da->pool, &con->frame, got_samples);
+    if (!*out)
+        return AD_ERR;
+
+    memcpy((*out)->planes[0], audio, bytes);
+
+    update_info(da);
+    return 0;
+
+mpg123_fail:
+    MP_ERR(da, "mpg123 decoding error: %s\n", mpg123_strerror(con->handle));
+    return AD_ERR;
+}
+
+static int control(struct dec_audio *da, int cmd, void *arg)
+{
+    struct ad_mpg123_context *con = da->priv;
+
+    switch (cmd) {
+    case ADCTRL_RESET:
+        mpg123_close(con->handle);
+
+        if (mpg123_open_feed(con->handle) != MPG123_OK) {
+            MP_ERR(da, "mpg123 failed to reopen stream: %s\n",
+                   mpg123_strerror(con->handle));
+            return CONTROL_FALSE;
+        }
+        return CONTROL_TRUE;
+    }
+    return CONTROL_UNKNOWN;
+}
+
+static void add_decoders(struct mp_decoder_list *list)
+{
+    mp_add_decoder(list, "mpg123", "mp3", "mp3",
+                   "High-performance decoder using libmpg123");
+}
+
+const struct ad_functions ad_mpg123 = {
+    .name = "mpg123",
+    .add_decoders = add_decoders,
+    .init = init,
+    .uninit = uninit,
+    .control = control,
+    .decode_packet = decode_packet,
+};

audio/decode/ad_spdif.c

@@ -1,20 +1,21 @@
 /*
+ * This file is part of MPlayer.
+ *
  * Copyright (C) 2012 Naoya OYAMA
  *
- * This file is part of mpv.
- *
- * mpv is free software; you can redistribute it and/or modify
+ * MPlayer is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * mpv is distributed in the hope that it will be useful,
+ * MPlayer is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with mpv.  If not, see <http://www.gnu.org/licenses/>.
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <string.h>
@@ -34,14 +35,12 @@
 
 struct spdifContext {
     struct mp_log   *log;
-    enum AVCodecID   codec_id;
     AVFormatContext *lavf_ctx;
+    int              iec61937_packet_size;
     int              out_buffer_len;
     uint8_t          out_buffer[OUTBUF_SIZE];
     bool             need_close;
-    bool             use_dts_hd;
     struct mp_audio  fmt;
-    struct mp_audio_pool *pool;
 };
 
 static int write_packet(void *p, uint8_t *buf, int buf_size)
@@ -79,86 +78,17 @@ static int init(struct dec_audio *da, const char *decoder)
     struct spdifContext *spdif_ctx = talloc_zero(NULL, struct spdifContext);
     da->priv = spdif_ctx;
     spdif_ctx->log = da->log;
-    spdif_ctx->use_dts_hd = da->opts->dtshd;
-    spdif_ctx->pool = mp_audio_pool_create(spdif_ctx);
-
-    if (strcmp(decoder, "dts-hd") == 0) {
-        decoder = "dts";
-        spdif_ctx->use_dts_hd = true;
-    }
-
-    spdif_ctx->codec_id = mp_codec_to_av_codec_id(decoder);
-    return spdif_ctx->codec_id != AV_CODEC_ID_NONE;
-}
-
-static int determine_codec_profile(struct dec_audio *da, AVPacket *pkt)
-{
-    struct spdifContext *spdif_ctx = da->priv;
-    int profile = FF_PROFILE_UNKNOWN;
-    AVCodecContext *ctx = NULL;
-    AVFrame *frame = NULL;
-
-    AVCodec *codec = avcodec_find_decoder(spdif_ctx->codec_id);
-    if (!codec)
-        goto done;
-
-    frame = av_frame_alloc();
-    if (!frame)
-        goto done;
-
-    ctx = avcodec_alloc_context3(codec);
-    if (!ctx)
-        goto done;
-
-    if (avcodec_open2(ctx, codec, NULL) < 0) {
-        av_free(ctx); // don't attempt to avcodec_close() an unopened ctx
-        ctx = NULL;
-        goto done;
-    }
-
-#if HAVE_AVCODEC_NEW_CODEC_API
-    if (avcodec_send_packet(ctx, pkt) < 0)
-        goto done;
-    if (avcodec_receive_frame(ctx, frame) < 0)
-        goto done;
-#else
-    int got_frame = 0;
-    if (avcodec_decode_audio4(ctx, frame, &got_frame, pkt) < 1 || !got_frame)
-        goto done;
-#endif
-
-    profile = ctx->profile;
-
-done:
-    av_frame_free(&frame);
-    if (ctx)
-        avcodec_close(ctx);
-    avcodec_free_context(&ctx);
-
-    if (profile == FF_PROFILE_UNKNOWN)
-        MP_WARN(da, "Failed to parse codec profile.\n");
-
-    return profile;
-}
-
-static int init_filter(struct dec_audio *da, AVPacket *pkt)
-{
-    struct spdifContext *spdif_ctx = da->priv;
-
-    int profile = FF_PROFILE_UNKNOWN;
-    if (spdif_ctx->codec_id == AV_CODEC_ID_DTS)
-        profile = determine_codec_profile(da, pkt);
 
     AVFormatContext *lavf_ctx  = avformat_alloc_context();
     if (!lavf_ctx)
         goto fail;
 
-    spdif_ctx->lavf_ctx = lavf_ctx;
-
     lavf_ctx->oformat = av_guess_format("spdif", NULL, NULL);
     if (!lavf_ctx->oformat)
         goto fail;
 
+    spdif_ctx->lavf_ctx = lavf_ctx;
+
     void *buffer = av_mallocz(OUTBUF_SIZE);
     if (!buffer)
         abort();
@@ -178,55 +108,54 @@ static int init_filter(struct dec_audio *da, AVPacket *pkt)
     if (!stream)
         goto fail;
 
-#if HAVE_AVCODEC_HAS_CODECPAR
-    stream->codecpar->codec_id = spdif_ctx->codec_id;
-#else
-    stream->codec->codec_id = spdif_ctx->codec_id;
-#endif
+    stream->codec->codec_id = mp_codec_to_av_codec_id(decoder);
 
     AVDictionary *format_opts = NULL;
 
     int num_channels = 0;
     int sample_format = 0;
     int samplerate = 0;
-    switch (spdif_ctx->codec_id) {
+    switch (stream->codec->codec_id) {
     case AV_CODEC_ID_AAC:
+        spdif_ctx->iec61937_packet_size = 16384;
         sample_format                   = AF_FORMAT_S_AAC;
         samplerate                      = 48000;
         num_channels                    = 2;
         break;
     case AV_CODEC_ID_AC3:
+        spdif_ctx->iec61937_packet_size = 6144;
         sample_format                   = AF_FORMAT_S_AC3;
         samplerate                      = 48000;
         num_channels                    = 2;
         break;
-    case AV_CODEC_ID_DTS: {
-        bool is_hd = profile == FF_PROFILE_DTS_HD_HRA ||
-                     profile == FF_PROFILE_DTS_HD_MA ||
-                     profile == FF_PROFILE_UNKNOWN;
-        if (spdif_ctx->use_dts_hd && is_hd) {
+    case AV_CODEC_ID_DTS:
+        if (da->opts->dtshd) {
             av_dict_set(&format_opts, "dtshd_rate", "768000", 0); // 4*192000
-            sample_format               = AF_FORMAT_S_DTSHD;
-            samplerate                  = 192000;
-            num_channels                = 2*4;
+            spdif_ctx->iec61937_packet_size = 32768;
+            sample_format                   = AF_FORMAT_S_DTSHD;
+            samplerate                      = 192000;
+            num_channels                    = 2*4;
         } else {
-            sample_format               = AF_FORMAT_S_DTS;
-            samplerate                  = 48000;
-            num_channels                = 2;
+            spdif_ctx->iec61937_packet_size = 32768;
+            sample_format                   = AF_FORMAT_S_DTS;
+            samplerate                      = 48000;
+            num_channels                    = 2;
         }
         break;
-    }
     case AV_CODEC_ID_EAC3:
+        spdif_ctx->iec61937_packet_size = 24576;
         sample_format                   = AF_FORMAT_S_EAC3;
         samplerate                      = 192000;
         num_channels                    = 2;
         break;
     case AV_CODEC_ID_MP3:
+        spdif_ctx->iec61937_packet_size = 4608;
         sample_format                   = AF_FORMAT_S_MP3;
         samplerate                      = 48000;
         num_channels                    = 2;
         break;
     case AV_CODEC_ID_TRUEHD:
+        spdif_ctx->iec61937_packet_size = 61440;
         sample_format                   = AF_FORMAT_S_TRUEHD;
         samplerate                      = 192000;
         num_channels                    = 8;
@@ -247,45 +176,47 @@ static int init_filter(struct dec_audio *da, AVPacket *pkt)
 
     spdif_ctx->need_close = true;
 
-    return 0;
+    return 1;
 
 fail:
     uninit(da);
-    return -1;
+    return 0;
 }
 
-static int decode_packet(struct dec_audio *da, struct demux_packet *mpkt,
-                         struct mp_audio **out)
+static int decode_packet(struct dec_audio *da, struct mp_audio **out)
 {
     struct spdifContext *spdif_ctx = da->priv;
+    AVFormatContext     *lavf_ctx  = spdif_ctx->lavf_ctx;
 
     spdif_ctx->out_buffer_len  = 0;
 
-    if (!mpkt)
-        return 0;
+    struct demux_packet *mpkt;
+    if (demux_read_packet_async(da->header, &mpkt) == 0)
+        return AD_WAIT;
 
-    double pts = mpkt->pts;
+    if (!mpkt)
+        return AD_EOF;
 
     AVPacket pkt;
     mp_set_av_packet(&pkt, mpkt, NULL);
-    mpkt->len = 0; // will be fully consumed
     pkt.pts = pkt.dts = 0;
-    if (!spdif_ctx->lavf_ctx) {
-        if (init_filter(da, &pkt) < 0)
-            return -1;
+    MP_VERBOSE(da, "spdif packet, size=%d\n", pkt.size);
+    if (mpkt->pts != MP_NOPTS_VALUE) {
+        da->pts        = mpkt->pts;
+        da->pts_offset = 0;
     }
-    int ret = av_write_frame(spdif_ctx->lavf_ctx, &pkt);
-    avio_flush(spdif_ctx->lavf_ctx->pb);
+    int ret = av_write_frame(lavf_ctx, &pkt);
+    talloc_free(mpkt);
+    avio_flush(lavf_ctx->pb);
     if (ret < 0)
-        return -1;
+        return AD_ERR;
 
     int samples = spdif_ctx->out_buffer_len / spdif_ctx->fmt.sstride;
-    *out = mp_audio_pool_get(spdif_ctx->pool, &spdif_ctx->fmt, samples);
+    *out = mp_audio_pool_get(da->pool, &spdif_ctx->fmt, samples);
     if (!*out)
-        return -1;
+        return AD_ERR;
 
     memcpy((*out)->planes[0], spdif_ctx->out_buffer, spdif_ctx->out_buffer_len);
-    (*out)->pts = pts;
 
     return 0;
 }
@@ -314,8 +245,6 @@ static void add_decoders(struct mp_decoder_list *list)
                            "libavformat/spdifenc audio pass-through decoder");
         }
     }
-    mp_add_decoder(list, "spdif", "dts", "dts-hd",
-                   "libavformat/spdifenc audio pass-through decoder");
 }
 
 const struct ad_functions ad_spdif = {

audio/decode/dec_audio.c

@@ -1,30 +1,31 @@
 /*
- * This file is part of mpv.
+ * This file is part of MPlayer.
  *
- * mpv is free software; you can redistribute it and/or modify
+ * MPlayer is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * mpv is distributed in the hope that it will be useful,
+ * MPlayer is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with mpv.  If not, see <http://www.gnu.org/licenses/>.
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <math.h>
 #include <assert.h>
 
 #include <libavutil/mem.h>
 
 #include "demux/codec_tags.h"
 
+#include "config.h"
 #include "common/codecs.h"
 #include "common/msg.h"
 #include "misc/bstr.h"
@@ -42,18 +43,21 @@
 
 #include "audio/filter/af.h"
 
+extern const struct ad_functions ad_mpg123;
 extern const struct ad_functions ad_lavc;
 extern const struct ad_functions ad_spdif;
 
 static const struct ad_functions * const ad_drivers[] = {
     &ad_lavc,
+#if HAVE_MPG123
+    &ad_mpg123,
+#endif
     &ad_spdif,
     NULL
 };
 
 static void uninit_decoder(struct dec_audio *d_audio)
 {
-    audio_reset_decoding(d_audio);
     if (d_audio->ad_driver) {
         MP_VERBOSE(d_audio, "Uninit audio decoder.\n");
         d_audio->ad_driver->uninit(d_audio);
@@ -83,21 +87,11 @@ struct mp_decoder_list *audio_decoder_list(void)
     return list;
 }
 
-static struct mp_decoder_list *audio_select_decoders(struct dec_audio *d_audio)
+static struct mp_decoder_list *audio_select_decoders(const char *codec,
+                                                     char *selection)
 {
-    struct MPOpts *opts = d_audio->opts;
-    const char *codec = d_audio->codec->codec;
-
     struct mp_decoder_list *list = audio_decoder_list();
-    struct mp_decoder_list *new =
-        mp_select_decoders(list, codec, opts->audio_decoders);
-    if (d_audio->try_spdif) {
-        struct mp_decoder_list *spdif =
-            mp_select_decoder_list(list, codec, "spdif", opts->audio_spdif);
-        mp_append_decoders(spdif, new);
-        talloc_free(new);
-        new = spdif;
-    }
+    struct mp_decoder_list *new = mp_select_decoders(list, codec, selection);
     talloc_free(list);
     return new;
 }
@@ -111,13 +105,14 @@ static const struct ad_functions *find_driver(const char *name)
     return NULL;
 }
 
-int audio_init_best_codec(struct dec_audio *d_audio)
+int audio_init_best_codec(struct dec_audio *d_audio, char *audio_decoders)
 {
-    uninit_decoder(d_audio);
     assert(!d_audio->ad_driver);
+    audio_reset_decoding(d_audio);
 
     struct mp_decoder_entry *decoder = NULL;
-    struct mp_decoder_list *list = audio_select_decoders(d_audio);
+    struct mp_decoder_list *list =
+        audio_select_decoders(d_audio->header->codec, audio_decoders);
 
     mp_print_decoders(d_audio->log, MSGL_V, "Codec list:", list);
 
@@ -144,7 +139,7 @@ int audio_init_best_codec(struct dec_audio *d_audio)
         MP_VERBOSE(d_audio, "Selected audio codec: %s\n", d_audio->decoder_desc);
     } else {
         MP_ERR(d_audio, "Failed to initialize an audio decoder for codec '%s'.\n",
-               d_audio->codec->codec);
+               d_audio->header->codec ? d_audio->header->codec : "<unknown>");
     }
 
     talloc_free(list);
@@ -155,139 +150,108 @@ void audio_uninit(struct dec_audio *d_audio)
 {
     if (!d_audio)
         return;
+    MP_VERBOSE(d_audio, "Uninit audio filters...\n");
+    af_destroy(d_audio->afilter);
     uninit_decoder(d_audio);
+    talloc_free(d_audio->waiting);
     talloc_free(d_audio);
 }
 
+static int decode_new_frame(struct dec_audio *da)
+{
+    while (!da->waiting) {
+        int ret = da->ad_driver->decode_packet(da, &da->waiting);
+        if (ret < 0)
+            return ret;
+
+        if (da->waiting) {
+            da->pts_offset += da->waiting->samples;
+            da->decode_format = *da->waiting;
+            mp_audio_set_null_data(&da->decode_format);
+        }
+    }
+    return mp_audio_config_valid(da->waiting) ? AD_OK : AD_ERR;
+}
+
+/* Decode packets until we know the audio format. Then reinit the buffer.
+ * Returns AD_OK on success, negative AD_* code otherwise.
+ * Also returns AD_OK if already initialized (and does nothing).
+ */
+int initial_audio_decode(struct dec_audio *da)
+{
+    return decode_new_frame(da);
+}
+
+static bool copy_output(struct af_stream *afs, struct mp_audio_buffer *outbuf,
+                        int minsamples, bool eof)
+{
+    while (mp_audio_buffer_samples(outbuf) < minsamples) {
+        if (af_output_frame(afs, eof) < 0)
+            return true; // error, stop doing stuff
+        struct mp_audio *mpa = af_read_output_frame(afs);
+        if (!mpa)
+            return false; // out of data
+        mp_audio_buffer_append(outbuf, mpa);
+        talloc_free(mpa);
+    }
+    return true;
+}
+
+/* Try to get at least minsamples decoded+filtered samples in outbuf
+ * (total length including possible existing data).
+ * Return 0 on success, or negative AD_* error code.
+ * In the former case outbuf has at least minsamples buffered on return.
+ * In case of EOF/error it might or might not be. */
+int audio_decode(struct dec_audio *da, struct mp_audio_buffer *outbuf,
+                 int minsamples)
+{
+    struct af_stream *afs = da->afilter;
+    if (afs->initialized < 1)
+        return AD_ERR;
+
+    MP_STATS(da, "start audio");
+
+    int res;
+    while (1) {
+        res = 0;
+
+        if (copy_output(afs, outbuf, minsamples, false))
+            break;
+
+        res = decode_new_frame(da);
+        if (res < 0) {
+            // drain filters first (especially for true EOF case)
+            copy_output(afs, outbuf, minsamples, true);
+            break;
+        }
+
+        // On format change, make sure to drain the filter chain.
+        if (!mp_audio_config_equals(&afs->input, da->waiting)) {
+            copy_output(afs, outbuf, minsamples, true);
+            res = AD_NEW_FMT;
+            break;
+        }
+
+        struct mp_audio *mpa = da->waiting;
+        da->waiting = NULL;
+        if (af_filter_frame(afs, mpa) < 0)
+            return AD_ERR;
+    }
+
+    MP_STATS(da, "end audio");
+
+    return res;
+}
+
 void audio_reset_decoding(struct dec_audio *d_audio)
 {
     if (d_audio->ad_driver)
         d_audio->ad_driver->control(d_audio, ADCTRL_RESET, NULL);
+    af_seek_reset(d_audio->afilter);
     d_audio->pts = MP_NOPTS_VALUE;
-    talloc_free(d_audio->current_frame);
-    d_audio->current_frame = NULL;
-    talloc_free(d_audio->packet);
-    d_audio->packet = NULL;
-    talloc_free(d_audio->new_segment);
-    d_audio->new_segment = NULL;
-    d_audio->start = d_audio->end = MP_NOPTS_VALUE;
-}
-
-static void fix_audio_pts(struct dec_audio *da)
-{
-    if (!da->current_frame)
-        return;
-
-    if (da->current_frame->pts != MP_NOPTS_VALUE) {
-        double newpts = da->current_frame->pts;
-
-        if (da->pts != MP_NOPTS_VALUE)
-            MP_STATS(da, "value %f audio-pts-err", da->pts - newpts);
-
-        // Keep the interpolated timestamp if it doesn't deviate more
-        // than 1 ms from the real one. (MKV rounded timestamps.)
-        if (da->pts == MP_NOPTS_VALUE || fabs(da->pts - newpts) > 0.001)
-            da->pts = newpts;
-    }
-
-    if (da->pts == MP_NOPTS_VALUE && da->header->missing_timestamps)
-        da->pts = 0;
-
-    da->current_frame->pts = da->pts;
-
-    if (da->pts != MP_NOPTS_VALUE)
-        da->pts += da->current_frame->samples / (double)da->current_frame->rate;
-}
-
-void audio_work(struct dec_audio *da)
-{
-    if (da->current_frame)
-        return;
-
-    if (!da->packet && !da->new_segment &&
-        demux_read_packet_async(da->header, &da->packet) == 0)
-    {
-        da->current_state = DATA_WAIT;
-        return;
-    }
-
-    if (da->packet && da->packet->new_segment) {
-        assert(!da->new_segment);
-        da->new_segment = da->packet;
-        da->packet = NULL;
-    }
-
-    bool had_input_packet = !!da->packet;
-    bool had_packet = da->packet || da->new_segment;
-
-    int ret = da->ad_driver->decode_packet(da, da->packet, &da->current_frame);
-    if (ret < 0 || (da->packet && da->packet->len == 0)) {
-        talloc_free(da->packet);
-        da->packet = NULL;
-    }
-
-    if (da->current_frame && !mp_audio_config_valid(da->current_frame)) {
-        talloc_free(da->current_frame);
-        da->current_frame = NULL;
-    }
-
-    da->current_state = DATA_OK;
-    if (!da->current_frame) {
-        da->current_state = DATA_EOF;
-        if (had_packet)
-            da->current_state = DATA_AGAIN;
-    }
-
-    fix_audio_pts(da);
-
-    bool segment_end = !da->current_frame && !had_input_packet;
-
-    if (da->current_frame) {
-        mp_audio_clip_timestamps(da->current_frame, da->start, da->end);
-        if (da->current_frame->pts != MP_NOPTS_VALUE && da->start != MP_NOPTS_VALUE)
-            segment_end = da->current_frame->pts >= da->end;
-        if (da->current_frame->samples == 0) {
-            talloc_free(da->current_frame);
-            da->current_frame = NULL;
-        }
-    }
-
-    // If there's a new segment, start it as soon as we're drained/finished.
-    if (segment_end && da->new_segment) {
-        struct demux_packet *new_segment = da->new_segment;
-        da->new_segment = NULL;
-
-        // Could avoid decoder reinit; would still need flush.
-        da->codec = new_segment->codec;
-        if (da->ad_driver)
-            da->ad_driver->uninit(da);
-        da->ad_driver = NULL;
-        audio_init_best_codec(da);
-
-        da->start = new_segment->start;
-        da->end = new_segment->end;
-
-        new_segment->new_segment = false;
-
-        da->packet = new_segment;
-        da->current_state = DATA_AGAIN;
+    d_audio->pts_offset = 0;
+    if (d_audio->waiting) {
+        talloc_free(d_audio->waiting);
+        d_audio->waiting = NULL;
     }
 }
-
-// Fetch an audio frame decoded with audio_work(). Returns one of:
-//  DATA_OK:    *out_frame is set to a new image
-//  DATA_WAIT:  waiting for demuxer; will receive a wakeup signal
-//  DATA_EOF:   end of file, no more frames to be expected
-//  DATA_AGAIN: dropped frame or something similar
-int audio_get_frame(struct dec_audio *da, struct mp_audio **out_frame)
-{
-    *out_frame = NULL;
-    if (da->current_frame) {
-        *out_frame = da->current_frame;
-        da->current_frame = NULL;
-        return DATA_OK;
-    }
-    if (da->current_state == DATA_OK)
-        return DATA_AGAIN;
-    return da->current_state;
-}

audio/decode/dec_audio.h

@@ -1,18 +1,19 @@
 /*
- * This file is part of mpv.
+ * This file is part of MPlayer.
  *
- * mpv is free software; you can redistribute it and/or modify
+ * MPlayer is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * mpv is distributed in the hope that it will be useful,
+ * MPlayer is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with mpv.  If not, see <http://www.gnu.org/licenses/>.
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifndef MPLAYER_DEC_AUDIO_H
@@ -32,31 +33,36 @@ struct dec_audio {
     struct mpv_global *global;
     const struct ad_functions *ad_driver;
     struct sh_stream *header;
-    struct mp_codec_params *codec;
+    struct af_stream *afilter;
     char *decoder_desc;
-
-    bool try_spdif;
-
+    int init_retries;
+    struct mp_audio_pool *pool;
+    struct mp_audio decode_format;
+    struct mp_audio *waiting;   // used on format-change
+    // set by decoder
+    int bitrate;                // input bitrate, can change with VBR sources
+    // last known pts value in output from decoder
+    double pts;
+    // number of samples output by decoder after last known pts
+    int pts_offset;
     // For free use by the ad_driver
     void *priv;
+};
 
-    // Strictly internal (dec_audio.c).
-
-    double pts; // endpts of previous frame
-    double start, end;
-    struct demux_packet *packet;
-    struct demux_packet *new_segment;
-    struct mp_audio *current_frame;
-    int current_state;
+enum {
+    AD_OK = 0,
+    AD_ERR = -1,
+    AD_EOF = -2,
+    AD_NEW_FMT = -3,
+    AD_WAIT = -4,
 };
 
 struct mp_decoder_list *audio_decoder_list(void);
-int audio_init_best_codec(struct dec_audio *d_audio);
+int audio_init_best_codec(struct dec_audio *d_audio, char *audio_decoders);
+int audio_decode(struct dec_audio *d_audio, struct mp_audio_buffer *outbuf,
+                 int minsamples);
+int initial_audio_decode(struct dec_audio *d_audio);
+void audio_reset_decoding(struct dec_audio *d_audio);
 void audio_uninit(struct dec_audio *d_audio);
 
-void audio_work(struct dec_audio *d_audio);
-int audio_get_frame(struct dec_audio *d_audio, struct mp_audio **out_frame);
-
-void audio_reset_decoding(struct dec_audio *d_audio);
-
 #endif /* MPLAYER_DEC_AUDIO_H */

audio/filter/af.c

@@ -1,18 +1,19 @@
 /*
- * This file is part of mpv.
+ * This file is part of MPlayer.
  *
- * mpv is free software; you can redistribute it and/or modify
+ * MPlayer is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * mpv is distributed in the hope that it will be useful,
+ * MPlayer is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with mpv.  If not, see <http://www.gnu.org/licenses/>.
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include "config.h"
@@ -31,33 +32,68 @@
 #include "af.h"
 
 // Static list of filters
+extern const struct af_info af_info_dummy;
+extern const struct af_info af_info_delay;
 extern const struct af_info af_info_channels;
 extern const struct af_info af_info_format;
+extern const struct af_info af_info_force;
 extern const struct af_info af_info_volume;
 extern const struct af_info af_info_equalizer;
 extern const struct af_info af_info_pan;
+extern const struct af_info af_info_surround;
+extern const struct af_info af_info_sub;
+extern const struct af_info af_info_export;
 extern const struct af_info af_info_drc;
+extern const struct af_info af_info_extrastereo;
 extern const struct af_info af_info_lavcac3enc;
 extern const struct af_info af_info_lavrresample;
+extern const struct af_info af_info_sweep;
+extern const struct af_info af_info_hrtf;
+extern const struct af_info af_info_ladspa;
+extern const struct af_info af_info_center;
+extern const struct af_info af_info_sinesuppress;
+extern const struct af_info af_info_karaoke;
 extern const struct af_info af_info_scaletempo;
+extern const struct af_info af_info_forcespeed;
 extern const struct af_info af_info_bs2b;
 extern const struct af_info af_info_lavfi;
-extern const struct af_info af_info_rubberband;
+extern const struct af_info af_info_convert24;
+extern const struct af_info af_info_convertsignendian;
 
 static const struct af_info *const filter_list[] = {
+    &af_info_dummy,
+    &af_info_delay,
     &af_info_channels,
     &af_info_format,
     &af_info_volume,
     &af_info_equalizer,
     &af_info_pan,
+    &af_info_surround,
+    &af_info_sub,
+    &af_info_export,
     &af_info_drc,
+    &af_info_extrastereo,
     &af_info_lavcac3enc,
     &af_info_lavrresample,
-#if HAVE_RUBBERBAND
-    &af_info_rubberband,
+    &af_info_sweep,
+    &af_info_hrtf,
+#if HAVE_LADSPA
+    &af_info_ladspa,
 #endif
+    &af_info_center,
+    &af_info_sinesuppress,
+    &af_info_karaoke,
+    &af_info_forcespeed,
     &af_info_scaletempo,
+#if HAVE_LIBBS2B
+    &af_info_bs2b,
+#endif
+#if HAVE_LIBAVFILTER
     &af_info_lavfi,
+#endif
+    // Must come last, because they're fallback format conversion filter
+    &af_info_convert24,
+    &af_info_convertsignendian,
     NULL
 };
 
@@ -155,21 +191,33 @@ static struct af_instance *af_create(struct af_stream *s, char *name,
         MP_ERR(s, "Couldn't find audio filter '%s'.\n", name);
         return NULL;
     }
+    const struct af_info *info = desc.p;
+    /* Make sure that the filter is not already in the list if it is
+       non-reentrant */
+    if (info->flags & AF_FLAGS_NOT_REENTRANT) {
+        for (struct af_instance *cur = s->first; cur; cur = cur->next) {
+            if (cur->info == info) {
+                MP_ERR(s, "There can only be one "
+                       "instance of the filter '%s' in each stream\n", name);
+                return NULL;
+            }
+        }
+    }
+
     MP_VERBOSE(s, "Adding filter %s \n", name);
 
     struct af_instance *af = talloc_zero(NULL, struct af_instance);
     *af = (struct af_instance) {
-        .info = desc.p,
+        .info = info,
         .data = talloc_zero(af, struct mp_audio),
         .log = mp_log_new(af, s->log, name),
-        .opts = s->opts,
         .replaygain_data = s->replaygain_data,
         .out_pool = mp_audio_pool_create(af),
     };
-    struct m_config *config =
-        m_config_from_obj_desc_and_args(af, s->log, NULL, &desc,
-                                        name, s->opts->af_defs, args);
-    if (!config)
+    struct m_config *config = m_config_from_obj_desc(af, s->log, &desc);
+    if (m_config_apply_defaults(config, name, s->opts->af_defs) < 0)
+        goto error;
+    if (m_config_set_obj_params(config, args) < 0)
         goto error;
     af->priv = config->optstruct;
 
@@ -208,6 +256,29 @@ static struct af_instance *af_prepend(struct af_stream *s,
     return new;
 }
 
+/* Create and insert a new filter of type name after the filter in the
+   argument. This function can be called during runtime, the return
+   value is the new filter */
+static struct af_instance *af_append(struct af_stream *s,
+                                     struct af_instance *af,
+                                     char *name, char **args)
+{
+    if (!af)
+        af = s->first;
+    if (af == s->last)
+        af = s->last->prev;
+    // Create the new filter and make sure it is OK
+    struct af_instance *new = af_create(s, name, args);
+    if (!new)
+        return NULL;
+    // Update pointers
+    new->prev = af;
+    new->next = af->next;
+    af->next = new;
+    new->next->prev = new;
+    return new;
+}
+
 // Uninit and remove the filter "af"
 static void af_remove(struct af_stream *s, struct af_instance *af)
 {
@@ -250,12 +321,8 @@ static void af_print_filter_chain(struct af_stream *s, struct af_instance *at,
     while (af) {
         char b[128] = {0};
         mp_snprintf_cat(b, sizeof(b), "  [%s] ", af->info->name);
-        if (af->label)
-            mp_snprintf_cat(b, sizeof(b), "\"%s\" ", af->label);
         if (af->data)
             mp_snprintf_cat(b, sizeof(b), "%s", mp_audio_config_to_str(af->data));
-        if (af->auto_inserted)
-            mp_snprintf_cat(b, sizeof(b), " [a]");
         if (af == at)
             mp_snprintf_cat(b, sizeof(b), " <-");
         MP_MSG(s, msg_level, "%s\n", b);
@@ -266,168 +333,231 @@ static void af_print_filter_chain(struct af_stream *s, struct af_instance *at,
     MP_MSG(s, msg_level, "  [ao] %s\n", mp_audio_config_to_str(&s->output));
 }
 
-static void reset_formats(struct af_stream *s)
+static int af_count_filters(struct af_stream *s)
 {
-    struct mp_audio none = {0};
-    for (struct af_instance *af = s->first; af; af = af->next) {
-        if (af != s->first && af != s->last)
-            mp_audio_copy_config(af->data, &none);
-    }
+    int count = 0;
+    for (struct af_instance *af = s->first; af; af = af->next)
+        count++;
+    return count;
 }
 
-static int filter_reinit(struct af_instance *af)
+// Finds the first conversion filter on the way from srcfmt to dstfmt.
+// Conversions form a DAG: each node is a format/filter pair, and possible
+// conversions are edges. We search the DAG for the shortest path.
+// Some cases visit the same filter multiple times, but with different formats
+// (like u24le->s8), so one node per format or filter separate is not enough.
+// Returns the filter and dest. format for the first conversion step.
+// (So we know what conversion filter with what format to insert next.)
+static char *af_find_conversion_filter(int srcfmt, int *dstfmt)
 {
+#define MAX_NODES (64 * 32)
+    int num_fmt = 0, num_filt = 0;
+    for (int n = 0; filter_list[n]; n++)
+        num_filt = n + 1;
+    for (int n = 0; af_fmtstr_table[n].format; n++)
+        num_fmt = n + 1;
+
+    int num_nodes = num_fmt * num_filt;
+    assert(num_nodes < MAX_NODES);
+
+    bool visited[MAX_NODES] = {0};
+    unsigned char distance[MAX_NODES];
+    short previous[MAX_NODES] = {0};
+    for (int n = 0; n < num_nodes; n++) {
+        distance[n] = 255;
+        if (af_fmtstr_table[n % num_fmt].format == srcfmt)
+            distance[n] = 0;
+    }
+
+    while (1) {
+        int next = -1;
+        for (int n = 0; n < num_nodes; n++) {
+            if (!visited[n] && (next < 0 || (distance[n] < distance[next])))
+                next = n;
+        }
+        if (next < 0 || distance[next] == 255)
+            return NULL;
+        visited[next] = true;
+
+        int fmt = next % num_fmt;
+        if (af_fmtstr_table[fmt].format == *dstfmt) {
+            // Best match found
+            for (int cur = next; cur >= 0; cur = previous[cur] - 1) {
+                if (distance[cur] == 1) {
+                    *dstfmt = af_fmtstr_table[cur % num_fmt].format;
+                    return (char *)filter_list[cur / num_fmt]->name;
+                }
+            }
+            return NULL;
+        }
+
+        for (int n = 0; filter_list[n]; n++) {
+            const struct af_info *af = filter_list[n];
+            if (!af->test_conversion)
+                continue;
+            for (int i = 0; af_fmtstr_table[i].format; i++) {
+                if (i != fmt && af->test_conversion(af_fmtstr_table[fmt].format,
+                                                    af_fmtstr_table[i].format))
+                {
+                    int other = n * num_fmt + i;
+                    int ndist = distance[next] + 1;
+                    if (ndist < distance[other]) {
+                        distance[other] = ndist;
+                        previous[other] = next + 1;
+                    }
+                }
+            }
+        }
+    }
+    assert(0);
+#undef MAX_NODES
+}
+
+static bool af_is_conversion_filter(struct af_instance *af)
+{
+    return af && af->info->test_conversion != NULL;
+}
+
+// in is what af can take as input - insert a conversion filter if the actual
+// input format doesn't match what af expects.
+// Returns:
+//   AF_OK: must call af_reinit() or equivalent, format matches (or is closer)
+//   AF_FALSE: nothing was changed, format matches
+//   else: error
+static int af_fix_format_conversion(struct af_stream *s,
+                                    struct af_instance **p_af,
+                                    struct mp_audio in)
+{
+    int rv;
+    struct af_instance *af = *p_af;
     struct af_instance *prev = af->prev;
-    assert(prev);
-
-    // Check if this is the first filter
-    struct mp_audio in = *prev->data;
-    // Reset just in case...
-    mp_audio_set_null_data(&in);
-
-    if (!mp_audio_config_valid(&in))
+    struct mp_audio actual = *prev->data;
+    if (actual.format == in.format)
+        return AF_FALSE;
+    int dstfmt = in.format;
+    char *filter = af_find_conversion_filter(actual.format, &dstfmt);
+    if (!filter)
         return AF_ERROR;
-
-    af->fmt_in = in;
-    int rv = af->control(af, AF_CONTROL_REINIT, &in);
-    if (rv == AF_OK && !mp_audio_config_equals(&in, prev->data))
-        rv = AF_FALSE; // conversion filter needed
-    if (rv == AF_FALSE)
-        af->fmt_in = in;
-
-    if (rv == AF_OK) {
-        if (!mp_audio_config_valid(af->data))
-            return AF_ERROR;
-        af->fmt_out = *af->data;
+    if (strcmp(filter, prev->info->name) == 0) {
+        if (prev->control(prev, AF_CONTROL_SET_FORMAT, &dstfmt) == AF_OK) {
+            *p_af = prev;
+            return AF_OK;
+        }
     }
-
-    return rv;
+    struct af_instance *new = af_prepend(s, af, filter, NULL);
+    if (new == NULL)
+        return AF_ERROR;
+    new->auto_inserted = true;
+    if (AF_OK != (rv = new->control(new, AF_CONTROL_SET_FORMAT, &dstfmt)))
+        return rv;
+    *p_af = new;
+    return AF_OK;
 }
 
-static int filter_reinit_with_conversion(struct af_stream *s, struct af_instance *af)
+// same as af_fix_format_conversion - only wrt. channels
+static int af_fix_channels(struct af_stream *s, struct af_instance **p_af,
+                           struct mp_audio in)
 {
-    int rv = filter_reinit(af);
-
-    // Conversion filter is needed
-    if (rv == AF_FALSE) {
-        // First try if we can change the output format of the previous
-        // filter to the input format the current filter is expecting.
-        struct mp_audio in = af->fmt_in;
-        if (af->prev != s->first && !mp_audio_config_equals(af->prev->data, &in)) {
-            // This should have been successful (because it succeeded
-            // before), even if just reverting to the old output format.
-            mp_audio_copy_config(af->prev->data, &in);
-            rv = filter_reinit(af->prev);
-            if (rv != AF_OK)
-                return rv;
-        }
-        if (!mp_audio_config_equals(af->prev->data, &in)) {
-            // Retry with conversion filter added.
-            struct af_instance *new =
-                af_prepend(s, af, "lavrresample", NULL);
-            if (!new)
-                return AF_ERROR;
-            new->auto_inserted = true;
-            mp_audio_copy_config(new->data, &in);
-            rv = filter_reinit(new);
-            if (rv != AF_OK)
-                af_remove(s, new);
-        }
-        if (rv == AF_OK)
-            rv = filter_reinit(af);
+    int rv;
+    struct af_instance *af = *p_af;
+    struct af_instance *prev = af->prev;
+    struct mp_audio actual = *prev->data;
+    if (mp_chmap_equals(&actual.channels, &in.channels))
+        return AF_FALSE;
+    if (prev->control(prev, AF_CONTROL_SET_CHANNELS, &in.channels) == AF_OK) {
+        *p_af = prev;
+        return AF_OK;
     }
-
-    return rv;
+    char *filter = "lavrresample";
+    struct af_instance *new = af_prepend(s, af, filter, NULL);
+    if (new == NULL)
+        return AF_ERROR;
+    new->auto_inserted = true;
+    if (AF_OK != (rv = new->control(new, AF_CONTROL_SET_CHANNELS, &in.channels)))
+        return rv;
+    *p_af = new;
+    return AF_OK;
 }
 
-static int af_find_output_conversion(struct af_stream *s, struct mp_audio *cfg)
+static int af_fix_rate(struct af_stream *s, struct af_instance **p_af,
+                       struct mp_audio in)
 {
-    assert(mp_audio_config_valid(&s->output));
-    assert(s->initialized > 0);
-
-    if (mp_chmap_equals_reordered(&s->input.channels, &s->output.channels))
-        return AF_ERROR;
-
-    // Heuristic to detect point of conversion. If it looks like something
-    // more complicated is going on, better bail out.
-    // We expect that the last filter converts channels.
-    struct af_instance *conv = s->last->prev;
-    if (!conv->auto_inserted)
-        return AF_ERROR;
-    if (!(mp_chmap_equals_reordered(&conv->fmt_in.channels, &s->input.channels) &&
-          mp_chmap_equals_reordered(&conv->fmt_out.channels, &s->output.channels)))
-        return AF_ERROR;
-    // Also, should be the only one which does auto conversion.
-    for (struct af_instance *af = s->first->next; af != s->last; af = af->next)
-    {
-        if (af != conv && af->auto_inserted &&
-            !mp_chmap_equals_reordered(&af->fmt_in.channels, &af->fmt_out.channels))
-            return AF_ERROR;
+    int rv;
+    struct af_instance *af = *p_af;
+    struct af_instance *prev = af->prev;
+    struct mp_audio actual = *prev->data;
+    if (actual.rate == in.rate)
+        return AF_FALSE;
+    if (prev->control(prev, AF_CONTROL_SET_RESAMPLE_RATE, &in.rate) == AF_OK) {
+        *p_af = prev;
+        return AF_OK;
     }
-    // And not if it's the only filter.
-    if (conv->prev == s->first && conv->next == s->last)
+    char *filter = "lavrresample";
+    struct af_instance *new = af_prepend(s, af, filter, NULL);
+    if (new == NULL)
         return AF_ERROR;
-
-    *cfg = s->output;
+    new->auto_inserted = true;
+    if (AF_OK != (rv = new->control(new, AF_CONTROL_SET_RESAMPLE_RATE, &in.rate)))
+        return rv;
+    *p_af = new;
     return AF_OK;
 }
 
 // Return AF_OK on success or AF_ERROR on failure.
-static int af_do_reinit(struct af_stream *s, bool second_pass)
+// Warning:
+// A failed af_reinit() leaves the audio chain behind in a useless, broken
+// state (for example, format filters that were tentatively inserted stay
+// inserted).
+// In that case, you should always rebuild the filter chain, or abort.
+static int af_reinit(struct af_stream *s)
 {
-    struct mp_audio convert_early = {0};
-    if (second_pass) {
-        // If a channel conversion happens, and it is done by an auto-inserted
-        // filter, then insert a filter to convert it early. Otherwise, do
-        // nothing and return immediately.
-        if (af_find_output_conversion(s, &convert_early) != AF_OK)
-            return AF_OK;
-    }
-
     remove_auto_inserted_filters(s);
     af_chain_forget_frames(s);
-    reset_formats(s);
     s->first->fmt_in = s->first->fmt_out = s->input;
-
-    if (mp_audio_config_valid(&convert_early)) {
-        struct af_instance *new = af_prepend(s, s->first, "lavrresample", NULL);
-        if (!new)
-            return AF_ERROR;
-        new->auto_inserted = true;
-        mp_audio_copy_config(new->data, &convert_early);
-        int rv = filter_reinit(new);
-        if (rv != AF_DETACH && rv != AF_OK)
-            return AF_ERROR;
-        MP_VERBOSE(s, "Moving up output conversion.\n");
-    }
-
     // Start with the second filter, as the first filter is the special input
     // filter which needs no initialization.
     struct af_instance *af = s->first->next;
+    // Up to 7 retries per filter (channel, rate, 5x format conversions)
+    int max_retry = af_count_filters(s) * 7;
+    int retry = 0;
     while (af) {
-        int rv = filter_reinit_with_conversion(s, af);
+        if (retry >= max_retry)
+            goto negotiate_error;
 
+        // Check if this is the first filter
+        struct mp_audio in = *af->prev->data;
+        // Reset just in case...
+        mp_audio_set_null_data(&in);
+
+        if (!mp_audio_config_valid(&in))
+            goto error;
+
+        af->fmt_in = in;
+        int rv = af->control(af, AF_CONTROL_REINIT, &in);
+        if (rv == AF_OK && !mp_audio_config_equals(&in, af->prev->data))
+            rv = AF_FALSE; // conversion filter needed
         switch (rv) {
         case AF_OK:
+            if (!mp_audio_config_valid(af->data))
+                goto error;
+            af->fmt_out = *af->data;
             af = af->next;
             break;
-        case AF_FALSE: {
-            // If the format conversion is (probably) caused by spdif, then
-            // (as a feature) drop the filter, instead of failing hard.
-            int fmt_in1 = af->prev->data->format;
-            int fmt_in2 = af->fmt_in.format;
-            if (af_fmt_is_valid(fmt_in1) && af_fmt_is_valid(fmt_in2)) {
-                bool spd1 = af_fmt_is_spdif(fmt_in1);
-                bool spd2 = af_fmt_is_spdif(fmt_in2);
-                if (spd1 != spd2 && af->next) {
-                    MP_WARN(af, "Filter %s apparently cannot be used due to "
-                                "spdif passthrough - removing it.\n",
-                                af->info->name);
-                    struct af_instance *aft = af->prev;
-                    af_remove(s, af);
-                    af = aft->next;
-                    continue;
-                }
+        case AF_FALSE: { // Configuration filter is needed
+            if (af_fix_channels(s, &af, in) == AF_OK) {
+                retry++;
+                continue;
+            }
+            if (af_fix_rate(s, &af, in) == AF_OK) {
+                retry++;
+                continue;
+            }
+            // Do this last, to prevent "format->lavrresample" being added to
+            // the filter chain when output formats not supported by
+            // af_lavrresample are in use.
+            if (af_fix_format_conversion(s, &af, in) == AF_OK) {
+                retry++;
+                continue;
             }
             goto negotiate_error;
         }
@@ -466,19 +596,6 @@ error:
     return AF_ERROR;
 }
 
-static int af_reinit(struct af_stream *s)
-{
-    int r = af_do_reinit(s, false);
-    if (r == AF_OK && mp_audio_config_valid(&s->output)) {
-        r = af_do_reinit(s, true);
-        if (r != AF_OK) {
-            MP_ERR(s, "Failed second pass filter negotiation.\n");
-            r = af_do_reinit(s, false);
-        }
-    }
-    return r;
-}
-
 // Uninit and remove all filters
 void af_uninit(struct af_stream *s)
 {
@@ -533,7 +650,7 @@ void af_destroy(struct af_stream *s)
    format of the preferred output respectively. The function is
    reentrant i.e. if called with an already initialized stream the
    stream will be reinitialized.
-   If one of the preferred output parameters is 0 the one that needs
+   If one of the prefered output parameters is 0 the one that needs
    no conversion is used (i.e. the output format in the last filter).
    The return value is 0 if success and -1 if failure */
 int af_init(struct af_stream *s)
@@ -570,25 +687,27 @@ int af_init(struct af_stream *s)
    to the stream s. The filter will be inserted somewhere nice in the
    list of filters. The return value is a pointer to the new filter,
    If the filter couldn't be added the return value is NULL. */
-struct af_instance *af_add(struct af_stream *s, char *name, char *label,
-                           char **args)
+struct af_instance *af_add(struct af_stream *s, char *name, char **args)
 {
-    assert(label);
-
-    if (af_find_by_label(s, label))
-        return NULL;
-
-    struct af_instance *new = af_prepend(s, s->last, name, args);
+    struct af_instance *new;
+    // Insert the filter somewhere nice
+    if (af_is_conversion_filter(s->first->next))
+        new = af_append(s, s->first->next, name, args);
+    else
+        new = af_prepend(s, s->first->next, name, args);
     if (!new)
         return NULL;
-    new->label = talloc_strdup(new, label);
 
-    // Reinitialize the filter list
+    // Reinitalize the filter list
     if (af_reinit(s) != AF_OK) {
-        af_remove_by_label(s, label);
+        af_remove(s, new);
+        if (af_reinit(s) != AF_OK) {
+            af_uninit(s);
+            af_init(s);
+        }
         return NULL;
     }
-    return af_find_by_label(s, label);
+    return new;
 }
 
 struct af_instance *af_find_by_label(struct af_stream *s, char *label)
@@ -653,29 +772,6 @@ void af_control_all(struct af_stream *s, int cmd, void *arg)
         af->control(af, cmd, arg);
 }
 
-int af_control_by_label(struct af_stream *s, int cmd, void *arg, bstr label)
-{
-    char *label_str = bstrdup0(NULL, label);
-    struct af_instance *cur = af_find_by_label(s, label_str);
-    talloc_free(label_str);
-    if (cur) {
-        return cur->control ? cur->control(cur, cmd, arg) : CONTROL_NA;
-    } else {
-        return CONTROL_UNKNOWN;
-    }
-}
-
-int af_send_command(struct af_stream *s, char *label, char *cmd, char *arg)
-{
-    char *args[2] = {cmd, arg};
-    if (strcmp(label, "all") == 0) {
-        af_control_all(s, AF_CONTROL_COMMAND, args);
-        return 0;
-    } else {
-        return af_control_by_label(s, AF_CONTROL_COMMAND, args, bstr0(label));
-    }
-}
-
 // Used by filters to add a filtered frame to the output queue.
 // Ownership of frame is transferred from caller to the filter chain.
 void af_add_output_frame(struct af_instance *af, struct mp_audio *frame)
@@ -705,16 +801,6 @@ static struct mp_audio *af_dequeue_output_frame(struct af_instance *af)
     return res;
 }
 
-static void read_remaining(struct af_instance *af)
-{
-    int num_frames;
-    do {
-        num_frames = af->num_out_queued;
-        if (!af->filter_out || af->filter_out(af) < 0)
-            break;
-    } while (num_frames != af->num_out_queued);
-}
-
 static int af_do_filter(struct af_instance *af, struct mp_audio *frame)
 {
     if (frame)
@@ -754,7 +840,6 @@ int af_output_frame(struct af_stream *s, bool eof)
             // Flush remaining frames on EOF, but do that only if the previous
             // filters have been flushed (i.e. they have no more output).
             if (eof && !last) {
-                read_remaining(cur);
                 int r = af_do_filter(cur, NULL);
                 if (r < 0)
                     return r;
@@ -779,12 +864,6 @@ struct mp_audio *af_read_output_frame(struct af_stream *s)
     return af_dequeue_output_frame(s->last);
 }
 
-void af_unread_output_frame(struct af_stream *s, struct mp_audio *frame)
-{
-    struct af_instance *af = s->last;
-    MP_TARRAY_INSERT_AT(af, af->out_queued, af->num_out_queued, 0, frame);
-}
-
 // Make sure the caller can change data referenced by the frame.
 // Return negative error code on failure (i.e. you can't write).
 int af_make_writeable(struct af_instance *af, struct mp_audio *frame)

audio/filter/af.h

@@ -1,18 +1,19 @@
 /*
- * This file is part of mpv.
+ * This file is part of MPlayer.
  *
- * mpv is free software; you can redistribute it and/or modify
+ * MPlayer is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * mpv is distributed in the hope that it will be useful,
+ * MPlayer is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with mpv.  If not, see <http://www.gnu.org/licenses/>.
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifndef MPLAYER_AF_H
@@ -27,7 +28,6 @@
 #include "audio/chmap.h"
 #include "audio/audio.h"
 #include "common/msg.h"
-#include "common/common.h"
 
 struct af_instance;
 struct mpv_global;
@@ -35,6 +35,10 @@ struct mpv_global;
 // Number of channels
 #define AF_NCH MP_NUM_CHANNELS
 
+// Flags used for defining the behavior of an audio filter
+#define AF_FLAGS_REENTRANT      0x00000000
+#define AF_FLAGS_NOT_REENTRANT  0x00000001
+
 // Flags for af->filter()
 #define AF_FILTER_FLAG_EOF 1
 
@@ -43,7 +47,9 @@ struct mpv_global;
 struct af_info {
     const char *info;
     const char *name;
+    const int flags;
     int (*open)(struct af_instance *vf);
+    bool (*test_conversion)(int src_format, int dst_format);
     int priv_size;
     const void *priv_defaults;
     const struct m_option *options;
@@ -53,7 +59,6 @@ struct af_info {
 struct af_instance {
     const struct af_info *info;
     struct mp_log *log;
-    struct MPOpts *opts;
     struct replaygain_data *replaygain_data;
     int (*control)(struct af_instance *af, int cmd, void *arg);
     void (*uninit)(struct af_instance *af);
@@ -101,17 +106,21 @@ struct af_stream {
 };
 
 // Return values
-#define AF_DETACH   (CONTROL_OK + 1)
-#define AF_OK       CONTROL_OK
-#define AF_TRUE     CONTROL_TRUE
-#define AF_FALSE    CONTROL_FALSE
-#define AF_UNKNOWN  CONTROL_UNKNOWN
-#define AF_ERROR    CONTROL_ERROR
+#define AF_DETACH   2
+#define AF_OK       1
+#define AF_TRUE     1
+#define AF_FALSE    0
+#define AF_UNKNOWN -1
+#define AF_ERROR   -2
+#define AF_FATAL   -3
 
 // Parameters for af_control_*
 enum af_control {
     AF_CONTROL_REINIT = 1,
     AF_CONTROL_RESET,
+    AF_CONTROL_SET_RESAMPLE_RATE,
+    AF_CONTROL_SET_FORMAT,
+    AF_CONTROL_SET_CHANNELS,
     AF_CONTROL_SET_VOLUME,
     AF_CONTROL_GET_VOLUME,
     AF_CONTROL_SET_PAN_LEVEL,
@@ -120,8 +129,6 @@ enum af_control {
     AF_CONTROL_GET_PAN_BALANCE,
     AF_CONTROL_SET_PLAYBACK_SPEED,
     AF_CONTROL_SET_PLAYBACK_SPEED_RESAMPLE,
-    AF_CONTROL_GET_METADATA,
-    AF_CONTROL_COMMAND,
 };
 
 // Argument for AF_CONTROL_SET_PAN_LEVEL
@@ -134,28 +141,27 @@ struct af_stream *af_new(struct mpv_global *global);
 void af_destroy(struct af_stream *s);
 int af_init(struct af_stream *s);
 void af_uninit(struct af_stream *s);
-struct af_instance *af_add(struct af_stream *s, char *name, char *label,
-                           char **args);
+struct af_instance *af_add(struct af_stream *s, char *name, char **args);
 int af_remove_by_label(struct af_stream *s, char *label);
 struct af_instance *af_find_by_label(struct af_stream *s, char *label);
 struct af_instance *af_control_any_rev(struct af_stream *s, int cmd, void *arg);
 void af_control_all(struct af_stream *s, int cmd, void *arg);
-int af_control_by_label(struct af_stream *s, int cmd, void *arg, bstr label);
 void af_seek_reset(struct af_stream *s);
-int af_send_command(struct af_stream *s, char *label, char *cmd, char *arg);
 
 void af_add_output_frame(struct af_instance *af, struct mp_audio *frame);
 int af_filter_frame(struct af_stream *s, struct mp_audio *frame);
 int af_output_frame(struct af_stream *s, bool eof);
 struct mp_audio *af_read_output_frame(struct af_stream *s);
-void af_unread_output_frame(struct af_stream *s, struct mp_audio *frame);
 int af_make_writeable(struct af_instance *af, struct mp_audio *frame);
 
 double af_calc_delay(struct af_stream *s);
 
 int af_test_output(struct af_instance *af, struct mp_audio *out);
 
+int af_from_dB(int n, float *in, float *out, float k, float mi, float ma);
+int af_to_dB(int n, float *in, float *out, float k);
 int af_from_ms(int n, float *in, int *out, int rate, float mi, float ma);
+int af_to_ms(int n, int *in, float *out, int rate);
 float af_softclip(float a);
 
 #endif /* MPLAYER_AF_H */

audio/filter/af_bs2b.c

@@ -0,0 +1,172 @@
+/*
+ * The Bauer stereophonic-to-binaural DSP using bs2b library:
+ * http://bs2b.sourceforge.net/
+ *
+ * Copyright (c) 2009 Andrew Savchenko
+ *
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <bs2b.h>
+#include <inttypes.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "af.h"
+#include "options/m_option.h"
+
+/// Internal specific data of the filter
+struct af_bs2b {
+    int fcut;           ///< cut frequency in Hz
+    int feed;           ///< feed level for low frequencies in 0.1*dB
+    int profile  ;      ///< profile (available crossfeed presets)
+    t_bs2bdp filter;    ///< instance of a library filter
+};
+
+#define DEF_FILTER(fmt, name) \
+static int filter_##name(struct af_instance *af, struct mp_audio *data) \
+{ \
+    if (!data) \
+        return 0; \
+    if (af_make_writeable(af, data) < 0) { \
+        talloc_free(data); \
+        return -1; \
+    } \
+    bs2b_cross_feed_##name(((struct af_bs2b*)(af->priv))->filter, \
+        (data->planes[0]), data->samples); \
+    af_add_output_frame(af, data); \
+    return 0; \
+}
+
+#define GET_FILTER(fmt, name) \
+    case AF_FORMAT_##fmt: return filter_##name;
+
+#define FILTERS \
+    FILTER(FLOAT,   f)      \
+    FILTER(S32,     s32)    \
+    FILTER(U32,     u32)    \
+    FILTER(S24,     s24)    \
+    FILTER(U24,     u24)    \
+    FILTER(S16,     s16)    \
+    FILTER(U16,     u16)    \
+    FILTER(S8,      s8)     \
+    FILTER(U8,      u8)
+
+#define FILTER DEF_FILTER
+FILTERS
+#undef FILTER
+
+typedef int (*filter)(struct af_instance *af, struct mp_audio *d);
+static filter get_filter(int fmt)
+{
+    switch (fmt) {
+#define FILTER GET_FILTER
+FILTERS
+#undef FILTER
+    default: return NULL;
+    }
+}
+
+/// Initialization and runtime control
+static int control(struct af_instance *af, int cmd, void *arg)
+{
+    struct af_bs2b *s = af->priv;
+
+    switch (cmd) {
+    case AF_CONTROL_REINIT: {
+        int format;
+        // Sanity check
+        if (!arg) return AF_ERROR;
+
+        format           = ((struct mp_audio*)arg)->format;
+        af->data->rate   = ((struct mp_audio*)arg)->rate;
+        mp_audio_set_num_channels(af->data, 2);     // bs2b is useful only for 2ch audio
+        mp_audio_set_format(af->data, format);
+
+        /* check for formats supported by libbs2b
+           and assign corresponding handlers */
+        af->filter_frame = get_filter(format);
+        if (!af->filter_frame) {
+            af->filter_frame = filter_f;
+            mp_audio_set_format(af->data, AF_FORMAT_FLOAT);
+        }
+
+        // bs2b have srate limits, try to resample if needed
+        if (af->data->rate > BS2B_MAXSRATE || af->data->rate < BS2B_MINSRATE) {
+            af->data->rate = BS2B_DEFAULT_SRATE;
+            MP_WARN(af, "Requested sample rate %d Hz is out of bounds [%d..%d] Hz.\n"
+                   "Trying to resample to %d Hz.\n",
+                   af->data->rate, BS2B_MINSRATE, BS2B_MAXSRATE, BS2B_DEFAULT_SRATE);
+        }
+        bs2b_set_srate(s->filter, (long)af->data->rate);
+        MP_VERBOSE(af, "using format %s\n",
+               af_fmt_to_str(af->data->format));
+
+        return af_test_output(af,(struct mp_audio*)arg);
+    }
+    }
+    return AF_UNKNOWN;
+}
+
+/// Deallocate memory and close library
+static void uninit(struct af_instance *af)
+{
+    struct af_bs2b *s = af->priv;
+    if (s->filter)
+        bs2b_close(s->filter);
+}
+
+/// Allocate memory, set function pointers and init library
+static int af_open(struct af_instance *af)
+{
+    struct af_bs2b *s = af->priv;
+    af->control = control;
+    af->uninit  = uninit;
+
+    // NULL means failed initialization
+    if (!(s->filter = bs2b_open())) {
+        return AF_ERROR;
+    }
+
+    if (s->profile)
+        bs2b_set_level(s->filter, s->profile);
+    // set fcut and feed only if specified, otherwise defaults will be used
+    if (s->fcut)
+        bs2b_set_level_fcut(s->filter, s->fcut);
+    if (s->feed)
+        bs2b_set_level_feed(s->filter, s->feed);
+    return AF_OK;
+}
+
+#define OPT_BASE_STRUCT struct af_bs2b
+
+/// Description of this filter
+const struct af_info af_info_bs2b = {
+    .info = "Bauer stereophonic-to-binaural audio filter",
+    .name = "bs2b",
+    .open = af_open,
+    .priv_size = sizeof(struct af_bs2b),
+    .options = (const struct m_option[]) {
+        OPT_INTRANGE("fcut", fcut, 0, BS2B_MINFCUT, BS2B_MAXFCUT),
+        OPT_INTRANGE("feed", feed, 0, BS2B_MINFEED, BS2B_MAXFEED),
+        OPT_CHOICE("profile", profile, 0,
+                   ({"default", BS2B_DEFAULT_CLEVEL},
+                    {"cmoy", BS2B_CMOY_CLEVEL},
+                    {"jmeier", BS2B_JMEIER_CLEVEL})),
+        {0}
+    },
+};

audio/filter/af_center.c

@@ -0,0 +1,105 @@
+/*
+ * This filter adds a center channel to the audio stream by
+ * averaging the left and right channel.
+ * There are two runtime controls one for setting which channel
+ * to insert the center-audio into called AF_CONTROL_SUB_CH.
+ *
+ * FIXME: implement a high-pass filter for better results.
+ *
+ * copyright (c) 2005 Alex Beregszaszi
+ *
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "common/common.h"
+#include "af.h"
+
+// Data for specific instances of this filter
+typedef struct af_center_s
+{
+  int ch;               // Channel number which to insert the filtered data
+}af_center_t;
+
+// Initialization and runtime control
+static int control(struct af_instance* af, int cmd, void* arg)
+{
+  af_center_t* s   = af->priv;
+
+  switch(cmd){
+  case AF_CONTROL_REINIT:{
+    // Sanity check
+    if(!arg) return AF_ERROR;
+
+    af->data->rate   = ((struct mp_audio*)arg)->rate;
+    mp_audio_set_channels_old(af->data, MPMAX(s->ch+1,((struct mp_audio*)arg)->nch));
+    mp_audio_set_format(af->data, AF_FORMAT_FLOAT);
+
+    return af_test_output(af,(struct mp_audio*)arg);
+  }
+  }
+  return AF_UNKNOWN;
+}
+
+static int filter_frame(struct af_instance* af, struct mp_audio* data)
+{
+  if (!data)
+    return 0;
+  if (af_make_writeable(af, data) < 0) {
+    talloc_free(data);
+    return -1;
+  }
+  struct mp_audio*    c   = data;        // Current working data
+  af_center_t*  s   = af->priv; // Setup for this instance
+  float*        a   = c->planes[0];      // Audio data
+  int           nch = c->nch;    // Number of channels
+  int           len = c->samples*c->nch;         // Number of samples in current audio block
+  int           ch  = s->ch;     // Channel in which to insert the center audio
+  register int  i;
+
+  // Run filter
+  for(i=0;i<len;i+=nch){
+    // Average left and right
+    a[i+ch] = (a[i]/2) + (a[i+1]/2);
+  }
+
+  af_add_output_frame(af, data);
+  return 0;
+}
+
+// Allocate memory and set function pointers
+static int af_open(struct af_instance* af){
+  af->control=control;
+  af->filter_frame = filter_frame;
+  return AF_OK;
+}
+
+#define OPT_BASE_STRUCT af_center_t
+const struct af_info af_info_center = {
+    .info = "Audio filter for adding a center channel",
+    .name = "center",
+    .flags = AF_FLAGS_NOT_REENTRANT,
+    .open = af_open,
+    .priv_size = sizeof(af_center_t),
+    .options = (const struct m_option[]) {
+        OPT_INTRANGE("channel", ch, 0, 0, AF_NCH - 1, OPTDEF_INT(1)),
+        {0}
+    },
+};

audio/filter/af_channels.c

@@ -5,20 +5,21 @@
  *
  * Original author: Anders
  *
- * This file is part of mpv.
+ * This file is part of MPlayer.
  *
- * mpv is free software; you can redistribute it and/or modify
+ * MPlayer is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * mpv is distributed in the hope that it will be useful,
+ * MPlayer is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with mpv.  If not, see <http://www.gnu.org/licenses/>.
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <stdio.h>

audio/filter/af_convert24.c

@@ -0,0 +1,122 @@
+/*
+ * This file is part of mpv.
+ *
+ * mpv is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * mpv is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with mpv.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdlib.h>
+#include <assert.h>
+
+#include "audio/format.h"
+#include "af.h"
+#include "osdep/endian.h"
+
+static bool test_conversion(int src_format, int dst_format)
+{
+    return (src_format == AF_FORMAT_U24 && dst_format == AF_FORMAT_U32) ||
+           (src_format == AF_FORMAT_S24 && dst_format == AF_FORMAT_S32) ||
+           (src_format == AF_FORMAT_U32 && dst_format == AF_FORMAT_U24) ||
+           (src_format == AF_FORMAT_S32 && dst_format == AF_FORMAT_S24);
+}
+
+static int control(struct af_instance *af, int cmd, void *arg)
+{
+    switch (cmd) {
+    case AF_CONTROL_REINIT: {
+        struct mp_audio *in = arg;
+        struct mp_audio orig_in = *in;
+        struct mp_audio *out = af->data;
+
+        if (!test_conversion(in->format, out->format))
+            return AF_DETACH;
+
+        if ((in->format & AF_FORMAT_BITS_MASK) == AF_FORMAT_24BIT) {
+            mp_audio_set_format(out, af_fmt_change_bits(in->format, 32));
+        } else if ((in->format & AF_FORMAT_BITS_MASK) == AF_FORMAT_32BIT) {
+            mp_audio_set_format(out, af_fmt_change_bits(in->format, 24));
+        } else {
+            abort();
+        }
+
+        out->rate = in->rate;
+        mp_audio_set_channels(out, &in->channels);
+
+        assert(test_conversion(in->format, out->format));
+
+        return mp_audio_config_equals(in, &orig_in) ? AF_OK : AF_FALSE;
+    }
+    case AF_CONTROL_SET_FORMAT: {
+        mp_audio_set_format(af->data, *(int*)arg);
+        return AF_OK;
+    }
+    }
+    return AF_UNKNOWN;
+}
+
+// The LSB is always ignored.
+#if BYTE_ORDER == BIG_ENDIAN
+#define SHIFT(x) ((3-(x))*8)
+#else
+#define SHIFT(x) (((x)+1)*8)
+#endif
+
+static int filter(struct af_instance *af, struct mp_audio *data)
+{
+    if (!data)
+        return 0;
+    struct mp_audio *out =
+        mp_audio_pool_get(af->out_pool, af->data, data->samples);
+    if (!out) {
+        talloc_free(data);
+        return -1;
+    }
+    mp_audio_copy_attributes(out, data);
+
+    size_t len = mp_audio_psize(data) / data->bps;
+    if (data->bps == 4) {
+        for (int s = 0; s < len; s++) {
+            uint32_t val = *((uint32_t *)data->planes[0] + s);
+            uint8_t *ptr = (uint8_t *)out->planes[0] + s * 3;
+            ptr[0] = val >> SHIFT(0);
+            ptr[1] = val >> SHIFT(1);
+            ptr[2] = val >> SHIFT(2);
+        }
+    } else {
+        for (int s = 0; s < len; s++) {
+            uint8_t *ptr = (uint8_t *)data->planes[0] + s * 3;
+            uint32_t val = ptr[0] << SHIFT(0)
+                         | ptr[1] << SHIFT(1)
+                         | ptr[2] << SHIFT(2);
+            *((uint32_t *)out->planes[0] + s) = val;
+        }
+    }
+
+    talloc_free(data);
+    af_add_output_frame(af, out);
+    return 0;
+}
+
+static int af_open(struct af_instance *af)
+{
+    af->control = control;
+    af->filter_frame = filter;
+    return AF_OK;
+}
+
+const struct af_info af_info_convert24 = {
+    .info = "Convert between 24 and 32 bit sample format",
+    .name = "convert24",
+    .open = af_open,
+    .test_conversion = test_conversion,
+};

audio/filter/af_convertsignendian.c

@@ -0,0 +1,107 @@
+/*
+ * This file is part of mpv.
+ *
+ * mpv is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * mpv is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with mpv.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdlib.h>
+#include <assert.h>
+
+#include "af.h"
+#include "audio/format.h"
+#include "osdep/endian.h"
+
+static bool test_conversion(int src_format, int dst_format)
+{
+    if ((src_format & AF_FORMAT_PLANAR) ||
+        (dst_format & AF_FORMAT_PLANAR))
+        return false;
+    if (((src_format & ~AF_FORMAT_SIGN_MASK) ==
+         (dst_format & ~AF_FORMAT_SIGN_MASK)) &&
+        ((src_format & AF_FORMAT_TYPE_MASK) == AF_FORMAT_I))
+        return true;
+    return false;
+}
+
+static int control(struct af_instance *af, int cmd, void *arg)
+{
+    switch (cmd) {
+    case AF_CONTROL_REINIT: {
+        struct mp_audio *in = arg;
+        struct mp_audio orig_in = *in;
+        struct mp_audio *out = af->data;
+
+        if (!test_conversion(in->format, out->format))
+            return AF_DETACH;
+
+        out->rate = in->rate;
+        mp_audio_set_channels(out, &in->channels);
+
+        return mp_audio_config_equals(in, &orig_in) ? AF_OK : AF_FALSE;
+    }
+    case AF_CONTROL_SET_FORMAT: {
+        mp_audio_set_format(af->data, *(int*)arg);
+        return AF_OK;
+    }
+    }
+    return AF_UNKNOWN;
+}
+
+static void si2us(void *data, int len, int bps)
+{
+    ptrdiff_t i = -(len * bps);
+    uint8_t *p = &((uint8_t *)data)[len * bps];
+    if (BYTE_ORDER == LITTLE_ENDIAN && bps > 1)
+        p += bps - 1;
+    if (len <= 0)
+        return;
+    do {
+        p[i] ^= 0x80;
+    } while (i += bps);
+}
+
+static int filter(struct af_instance *af, struct mp_audio *data)
+{
+    if (!data)
+        return 0;
+    if (af_make_writeable(af, data) < 0) {
+        talloc_free(data);
+        return -1;
+    }
+
+    int infmt = data->format;
+    int outfmt = af->data->format;
+    size_t len = data->samples * data->nch;
+
+    if ((infmt & AF_FORMAT_SIGN_MASK) != (outfmt & AF_FORMAT_SIGN_MASK))
+        si2us(data->planes[0], len, data->bps);
+
+    mp_audio_set_format(data, outfmt);
+    af_add_output_frame(af, data);
+    return 0;
+}
+
+static int af_open(struct af_instance *af)
+{
+    af->control = control;
+    af->filter_frame = filter;
+    return AF_OK;
+}
+
+const struct af_info af_info_convertsignendian = {
+    .info = "Convert between sample format sign",
+    .name = "convertsign",
+    .open = af_open,
+    .test_conversion = test_conversion,
+};

audio/filter/af_delay.c

@@ -0,0 +1,195 @@
+/*
+ * This audio filter delays the output signal for the different
+ * channels and can be used for simple position panning.
+ * An extension for this filter would be a reverb.
+ *
+ * Original author: Anders
+ *
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <inttypes.h>
+
+#include "common/common.h"
+#include "af.h"
+
+#define L 65536
+
+#define UPDATEQI(qi) qi=(qi+1)&(L-1)
+
+// Data for specific instances of this filter
+typedef struct af_delay_s
+{
+  void* q[AF_NCH];      // Circular queues used for delaying audio signal
+  int   wi[AF_NCH];     // Write index
+  int   ri;             // Read index
+  float d[AF_NCH];      // Delay [ms]
+  char *delaystr;
+}af_delay_t;
+
+// Initialization and runtime control
+static int control(struct af_instance* af, int cmd, void* arg)
+{
+  af_delay_t* s = af->priv;
+  switch(cmd){
+  case AF_CONTROL_REINIT:{
+    int i;
+    struct mp_audio *in = arg;
+
+    if (in->bps != 1 && in->bps != 2 && in->bps != 4) {
+      MP_FATAL(af, "Sample format not supported\n");
+      return AF_ERROR;
+    }
+
+    // Free prevous delay queues
+    for(i=0;i<af->data->nch;i++)
+      free(s->q[i]);
+
+    mp_audio_force_interleaved_format(in);
+    mp_audio_copy_config(af->data, in);
+
+    // Allocate new delay queues
+    for(i=0;i<af->data->nch;i++){
+      s->q[i] = calloc(L,af->data->bps);
+      if(NULL == s->q[i])
+        MP_FATAL(af, "Out of memory\n");
+    }
+
+    if(AF_OK != af_from_ms(AF_NCH, s->d, s->wi, af->data->rate, 0.0, 1000.0))
+      return AF_ERROR;
+    s->ri = 0;
+    for(i=0;i<AF_NCH;i++){
+      MP_DBG(af, "Channel %i delayed by %0.3fms\n",
+             i,MPCLAMP(s->d[i],0.0,1000.0));
+      MP_TRACE(af, "Channel %i delayed by %i samples\n",
+             i,s->wi[i]);
+    }
+    return AF_OK;
+  }
+  }
+  return AF_UNKNOWN;
+}
+
+// Deallocate memory
+static void uninit(struct af_instance* af)
+{
+  int i;
+
+  for(i=0;i<AF_NCH;i++)
+      free(((af_delay_t*)(af->priv))->q[i]);
+}
+
+static int filter_frame(struct af_instance *af, struct mp_audio *c)
+{
+  if (!c)
+    return 0;
+  af_delay_t*   s   = af->priv; // Setup for this instance
+  int           nch = c->nch;    // Number of channels
+  int           len = mp_audio_psize(c)/c->bps; // Number of sample in data chunk
+  int           ri  = 0;
+  int           ch,i;
+  if (af_make_writeable(af, c) < 0) {
+    talloc_free(c);
+    return -1;
+  }
+  for(ch=0;ch<nch;ch++){
+    switch(c->bps){
+    case 1:{
+      int8_t* a = c->planes[0];
+      int8_t* q = s->q[ch];
+      int wi = s->wi[ch];
+      ri = s->ri;
+      for(i=ch;i<len;i+=nch){
+        q[wi] = a[i];
+        a[i]  = q[ri];
+        UPDATEQI(wi);
+        UPDATEQI(ri);
+      }
+      s->wi[ch] = wi;
+      break;
+    }
+    case 2:{
+      int16_t* a = c->planes[0];
+      int16_t* q = s->q[ch];
+      int wi = s->wi[ch];
+      ri = s->ri;
+      for(i=ch;i<len;i+=nch){
+        q[wi] = a[i];
+        a[i]  = q[ri];
+        UPDATEQI(wi);
+        UPDATEQI(ri);
+      }
+      s->wi[ch] = wi;
+      break;
+    }
+    case 4:{
+      int32_t* a = c->planes[0];
+      int32_t* q = s->q[ch];
+      int wi = s->wi[ch];
+      ri = s->ri;
+      for(i=ch;i<len;i+=nch){
+        q[wi] = a[i];
+        a[i]  = q[ri];
+        UPDATEQI(wi);
+        UPDATEQI(ri);
+      }
+      s->wi[ch] = wi;
+      break;
+    }
+    }
+  }
+  s->ri = ri;
+  af_add_output_frame(af, c);
+  return 0;
+}
+
+// Allocate memory and set function pointers
+static int af_open(struct af_instance* af){
+    af->control=control;
+    af->uninit=uninit;
+    af->filter_frame = filter_frame;
+    af_delay_t *s = af->priv;
+    int n = 1;
+    int i = 0;
+    char* cl = s->delaystr;
+    while(cl && n && i < AF_NCH ){
+      sscanf(cl,"%f%n",&s->d[i],&n);
+      if(n==0 || cl[n-1] == '\0')
+        break;
+      cl=&cl[n];
+      if (*cl != ',')
+          break;
+      cl++;
+      i++;
+    }
+    return AF_OK;
+}
+
+#define OPT_BASE_STRUCT af_delay_t
+const struct af_info af_info_delay = {
+    .info = "Delay audio filter",
+    .name = "delay",
+    .open = af_open,
+    .priv_size = sizeof(af_delay_t),
+    .options = (const struct m_option[]) {
+        OPT_STRING("delays", delaystr, 0),
+        {0}
+    },
+};

audio/filter/af_drc.c

@@ -1,20 +1,21 @@
 /*
  * Copyright (C) 2004 Alex Beregszaszi & Pierre Lombard
  *
- * This file is part of mpv.
+ * This file is part of MPlayer.
  *
- * mpv is free software; you can redistribute it and/or modify
+ * MPlayer is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * mpv is distributed in the hope that it will be useful,
+ * MPlayer is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with mpv.  If not, see <http://www.gnu.org/licenses/>.
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <stdio.h>
@@ -131,7 +132,7 @@ static void method1_int16(af_drc_t *s, struct mp_audio *c)
     data[i] = tmp;
   }
 
-  // Evaluation of newavg (not 100% accurate because of values clamping)
+  // Evaulation of newavg (not 100% accurate because of values clamping)
   newavg = s->mul * curavg;
 
   // Stores computed values for future smoothing
@@ -168,7 +169,7 @@ static void method1_float(af_drc_t *s, struct mp_audio *c)
   for (i = 0; i < len; i++)
     data[i] *= s->mul;
 
-  // Evaluation of newavg (not 100% accurate because of values clamping)
+  // Evaulation of newavg (not 100% accurate because of values clamping)
   newavg = s->mul * curavg;
 
   // Stores computed values for future smoothing
@@ -216,7 +217,7 @@ static void method2_int16(af_drc_t *s, struct mp_audio *c)
     data[i] = tmp;
   }
 
-  // Evaluation of newavg (not 100% accurate because of values clamping)
+  // Evaulation of newavg (not 100% accurate because of values clamping)
   newavg = s->mul * curavg;
 
   // Stores computed values for future smoothing
@@ -262,7 +263,7 @@ static void method2_float(af_drc_t *s, struct mp_audio *c)
   for (i = 0; i < len; i++)
     data[i] *= s->mul;
 
-  // Evaluation of newavg (not 100% accurate because of values clamping)
+  // Evaulation of newavg (not 100% accurate because of values clamping)
   newavg = s->mul * curavg;
 
   // Stores computed values for future smoothing
@@ -324,6 +325,7 @@ static int af_open(struct af_instance* af){
 const struct af_info af_info_drc = {
     .info = "Dynamic range compression filter",
     .name = "drc",
+    .flags = AF_FLAGS_NOT_REENTRANT,
     .open = af_open,
     .priv_size = sizeof(af_drc_t),
     .options = (const struct m_option[]) {

audio/filter/af_dummy.c

@@ -0,0 +1,62 @@
+/*
+ * The name speaks for itself. This filter is a dummy and will
+ * not blow up regardless of what you do with it.
+ *
+ * Original author: Anders
+ *
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "af.h"
+
+// Initialization and runtime control
+static int control(struct af_instance* af, int cmd, void* arg)
+{
+  switch(cmd){
+  case AF_CONTROL_REINIT: ;
+    *af->data = *(struct mp_audio*)arg;
+    MP_VERBOSE(af, "Was reinitialized: %iHz/%ich/%s\n",
+        af->data->rate,af->data->nch,af_fmt_to_str(af->data->format));
+    return AF_OK;
+  }
+  return AF_UNKNOWN;
+}
+
+// Filter data through filter
+static int filter(struct af_instance* af, struct mp_audio* data)
+{
+    af_add_output_frame(af, data);
+    return 0;
+}
+
+// Allocate memory and set function pointers
+static int af_open(struct af_instance* af){
+  af->control=control;
+  af->filter_frame=filter;
+  return AF_OK;
+}
+
+// Description of this filter
+const struct af_info af_info_dummy = {
+    .info = "dummy",
+    .name = "dummy",
+    .open = af_open,
+};

audio/filter/af_equalizer.c

@@ -6,20 +6,21 @@
  *
  * Copyright (C) 2001 Anders Johansson ajh@atri.curtin.edu.au
  *
- * This file is part of mpv.
+ * This file is part of MPlayer.
  *
- * mpv is free software; you can redistribute it and/or modify
+ * MPlayer is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * mpv is distributed in the hope that it will be useful,
+ * MPlayer is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with mpv.  If not, see <http://www.gnu.org/licenses/>.
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <stdio.h>
@@ -203,6 +204,7 @@ static int af_open(struct af_instance* af){
 const struct af_info af_info_equalizer = {
   .info = "Equalizer audio filter",
   .name = "equalizer",
+  .flags = AF_FLAGS_NOT_REENTRANT,
   .open = af_open,
   .priv_size = sizeof(af_equalizer_t),
   .options = (const struct m_option[]) {

audio/filter/af_export.c

@@ -0,0 +1,238 @@
+/*
+ * This audio filter exports the incoming signal to other processes
+ * using memory mapping. The memory mapped area contains a header:
+ *   int nch,
+ *   int size,
+ *   unsigned long long counter (updated every time the  contents of
+ *                               the area changes),
+ * the rest is payload (non-interleaved).
+ *
+ * Authors: Anders; Gustavo Sverzut Barbieri <gustavo.barbieri@ic.unicamp.br>
+ *
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <inttypes.h>
+#include <unistd.h>
+#include "config.h"
+
+#include <sys/types.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#include "osdep/io.h"
+
+#include "talloc.h"
+#include "af.h"
+#include "options/path.h"
+
+#define DEF_SZ 512 // default buffer size (in samples)
+#define SHARED_FILE "mpv-af_export" /* default file name
+                                           (relative to ~/.mpv/ */
+
+#define SIZE_HEADER (2 * sizeof(int) + sizeof(unsigned long long))
+
+// Data for specific instances of this filter
+typedef struct af_export_s
+{
+  unsigned long long  count; // Used for sync
+  void* buf[AF_NCH];    // Buffers for storing the data before it is exported
+  int   sz;             // Size of buffer in samples
+  int   wi;             // Write index
+  int   fd;             // File descriptor to shared memory area
+  char* filename;       // File to export data
+  uint8_t *mmap_area;   // MMap shared area
+} af_export_t;
+
+
+/* Initialization and runtime control
+   af audio filter instance
+   cmd control command
+   arg argument
+*/
+static int control(struct af_instance* af, int cmd, void* arg)
+{
+  af_export_t* s = af->priv;
+  switch (cmd){
+  case AF_CONTROL_REINIT:{
+    int i=0;
+    int mapsize;
+
+    // Free previous buffers
+    free(s->buf[0]);
+
+    // unmap previous area
+    if(s->mmap_area)
+      munmap(s->mmap_area, SIZE_HEADER + (af->data->bps*s->sz*af->data->nch));
+    // close previous file descriptor
+    if(s->fd)
+      close(s->fd);
+
+    // Accept only int16_t as input format (which sucks)
+    mp_audio_copy_config(af->data, (struct mp_audio*)arg);
+    mp_audio_set_format(af->data, AF_FORMAT_S16);
+
+    // Allocate new buffers (as one continuous block)
+    s->buf[0] = calloc(s->sz*af->data->nch, af->data->bps);
+    if(NULL == s->buf[0]) {
+      MP_FATAL(af, "Out of memory\n");
+      return AF_ERROR;
+    }
+    for(i = 1; i < af->data->nch; i++)
+      s->buf[i] = (uint8_t *)s->buf[0] + i*s->sz*af->data->bps;
+
+    if (!s->filename) {
+        MP_FATAL(af, "No filename set.\n");
+        return AF_ERROR;
+    }
+
+    // Init memory mapping
+    s->fd = open(s->filename, O_RDWR | O_CREAT | O_TRUNC | O_CLOEXEC, 0640);
+    MP_INFO(af, "Exporting to file: %s\n", s->filename);
+    if(s->fd < 0) {
+      MP_FATAL(af, "Could not open/create file: %s\n",
+             s->filename);
+      return AF_ERROR;
+    }
+
+    // header + buffer
+    mapsize = (SIZE_HEADER + (af->data->bps * s->sz * af->data->nch));
+
+    // grow file to needed size
+    for(i = 0; i < mapsize; i++){
+      char null = 0;
+      write(s->fd, (void*) &null, 1);
+    }
+
+    // mmap size
+    s->mmap_area = mmap(0, mapsize, PROT_READ|PROT_WRITE,MAP_SHARED, s->fd, 0);
+    if(s->mmap_area == NULL)
+      MP_FATAL(af, "Could not mmap file %s\n", s->filename);
+    MP_INFO(af, "Memory mapped to file: %s (%p)\n",
+           s->filename, s->mmap_area);
+
+    // Initialize header
+    *((int*)s->mmap_area) = af->data->nch;
+    *((int*)s->mmap_area + 1) = s->sz * af->data->bps * af->data->nch;
+    msync(s->mmap_area, mapsize, MS_ASYNC);
+
+    // Use test_output to return FALSE if necessary
+    return af_test_output(af, (struct mp_audio*)arg);
+  }
+  }
+  return AF_UNKNOWN;
+}
+
+/* Free allocated memory and clean up other stuff too.
+   af audio filter instance
+*/
+static void uninit( struct af_instance* af )
+{
+    af_export_t* s = af->priv;
+
+    free(s->buf[0]);
+
+    // Free mmaped area
+    if(s->mmap_area)
+      munmap(s->mmap_area, sizeof(af_export_t));
+
+    if(s->fd > -1)
+      close(s->fd);
+}
+
+/* Filter data through filter
+   af audio filter instance
+   data audio data
+*/
+static int filter(struct af_instance *af, struct mp_audio *data)
+{
+  if (!data)
+    return 0;
+  struct mp_audio*      c   = data;          // Current working data
+  af_export_t*  s   = af->priv;     // Setup for this instance
+  int16_t*      a   = c->planes[0];          // Incomming sound
+  int           nch = c->nch;        // Number of channels
+  int           len = c->samples*c->nch; // Number of sample in data chunk
+  int           sz  = s->sz;         // buffer size (in samples)
+  int           flag = 0;            // Set to 1 if buffer is filled
+
+  int           ch, i;
+
+  // Fill all buffers
+  for(ch = 0; ch < nch; ch++){
+    int         wi = s->wi;      // Reset write index
+    int16_t*    b  = s->buf[ch]; // Current buffer
+
+    // Copy data to export buffers
+    for(i = ch; i < len; i += nch){
+      b[wi++] = a[i];
+      if(wi >= sz){ // Don't write outside the end of the buffer
+        flag = 1;
+        break;
+      }
+    }
+    s->wi = wi % s->sz;
+  }
+
+  // Export buffer to mmaped area
+  if(flag){
+    // update buffer in mapped area
+    memcpy(s->mmap_area + SIZE_HEADER, s->buf[0], sz * c->bps * nch);
+    s->count++; // increment counter (to sync)
+    memcpy(s->mmap_area + SIZE_HEADER - sizeof(s->count),
+           &(s->count), sizeof(s->count));
+  }
+
+  af_add_output_frame(af, data);
+  return 0;
+}
+
+/* Allocate memory and set function pointers
+   af audio filter instance
+   returns AF_OK or AF_ERROR
+*/
+static int af_open( struct af_instance* af )
+{
+  af->control = control;
+  af->uninit  = uninit;
+  af->filter_frame = filter;
+  af_export_t *priv = af->priv;
+
+  if (!priv->filename || !priv->filename[0]) {
+      MP_FATAL(af, "no export filename given");
+      return AF_ERROR;
+  }
+
+  return AF_OK;
+}
+
+#define OPT_BASE_STRUCT af_export_t
+const struct af_info af_info_export = {
+    .info = "Sound export filter",
+    .name = "export",
+    .open = af_open,
+    .priv_size = sizeof(af_export_t),
+    .options = (const struct m_option[]) {
+        OPT_STRING("filename", filename, 0),
+        OPT_INTRANGE("buffersamples", sz, 0, 1, 2048, OPTDEF_INT(DEF_SZ)),
+        {0}
+    },
+};

audio/filter/af_extrastereo.c

@@ -0,0 +1,133 @@
+/*
+ * Copyright (C) 2004 Alex Beregszaszi & Pierre Lombard
+ *
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <inttypes.h>
+#include <math.h>
+#include <limits.h>
+
+#include "common/common.h"
+#include "af.h"
+
+// Data for specific instances of this filter
+typedef struct af_extrastereo_s
+{
+    float mul;
+}af_extrastereo_t;
+
+// Initialization and runtime control
+static int control(struct af_instance* af, int cmd, void* arg)
+{
+  switch(cmd){
+  case AF_CONTROL_REINIT:{
+    // Sanity check
+    if(!arg) return AF_ERROR;
+
+    mp_audio_copy_config(af->data, (struct mp_audio*)arg);
+    mp_audio_force_interleaved_format(af->data);
+    mp_audio_set_num_channels(af->data, 2);
+    if (af->data->format != AF_FORMAT_FLOAT)
+        mp_audio_set_format(af->data, AF_FORMAT_S16);
+
+    return af_test_output(af,(struct mp_audio*)arg);
+  }
+  }
+  return AF_UNKNOWN;
+}
+
+// Filter data through filter
+static void play_s16(af_extrastereo_t *s, struct mp_audio* data)
+{
+  register int i = 0;
+  int16_t *a = (int16_t*)data->planes[0];       // Audio data
+  int len = data->samples*data->nch;            // Number of samples
+  int avg, l, r;
+
+  for (i = 0; i < len; i+=2)
+  {
+    avg = (a[i] + a[i + 1]) / 2;
+
+    l = avg + (int)(s->mul * (a[i] - avg));
+    r = avg + (int)(s->mul * (a[i + 1] - avg));
+
+    a[i] = MPCLAMP(l, SHRT_MIN, SHRT_MAX);
+    a[i + 1] = MPCLAMP(r, SHRT_MIN, SHRT_MAX);
+  }
+}
+
+static void play_float(af_extrastereo_t *s, struct mp_audio* data)
+{
+  register int i = 0;
+  float *a = (float*)data->planes[0];   // Audio data
+  int len = data->samples * data->nch;  // Number of samples
+  float avg, l, r;
+
+  for (i = 0; i < len; i+=2)
+  {
+    avg = (a[i] + a[i + 1]) / 2;
+
+    l = avg + (s->mul * (a[i] - avg));
+    r = avg + (s->mul * (a[i + 1] - avg));
+
+    a[i] = af_softclip(l);
+    a[i + 1] = af_softclip(r);
+  }
+}
+
+static int filter_frame(struct af_instance *af, struct mp_audio *data)
+{
+    if (!data)
+        return 0;
+    if (af_make_writeable(af, data) < 0) {
+        talloc_free(data);
+        return -1;
+    }
+    if (data->format == AF_FORMAT_FLOAT) {
+        play_float(af->priv, data);
+    } else {
+        play_s16(af->priv, data);
+    }
+    af_add_output_frame(af, data);
+    return 0;
+}
+
+// Allocate memory and set function pointers
+static int af_open(struct af_instance* af){
+  af->control=control;
+  af->filter_frame = filter_frame;
+
+  return AF_OK;
+}
+
+#define OPT_BASE_STRUCT af_extrastereo_t
+const struct af_info af_info_extrastereo = {
+    .info = "Increase difference between audio channels",
+    .name = "extrastereo",
+    .flags = AF_FLAGS_NOT_REENTRANT,
+    .open = af_open,
+    .priv_size = sizeof(af_extrastereo_t),
+    .options = (const struct m_option[]) {
+        OPT_FLOAT("mul", mul, 0, OPTDEF_FLOAT(2.5)),
+        {0}
+    },
+};

audio/filter/af_forcespeed.c

@@ -0,0 +1,71 @@
+/*
+ * This file is part of mpv.
+ *
+ * mpv is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * mpv is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with mpv.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "af.h"
+
+struct priv {
+    double speed;
+};
+
+static int control(struct af_instance *af, int cmd, void *arg)
+{
+    struct priv *priv = af->priv;
+
+    switch (cmd) {
+    case AF_CONTROL_REINIT: {
+        struct mp_audio *in = arg;
+        struct mp_audio orig_in = *in;
+        struct mp_audio *out = af->data;
+
+        mp_audio_copy_config(out, in);
+        out->rate = in->rate * priv->speed;
+
+        return mp_audio_config_equals(in, &orig_in) ? AF_OK : AF_FALSE;
+    }
+    case AF_CONTROL_SET_PLAYBACK_SPEED_RESAMPLE: {
+        priv->speed = *(double *)arg;
+        return AF_OK;
+    }
+    }
+    return AF_UNKNOWN;
+}
+
+static int filter(struct af_instance *af, struct mp_audio *data)
+{
+    if (data)
+        mp_audio_copy_config(data, af->data);
+    af_add_output_frame(af, data);
+    return 0;
+}
+
+static int af_open(struct af_instance *af)
+{
+    struct priv *priv = af->priv;
+    af->control = control;
+    af->filter_frame = filter;
+    priv->speed = 1.0;
+    return AF_OK;
+}
+
+#define OPT_BASE_STRUCT struct priv
+
+const struct af_info af_info_forcespeed = {
+    .info = "Force audio speed",
+    .name = "forcespeed",
+    .open = af_open,
+    .priv_size = sizeof(struct priv),
+};