Fix typo...

(cherry picked from commit e85bcc1223)

.gitignore

@@ -28,6 +28,8 @@
 /DOCS/man/mpv.toc
 
 /waf
+/waf-*
+/waf3-*
 /build
 /.waf*
 /.lock-waf_*

.travis.yml

@@ -2,7 +2,7 @@ language: c
 
 os:
   - linux
-  - osx
+#  - osx
 env:
   matrix:
     - LIBAV=libav-stable

DOCS/client-api-changes.rst

@@ -25,6 +25,20 @@ API changes
 
 ::
 
+ --- 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)
+ 1.13   - add MPV_EVENT_QUEUE_OVERFLOW
+ 1.12   - add class Handle to qthelper.hpp
+        - improve opengl_cb.h API uninitialization behavior, and fix the qml
+          example
+        - add mpv_create_client() function
+ 1.11   - add OpenGL rendering interop API - allows an application to combine
+          its own and mpv's OpenGL rendering
+          Warning: this API is not stable yet - anything in opengl_cb.h might
+                   be changed in completely incompatible ways in minor API bumps
+ --- mpv 0.7.0 is released ---
  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

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

@@ -3,8 +3,20 @@
 // but that's not quite ready yet.
 // You may need a basic Info.plist and MainMenu.xib to make this work.
 
-#include "../../libmpv/client.h"
-#include "shared.h"
+// 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>
 

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

@@ -1,9 +1,8 @@
-// License: pick one of: public domain, WTFPL, ISC, Ms-PL, AGPLv3
-
 // This example can be built with: qmake && make
 
 #include <clocale>
 #include <sstream>
+#include <stdexcept>
 
 #include <QtGlobal>
 #include <QFileDialog>
@@ -29,7 +28,7 @@ static void wakeup(void *ctx)
     // 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;
-    QCoreApplication::postEvent(mainwindow, new QEvent(QEvent::User));
+    emit mainwindow->mpv_events();
 }
 
 MainWindow::MainWindow(QWidget *parent) :
@@ -42,9 +41,13 @@ MainWindow::MainWindow(QWidget *parent) :
     QAction *on_open = new QAction(tr("&Open"), this);
     on_open->setShortcuts(QKeySequence::Open);
     on_open->setStatusTip(tr("Open a file"));
-    connect(on_open, SIGNAL(triggered()), this, SLOT(on_file_open()));
+    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);
@@ -57,7 +60,7 @@ MainWindow::MainWindow(QWidget *parent) :
 
     mpv = mpv_create();
     if (!mpv)
-        throw "can't create mpv instance";
+        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
@@ -89,12 +92,14 @@ MainWindow::MainWindow(QWidget *parent) :
     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 Qt QEvent mechanism to relay
-    // the wakeup in a thread-safe way.
+    // 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 "mpv failed to initialize";
+        throw std::runtime_error("mpv failed to initialize");
 }
 
 void MainWindow::handle_mpv_event(mpv_event *event)
@@ -164,20 +169,16 @@ void MainWindow::handle_mpv_event(mpv_event *event)
     }
 }
 
-bool MainWindow::event(QEvent *event)
+// This slot is invoked by wakeup() (through the mpv_events signal).
+void MainWindow::on_mpv_events()
 {
-    // QEvent::User is sent by wakeup().
-    if (event->type() == QEvent::User) {
-        // 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);
-        }
-        return true;
+    // 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);
     }
-    return QMainWindow::event(event);
 }
 
 void MainWindow::on_file_open()
@@ -190,6 +191,11 @@ void MainWindow::on_file_open()
     }
 }
 
+void MainWindow::on_new_window()
+{
+    (new MainWindow())->show();
+}
+
 void MainWindow::append_log(const QString &text)
 {
     QTextCursor cursor = log->textCursor();

DOCS/client_api_examples/qt/qtexample.h

@@ -15,11 +15,13 @@ public:
     explicit MainWindow(QWidget *parent = 0);
     ~MainWindow();
 
-protected:
-    virtual bool event(QEvent *event);
-
 private slots:
     void on_file_open();
+    void on_new_window();
+    void on_mpv_events();
+
+signals:
+    void mpv_events();
 
 private:
     QWidget *mpv_container;

DOCS/client_api_examples/qt/qtexample.pro

@@ -6,7 +6,7 @@ TARGET = qtexample
 TEMPLATE = app
 
 CONFIG += link_pkgconfig debug
-PKGCONFIG = mpv
+PKGCONFIG += mpv
 
 SOURCES += qtexample.cpp
 HEADERS += qtexample.h

DOCS/client_api_examples/shared.h

@@ -1,10 +0,0 @@
-#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);
-    }
-}

DOCS/client_api_examples/simple/simple.c

@@ -1,9 +1,18 @@
+// Build with: gcc -o simple simple.c `pkg-config --libs --cflags mpv`
+
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "libmpv/client.h"
-#include "shared.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[])
 {
@@ -21,7 +30,7 @@ int main(int argc, char *argv[])
     // 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-x11-keyboard", "yes");
+    mpv_set_option_string(ctx, "input-vo-keyboard", "yes");
     int val = 1;
     check_error(mpv_set_option(ctx, "osc", MPV_FORMAT_FLAG, &val));
 

DOCS/compile-windows.md

@@ -0,0 +1,211 @@
+Compiling for Windows
+=====================
+
+Compiling for Windows is supported with MinGW-w64. This can be used to produce
+both 32-bit and 64-bit executables, and it works for building on Windows and
+cross-compiling from Linux and Cygwin. MinGW-w64 is available from:
+http://mingw-w64.sourceforge.net.
+
+While building a complete MinGW-w64 toolchain yourself is possible, there are a
+few build environments and scripts to help ease the process, such as MSYS2 and
+MXE. Note that MinGW environments included in Linux distributions are often
+broken, outdated and useless, and usually don't use MinGW-w64.
+
+**Warning**: the original MinGW (http://www.mingw.org) is unsupported.
+
+Cross-compilation
+=================
+
+When cross-compiling, you have to run mpv's configure with these arguments:
+
+```bash
+DEST_OS=win32 TARGET=i686-w64-mingw32 ./waf configure
+```
+
+[MXE](http://mxe.cc) makes it very easy to bootstrap a complete MingGW-w64
+environment from a Linux machine. See a working example below.
+
+Alternatively, you can try [mingw-w64-cmake](https://github.com/lachs0r/mingw-w64-cmake),
+which bootstraps a MinGW-w64 environment and builds mpv and dependencies.
+
+Example with MXE
+----------------
+
+```bash
+# Before starting, make sure you install MXE prerequisites. MXE will download
+# and build all target dependencies, but no host dependencies. For example,
+# you need a working compiler, or MXE can't build the crosscompiler.
+#
+# Refer to
+#
+#    http://mxe.cc/#requirements
+#
+# Scroll down for disto/OS-specific instructions to install them.
+
+# Download MXE. Note that compiling the required packages requires about 1.4 GB
+# or more!
+
+cd /opt
+git clone https://github.com/mxe/mxe mxe
+cd mxe
+
+# Set build options.
+
+# The JOBS environment variable controls threads to use when building. DO NOT
+# use the regular `make -j4` option with MXE as it will slow down the build.
+# Alternatively, you can set this in the make command by appending "JOBS=4"
+# to the end of command:
+echo "JOBS := 4" >> settings.mk
+
+# The MXE_TARGET environment variable builds MinGW-w64 for 32 bit targets.
+# Alternatively, you can specify this in the make command by appending
+# "MXE_TARGETS=i686-w64-mingw32" to the end of command:
+echo "MXE_TARGETS := i686-w64-mingw32.static" >> settings.mk
+
+# If you want to build 64 bit version, use this:
+# echo "MXE_TARGETS := x86_64-w64-mingw32.static" >> settings.mk
+
+# Build required packages. The following provide a minimum required to build
+# mpv.
+
+make gcc ffmpeg libass jpeg pthreads
+
+# Add MXE binaries to $PATH
+export PATH=/opt/mxe/usr/bin/:$PATH
+
+# Build mpv. The target will be used to automatically select the name of the
+# build tools involved (e.g. it will use i686-w64-mingw32.static-gcc).
+
+cd ..
+git clone https://github.com/mpv-player/mpv.git
+cd mpv
+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
+./waf build
+```
+
+Native compilation with MSYS2
+=============================
+
+For Windows developers looking to get started quickly, MSYS2 can be used to
+compile mpv natively on a Windows machine. The MSYS2 repositories have binary
+packages for most of mpv's dependencies, so the process should only involve
+building mpv itself.
+
+To build 64-bit mpv on Windows:
+
+Installing MSYS2
+----------------
+
+1. Download an installer from https://msys2.github.io/
+
+   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. Add ``C:\msys64\mingw64\bin`` to your ``%PATH%``. mpv will depend on several
+   DLLs in this folder.
+
+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, ``msys2-runtime`` and ``pacman`` must be
+updated first.
+
+```bash
+# 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
+```
+
+Installing mpv dependencies
+---------------------------
+
+```bash
+# Install MSYS2 build dependencies and a MinGW-w64 compiler
+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-lua
+
+# Install additional (optional) dependencies
+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.
+
+Building mpv
+------------
+
+Clone the latest mpv from git and install waf:
+
+```bash
+git clone https://github.com/mpv-player/mpv.git && cd mpv
+./bootstrap.py
+```
+
+Finally, compile and install mpv. Binaries will be installed to
+``/mingw64/bin``.
+
+```bash
+# For a 32-bit build, use --prefix=/mingw32 instead
+./waf configure CC=gcc --prefix=/mingw64
+./waf install
+```
+
+Or, compile and install both libmpv and mpv:
+
+```bash
+./waf configure CC=gcc --enable-libmpv-shared --prefix=/mingw64
+./waf install
+
+# waf installs libmpv to the wrong directory, so fix it up
+mv -f /mingw64/bin/pkgconfig/mpv.pc /mingw64/lib/pkgconfig/
+mv -f /mingw64/bin/libmpv.dll.a /mingw64/lib/
+sed -i 's_/mingw64/bin_/mingw64/lib_' /mingw64/lib/pkgconfig/mpv.pc
+rmdir /mingw64/bin/pkgconfig
+```
+
+Additional dependencies
+=======================
+
+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
+./waf configure --enable-win32-internal-pthreads
+```
+
+libwaio
+-------
+
+If you want to use ``--input-file``, you need libwaio. It's available from
+git://midipix.org/waio
+
+To compile libwaio in MSYS2, run:
+
+```bash
+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
+```

DOCS/contribute.md

@@ -4,8 +4,8 @@ How to contribute
 General
 -------
 
-The main contact for mpv development is IRC, specifically #mpv-player and
-#mpv-player-dev on Freenode.
+The main contact for mpv development is IRC, specifically #mpv-player
+and #mpv-player-dev on Freenode.
 
 Sending patches
 ---------------

DOCS/crosscompile-mingw.md

@@ -1,83 +0,0 @@
-Cross Compiling to Windows
-==========================
-
-Cross compiling mpv to Windows is supported with MinGW-w64. This can be used to
-produce both 32 bit and 64 bit executables. MinGW-w64 is available from
-http://mingw-w64.sourceforge.net.
-
-You have to run mpv's configure with these arguments:
-
-```bash
-DEST_OS=win32 TARGET=i686-w64-mingw32 ./waf configure
-```
-
-While building a complete MinGW-w64 toolchain yourself is possible, people have
-created scripts to help ease the process. These are the two recommended methods:
-
-- Using [mingw-w64-cmake](https://github.com/lachs0r/mingw-w64-cmake) to setup
-  a MinGW-w64 environment. We recommend you to try this first before MXE.
-  mingw-w64-cmake will also build mpv and its dependencies.
-- Alternatively, you can use MXE: http://mxe.cc. With MXE, you have to manually
-  set the target to MinGW-w64 (even if you compile to 32 bit). A working example
-  below.
-
-**Warning**: the original MinGW (http://www.mingw.org) is unsupported.
-
-Note that MinGW environments included in Linux distributions are often broken,
-outdated and useless, and usually don't use MinGW-w64.
-
-Additional dependencies
------------------------
-
-You need a pthread wrapper. It must be interoperable with native Windows
-threads. pthreads-win32 or MinGW pthreads might work.
-
-If you want ``--input-file=...`` to work, you need libwaio. It's available
-from: git://midipix.org/waio
-
-Example with MXE
-----------------
-
-```bash
-# Download MXE. Note that compiling the required packages requires about 1.4 GB
-# or more!
-
-cd /opt
-git clone https://github.com/mxe/mxe mingw
-cd mingw
-
-# Set build options.
-
-# The JOBS environment variable controls threads to use when building. DO NOT
-# use the regular `make -j4` option with MXE as it will slow down the build.
-# Alternatively, you can set this in the make command by appending "JOBS=4"
-# to the end of command:
-echo "JOBS := 4" >> settings.mk
-
-# The MXE_TARGET environment variable builds MinGW-w64 for 32 bit targets.
-# Alternatively, you can specify this in the make command by appending
-# "MXE_TARGETS=i686-w64-mingw32" to the end of command:
-echo "MXE_TARGETS := i686-w64-mingw32" >> settings.mk
-
-# If you want to build 64 bit version, use this:
-# echo "MXE_TARGETS := x86_64-w64-mingw32" >> settings.mk
-
-# Build required packages. The following provide a minimum required to build
-# mpv.
-
-make gcc ffmpeg libass jpeg pthreads
-
-# Add MXE binaries to $PATH
-export PATH=/opt/mingw/usr/bin/:$PATH
-
-# Build mpv. The target will be used to automatically select the name of the
-# build tools involved (e.g. it will use i686-w64-mingw32-gcc).
-
-cd ..
-git clone https://github.com/mpv-player/mpv.git
-cd mpv
-DEST_OS=win32 TARGET=i686-w64-mingw32 ./waf configure
-# Or, if 64 bit version,
-# DEST_OS=win32 TARGET=x86_64-w64-mingw32 ./waf configure
-./waf build
-```

DOCS/man/af.rst

@@ -565,9 +565,9 @@ Available filters are:
              Scale tempo in sync with speed (default).
         pitch
              Reverses effect of filter. Scales pitch without altering tempo.
-             Add ``[ speed_mult 0.9438743126816935`` and ``] speed_mult
-             1.059463094352953`` to your ``input.conf`` to step by musical
-             semi-tones.
+             Add ``[ multiply speed 0.9438743126816935`` and
+             ``] multiply speed 1.059463094352953`` to your ``input.conf``
+             to step by musical semi-tones.
 
              .. warning::
 

DOCS/man/ao.rst

@@ -28,8 +28,8 @@ normal driver parameters.
 .. admonition:: Examples
 
     - ``--ao=alsa,oss,`` Try the ALSA driver, then the OSS driver, then others.
-    - ``--ao=alsa:no-block:device=[hw:0,3]`` Sets noblock-mode and the
-      device-name as first card, fourth device.
+    - ``--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:
 
@@ -39,8 +39,6 @@ Available audio output drivers are:
     ``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.
-    ``no-block``
-        Sets noblock-mode.
     ``resample=yes``
         Enable ALSA resampling plugin. (This is disabled by default, because
         some drivers report incorrect audio delay in some cases.)
@@ -70,6 +68,40 @@ Available audio output drivers are:
         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::
+
+        Handling of multichannel/surround audio changed in mpv 0.8.0 from the
+        behavior in MPlayer/mplayer2 and older versions of mpv.
+
+        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
 
@@ -147,23 +179,15 @@ Available audio output drivers are:
         changes. Default: 250.
 
     ``latency-hacks=<yes|no>``
-        Enable hacks to workaround PulseAudio timing bugs (default: yes). If
+        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
-        information. Disabling this might help with e.g. networked audio.
+        information. Disabling this might help with e.g. networked audio or
+        some plugins, while enabling it might help in some unknown situations
+        (it used to be required to get good behavior on old PulseAudio versions).
 
-``portaudio``
-    PortAudio audio output driver. This works on all platforms, and has
-    extensive MS Windows support.
-
-    .. note:: This driver is not very useful. It was added in the hope of
-              providing portable audio API across all platforms, but turned
-              out semi-broken and underfeatured.
-
-    ``device``
-        Specify the subdevice to use. Giving ``help`` as device name lists all
-        devices found by PortAudio. Devices can be given as numeric values,
-        starting from ``1``.
+        If you have stuttering video when using pulse, try to enable this
+        option. (Or alternatively, try to update PulseAudio.)
 
 ``dsound`` (Windows only)
     DirectX DirectSound audio output driver
@@ -223,6 +247,9 @@ Available audio output drivers are:
         Simulate broken audio drivers, which always add the fixed device
         latency to the reported audio playback position.
 
+    ``broken-delay``
+        Simulate broken audio drivers, which don't report latency correctly.
+
 ``pcm``
     Raw PCM/WAVE file writer audio output
 
@@ -233,6 +260,10 @@ Available audio output drivers are:
         Write the sound to ``<filename>`` instead of the default
         ``audiodump.wav``. If ``no-waveheader`` is specified, the default is
         ``audiodump.pcm``.
+    ``(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.
 
 ``rsound``
     Audio output to an RSound daemon

DOCS/man/changes.rst

@@ -1,438 +1,13 @@
-CHANGES FROM OTHER VERSIONS OF MPLAYER
-======================================
+CHANGELOG
+=========
 
-**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.
+There is no real changelog, but you can look at the following things:
 
-.. note::
-    These lists are incomplete.
+* The release changelog, which should contain most user-visible changes,
+  including new features and bug fixes:
 
-General Changes from MPlayer to mpv
------------------------------------
-
-This listing is about changes introduced by mplayer2 and mpv relatively to
-MPlayer.
-
-Player
-~~~~~~
-
-* New name for the binary (``mpv``). New location for config files (either
-  ``~/.config/mpv/mpv.conf``, or if you want, ``~/.mpv/config``).
-* Encoding functionality (replacement for MEncoder, see the `ENCODING`_ section).
-* Support for Lua scripting (see the `LUA SCRIPTING`_ section).
-* Better pause handling (e.g. do not unpause on a command).
-* Precise seeking support.
-* Improvements in audio/video sync handling.
-* Do not lose settings when playing a new file in the same player instance.
-* 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.
-* ``--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
-  (see ``libmpv/client.h`` in the sources).
-
-Input
-~~~~~
-
-* Improved default keybindings. MPlayer bindings are also available (see
-  ``etc/mplayer-input.conf`` in the source tree).
-* Improved responsiveness on user input.
-* Support for modifier keys (alt, shift, ctrl) in input.conf.
-* 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.
-
-Audio
-~~~~~
-
-* Support for gapless audio (see the ``--gapless-audio`` option).
-* Support for OSS4 volume control.
-* Improved support for PulseAudio.
-* Make ``--softvol`` default (**mpv** is not a mixer control panel).
-* By default, do pitch correction if playback speed is increased.
-* Improved downmixing and output of surround audio:
-
-  - Instead of using hardcoded pan filters to do remixing, libavresample is used
-  - Channel maps are used to identify the channel layout, so e.g. ``3.0`` and
-    ``2.1`` audio can be distinguished.
-
-Video
-~~~~~
-
-* Wayland support.
-* Native support for VAAPI and VDA. Improved VDPAU video output.
-* Improved OpenGL output (see the ``opengl-hq`` video output).
-* Make hardware decoding work with the ``opengl`` video output.
-* Support for libavfilter (for video->video and audio->audio). This allows
-  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).
-* Better subtitle rendering using libass by default.
-* Improvements when playing multiple files (``--fixed-vo`` is default, do not
-  reset settings by default when playing a new file).
-* Replace image video outputs (``--vo=jpeg`` etc.) with ``--vo=image``.
-* Removal of ``--vo=gif89a``, ``--vo=md5sum``, ``--vo=yuv4mpeg``, as encoding
-  can handle these use cases. For yuv4mpeg, for example, use::
-
-    mpv input.mkv -o output.y4m --no-audio --oautofps --oneverdrop
-
-* Image subtitles (DVDs etc.) are rendered in color and use more correct
-  positioning (color for image subs can be disabled with ``--sub-gray``).
-
-OSD and terminal
-~~~~~~~~~~~~~~~~
-
-* Cleaned up terminal output: nicer status line, less useless noise.
-* Improved OSD rendering using libass, with full Unicode support.
-* New OSD bar with chapter marks. Not positioned in the middle of the video
-  (this can be customized with the ``--osd-bar-align-y`` option).
-* Display list of chapters and audio/subtitle tracks on OSD (see the
-  `Properties`_ section).
-
-Screenshots
-~~~~~~~~~~~
-
-* Instant screenshots without 1-frame delay.
-* Support for taking screenshots even with hardware decoding.
-* Support for saving screenshots as JPEG or PNG.
-* Support for configurable file names.
-* Support for taking screenshots with or without subtitles.
-
-Note that the ``screenshot`` video filter is not needed anymore, and should not
-be put into the mpv config file.
-
-Miscellaneous
-~~~~~~~~~~~~~
-
-* Better MKV support (e.g. ordered chapters, 3D metadata).
-* Matroska edition switching at runtime.
-* Support for playing URLs of popular streaming sites directly.
-  (e.g. ``mpv https://www.youtube.com/watch?v=...``).
-  Requires a recent version of ``youtube-dl`` to be installed, and
-  ``ytdl=yes`` in the mpv config file.
-* Support for precise scrolling which scales the parameter of commands. If the
-  input doesn't support precise scrolling the scale factor stays 1.
-* Allow changing/adjusting video filters at runtime. (This is also used to make
-  the ``D`` key insert vf_yadif if deinterlacing is not supported otherwise).
-* Improved support for .cue files.
-
-Mac OS X
-~~~~~~~~
-
-* Native OpenGL backend.
-* Cocoa event loop is independent from MPlayer's event loop, so user
-  actions like accessing menus and live resizing do not block the playback.
-* Apple Remote support.
-* Media Keys support.
-* VDA support using libavcodec hwaccel API instead of FFmpeg's decoder with up
-  to 2-2.5x reduction in CPU usage.
-
-Windows
-~~~~~~~
-
-* Improved support for Unicode file names.
-* Improved window handling.
-* Do not block playback when moving the window.
-* Improved Direct3D video output.
-* Added WASAPI audio output.
-
-Internal changes
-~~~~~~~~~~~~~~~~
-
-* Switch to GPLv2+ (see ``Copyright`` file for details).
-* Removal of lots of cruft:
-
-  - Internal GUI (replaced by the OSC, see the `ON SCREEN CONTROLLER`_ section).
-  - MEncoder (replaced by native encoding, see the `ENCODING`_ section).
-  - OSD menu.
-  - Kernel video drivers for Linux 2.4 (including VIDIX).
-  - Teletext support.
-  - Support for dead platforms.
-  - Most built-in demuxers have been replaced by their libavformat counterparts.
-  - Built-in network support has been replaced by libavformat's (which also
-    supports https URLs).
-  - Embedded copies of libraries (such as FFmpeg).
-
-* General code cleanups (including refactoring or rewrites of many parts).
-* New build system.
-* Many bug fixes and removal of long-standing issues.
-* Generally preferring FFmpeg/Libav over internal demuxers, decoders, and
-  filters.
-
-Detailed Listing of User-visible Changes
-----------------------------------------
-
-This listing is about changed command line switches, slave commands, and similar
-things. Completely removed features are not listed.
-
-Command Line Switches
-~~~~~~~~~~~~~~~~~~~~~
-
-* There is a new command line syntax, which is generally preferred over the old
-  syntax. ``-optname optvalue`` becomes ``--optname=optvalue``.
-
-  The old syntax will not be removed. However, the new syntax is mentioned in
-  all documentation and so on, and unlike the old syntax is not ambiguous,
-  so it is a good thing to know about this change.
-* In general, negating switches like ``-noopt`` now have to be written as
-  ``-no-opt`` or ``--no-opt``.
-* Per-file options are not the default anymore. You can explicitly specify
-  file-local options. See ``Usage`` section.
-* Many options have been renamed, removed or changed semantics. Some options
-  that are required for a good playback experience with MPlayer are now
-  superfluous or even worse than the defaults, so make sure to read the manual
-  before trying to use your existing configuration with **mpv**.
-* Table of renamed/replaced switches:
-
-    =========================== ========================================
-    Old                         New
-    =========================== ========================================
-    ``-no<opt>``                ``--no-<opt>`` (add a dash)
-    ``-a52drc level``           ``--ad-lavc-ac3drc=level``
-    ``-ac spdifac3``            ``--ad=spdif:ac3`` (see ``--ad=help``)
-    ``-af volnorm``             ``--af=drc`` (renamed)
-    ``-afm hwac3``              ``--ad=spdif:ac3,spdif:dts``
-    ``-ao alsa:device=hw=0.3``  ``--ao=alsa:device=[hw:0,3]``
-    ``-aspect``                 ``--video-aspect``
-    ``-ass-bottom-margin``      ``--vf=sub=bottom:top``
-    ``-ass``                    ``--sub-ass``
-    ``-audiofile-cache``        (removed; the main cache settings are used)
-    ``-audiofile``              ``--audio-file``
-    ``-benchmark``              ``--untimed`` (no stats)
-    ``-capture``                ``--stream-capture=<filename>``
-    ``-channels``               ``--audio-channels`` (changed semantics)
-    ``-cursor-autohide-delay``  ``--cursor-autohide``
-    ``-delay``                  ``--audio-delay``
-    ``-dumpstream``             ``--stream-dump=<filename>``
-    ``-dvdangle``               ``--dvd-angle``
-    ``-endpos``                 ``--length``
-    ``-font``                   ``--osd-font``
-    ``-forcedsubsonly``         ``--sub-forced-only``
-    ``-forceidx``               ``--index``
-    ``-format``                 ``--audio-format``
-    ``-fsmode-dontuse``         (removed)
-    ``-fstype``                 ``--x11-netwm`` (changed semantics)
-    ``-hardframedrop``          ``--framedrop=hard``
-    ``-identify``               (removed; use TOOLS/mpv_identify.sh)
-    ``-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``)
-    ``-mouse-movements``        ``--input-cursor``
-    ``-msgcolor``               ``--msg-color``
-    ``-msglevel``               ``--msg-level`` (changed semantics)
-    ``-msgmodule``              ``--msg-module``
-    ``-name``                   ``--x11-name``
-    ``-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``
-    ``-playing-msg``            ``--term-playing-msg``
-    ``-pp ...``                 ``'--vf=pp=[...]'``
-    ``-pphelp``                 ``--vf=pp:help``
-    ``-rawaudio ...``           ``--demuxer-rawaudio-...``
-    ``-rawvideo ...``           ``--demuxer-rawvideo-...``
-    ``-spugauss``               ``--sub-gauss``
-    ``-srate``                  ``--audio-samplerate``
-    ``-ss``                     ``--start``
-    ``-ssf <sub>``              ``--sws-...``
-    ``-stop-xscreensaver``      ``--stop-screensaver``
-    ``-sub-fuzziness``          ``--sub-auto``
-    ``-sub``                    ``--sub-file``
-    ``-subcp``                  ``--sub-codepage``
-    ``-subdelay``               ``--sub-delay``
-    ``-subfile``                ``--sub-file``
-    ``-subfont-*``              ``--sub-text-*``, ``--osd-*``
-    ``-subfont-text-scale``     ``--sub-scale``
-    ``-subfont``                ``--sub-text-font``
-    ``-subfps``                 ``--sub-fps``
-    ``-subpos``                 ``--sub-pos``
-    ``-sws``                    ``--sws-scaler``
-    ``-tvscan``                 ``--tv-scan``
-    ``-use-filename-title``     ``--title='${filename}'``
-    ``-vc ffh264vdpau`` (etc.)  ``--hwdec=vdpau``
-    ``-vobsub``                 ``--sub-file`` (pass the .idx file)
-    ``-x W``, ``-y H``          ``--geometry=WxH`` + ``--no-keepaspect``
-    ``-xineramascreen``         ``--screen`` (different values)
-    ``-xy W``                   ``--autofit=W``
-    ``-zoom``                   Inverse available as ``--video-unscaled``
-    ``dvdnav://``               ``dvdnav://menu``
-    ``dvd://1``                 ``dvd://0`` (0-based offset)
-    =========================== ========================================
-
-.. note::
-
-    ``-opt val`` becomes ``--opt=val``.
-
-.. note::
-
-    Quite some video filters, video outputs, audio filters, audio outputs, had
-    changes in their option parsing. These aren't mentioned in the table above.
-
-    Also, some video and audio filters have been removed, and you have to use
-    libavfilter (using ``--vf=lavfi=[...]`` or ``--af=lavfi=[...]``) to get
-    them back.
-
-input.conf and Slave Commands
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-* Table of renamed input commands:
-
-    This lists only commands that are not always gracefully handled by the
-    internal legacy translation layer. If an input.conf contains any legacy
-    commands, a warning will be printed when starting the player. The warnings
-    also show the replacement commands.
-
-    Properties containing ``_`` to separate words use ``-`` instead.
-
-    +--------------------------------+----------------------------------------+
-    | Old                            | New                                    |
-    +================================+========================================+
-    | ``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)``  |
-    +--------------------------------+----------------------------------------+
-    | ``switch_ratio [<ratio>]``     | ``set video-aspect <ratio>``           |
-    |                                |                                        |
-    |                                | ``set video-aspect 0`` (reset aspect)  |
-    +--------------------------------+----------------------------------------+
-    | ``step_property_osd <prop>``   | ``cycle <prop> <step>`` (wraps),       |
-    | ``<step> <dir>``               | ``add <prop> <step>`` (clamps).        |
-    |                                | ``<dir>`` parameter unsupported. Use   |
-    |                                | a negative ``<step>`` instead.         |
-    +--------------------------------+----------------------------------------+
-    | ``step_property <prop>``       | Prefix ``cycle`` or ``add`` with       |
-    | ``<step> <dir>``               | ``no-osd``: ``no-osd cycle <prop>``    |
-    |                                | ``<step>``                             |
-    +--------------------------------+----------------------------------------+
-    | ``osd_show_property_text``     | ``show_text <text>``                   |
-    | ``<text>``                     | The property expansion format string   |
-    |                                | syntax slightly changed.               |
-    +--------------------------------+----------------------------------------+
-    | ``osd_show_text``              | Now does the same as                   |
-    |                                | ``osd_show_property_text``. Use the    |
-    |                                | ``raw`` prefix to disable property     |
-    |                                | expansion.                             |
-    +--------------------------------+----------------------------------------+
-    | ``show_tracks``                | ``show_text ${track-list}``            |
-    +--------------------------------+----------------------------------------+
-    | ``show_chapters``              | ``show_text ${chapter-list}``          |
-    +--------------------------------+----------------------------------------+
-    | ``af_switch``, ``af_add``, ... | ``af set|add|...``                     |
-    +--------------------------------+----------------------------------------+
-    | ``tv_start_scan``              | ``set tv-scan yes``                    |
-    +--------------------------------+----------------------------------------+
-    | ``tv_set_channel <val>``       | ``set tv-channel <val>``               |
-    +--------------------------------+----------------------------------------+
-    | ``tv_step_channel``            | ``cycle tv-channel``                   |
-    +--------------------------------+----------------------------------------+
-    | ``dvb_set_channel <v1> <v2>``  | ``set dvb-channel <v1>-<v2>``          |
-    +--------------------------------+----------------------------------------+
-    | ``dvb_step_channel``           | ``cycle dvb-channel``                  |
-    +--------------------------------+----------------------------------------+
-    | ``tv_set_freq <val>``          | ``set tv-freq <val>``                  |
-    +--------------------------------+----------------------------------------+
-    | ``tv_step_freq``               | ``cycle tv-freq``                      |
-    +--------------------------------+----------------------------------------+
-    | ``tv_set_norm <norm>``         | ``set tv-norm <norm>``                 |
-    +--------------------------------+----------------------------------------+
-    | ``tv_step_norm``               | ``cycle tv-norm``                      |
-    +--------------------------------+----------------------------------------+
-
-    .. note::
-
-        Due to lack of hardware and users using the TV/DVB/PVR features, and
-        due to the need to cleanup the related command code, it's possible
-        that the new commands are buggy or behave worse. This can be improved
-        if testers are available. Otherwise, some of the TV code will be
-        removed at some point.
-
-Slave mode
-~~~~~~~~~~
-
-* Slave mode was removed. A proper slave mode application needed tons of code
-  and hacks to get
-  it right. The main problem is that slave mode is a bad and incomplete
-  interface, and to get around that, applications parsed output messages
-  intended for users. It is hard to know which messages exactly are parsed by
-  slave mode applications. This makes it virtually impossible to improve
-  terminal output intended for users without possibly breaking something.
-
-  This is absolutely insane, and since initial improvements to **mpv** quickly
-  made slave mode incompatible to most applications, it was removed as useless
-  cruft. The client API (see below) is provided instead.
-
-  ``--identify`` was replaced by the ``TOOLS/mpv_identify.sh`` wrapper script.
-
-* For some time (until including release 0.4.x), mpv supported a
-  ``--slave-broken`` option. The following options are equivalent:
-
-  ::
-
-        --input-file=/dev/stdin --input-terminal=no
-
-
-  Assuming the system supports ``/dev/stdin``.
-
-  (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.
-
-* **mpv** also provides a client API, which can be used to embed the player
-  by loading it as shared library. (See ``libmpv/client.h`` in the sources.)
-  It might also be possible to implement a custom slave mode-like protocol
-  using Lua scripting.
-
-Policy for Removed Features
----------------------------
-
-**mpv** is in active development. If something is in the way of more important
-development (such as fixing bugs or implementing new features), we sometimes
-remove features. Usually this happens only with old features that either seem
-to be useless, or are not used by anyone. Often these are obscure, or
-"inherited", or were marked experimental, but never received any particular
-praise by any users.
-
-Sometimes, features are replaced by something new. The new code will be either
-simpler or more powerful, but doesn't necessarily provide everything the old
-feature did.
-
-We can not exclude that we accidentally remove features that are actually
-popular. Generally, we do not know how much a specific functionality is used.
-If you miss a feature and think it should be re-added, please open an issue
-on the mpv bug tracker. Hopefully, a solution can be found. Often, it turns
-out that re-adding something is not much of a problem, or that there are
-better alternatives.
-
-Why this Fork?
---------------
-
-mplayer2 is practically dead, and mpv started out as a branch containing
-new/experimental development. (Some of it was merged right *after* the fork
-was made public, seemingly as an acknowledgment that development, or at
-least merging, should have been more active.)
-
-MPlayer is focused on not breaking anything, but is stuck with a horrible
-codebase resistant to cleanup. (Unless you do what mpv did - merciless and
-consequent pruning of bad, old code.) Cleanup and keeping broken things
-conflict, so the kind of development mpv strives for can't be done within
-MPlayer due to clashing development policies.
-
-Additionally, mplayer2 already had lots of changes over MPlayer, which would
-have needed to be backported to the MPlayer codebase. This would not only
-have been hard (several years of diverging development), but also would have
-been impossible due to the aforementioned MPlayer development policy.
+  https://github.com/mpv-player/mpv/releases
+* The git log, which is the "real" changelog
+* 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.

DOCS/man/input.rst

@@ -1,5 +1,13 @@
-INPUT.CONF
-==========
+COMMAND INTERFACE
+=================
+
+The mpv core can be controlled with commands and properties. A number of ways
+to interact with the player use them: key bindings (``input.conf``), OSD
+(showing information with properties), JSON IPC, the client API (``libmpv``),
+and the classic slave mode.
+
+input.conf
+----------
 
 The input.conf file consists of a list of key bindings, for example::
 
@@ -101,11 +109,20 @@ List of Input Commands
     keyframes
         Always restart playback at keyframe boundaries (fast).
 
-``revert_seek``
+``revert_seek [mode]``
     Undoes the ``seek`` command, and some other commands that seek (but not
     necessarily all of them). Calling this command once will jump to the
     playback position before the seek. Calling it a second time undoes the
-    ``revert_seek`` command itself.
+    ``revert_seek`` command itself. This only works within a single file.
+
+    The first argument is optional, and can change the behavior:
+
+    mark
+        Mark the current time position. The next normal ``revert_seek`` command
+        will seek back to this point, no matter how many seeks happened since
+        last time.
+
+    Using it without any arguments gives you the default behavior.
 
 ``frame_step``
     Play one frame, then pause. Does nothing with audio-only playback.
@@ -232,7 +249,6 @@ List of Input Commands
     will have after moving.)
 
 ``run "command" "arg1" "arg2" ...``
-    (Unix only)
     Run the given command. Unlike in MPlayer/mplayer2 and earlier versions of
     mpv (0.2.x and older), this doesn't call the shell. Instead, the command
     is run directly, with each argument passed separately. Each argument is
@@ -358,6 +374,32 @@ List of Input Commands
     essentially like ``quit``. Useful for the client API: playback can be
     stopped without terminating the player.
 
+``mouse <x> <y> [<button> [single|double]]``
+    Send a mouse event with given coordinate (``<x>``, ``<y>``).
+
+    Second argument:
+
+    <button>
+        The button number of clicked mouse button. This should be one of 0-19.
+        If ``<button>`` is omitted, only the position will be updated.
+
+    Third argument:
+
+    <single> (default)
+        The mouse event represents regular single click.
+
+    <double>
+        The mouse event represents double-click.
+
+``audio_add "<file>" [<flags> [<title> [<lang>]]]``
+    Load the given audio file. See ``sub_add`` command.
+
+``audio_remove [<id>]``
+    Remove the given audio track. See ``sub_remove`` command.
+
+``audio_reload [<id>]``
+    Reload the given audio tracks. See ``sub_reload`` command.
+
 
 Input Commands that are Possibly Subject to Change
 --------------------------------------------------
@@ -484,18 +526,15 @@ Input Commands that are Possibly Subject to Change
 
     It is also possible to pass a raw memory address for use as bitmap memory
     by passing a memory address as integer prefixed with a ``&`` character.
-    Passing the wrong thing here will crash the player. The ``offset`` parameter
-    is not used and must be 0. This mode might be useful for use with libmpv.
+    Passing the wrong thing here will crash the player. This mode might be
+    useful for use with libmpv. The ``offset`` parameter is simply added to the
+    memory address (since mpv 0.8.0, ignored before).
 
-    On Windows, currently only raw memory addresses work. File mapping is not
-    implemented because a ``mmap`` compatibility layer is missing, and because
-    this kind of shared memory method would perhaps not be overly useful on
-    Windows.
-
-    ``offset`` is the offset of the first pixel in the source file. It is
-    passed directly to ``mmap`` and is subject to certain restrictions
-    (see ``man mmap`` for details). In particular, this value has to be a
-    multiple of the system's page size.
+    ``offset`` is the byte offset of the first pixel in the source file.
+    (The current implementation always mmap's the whole file from position 0 to
+    the end of the image, so large offsets should be avoided. Before mpv 0.8.0,
+    the offset was actually passed directly to ``mmap``, but it was changed to
+    make using it easier.)
 
     ``fmt`` is a string identifying the image format. Currently, only ``bgra``
     is defined. This format has 4 bytes per pixels, with 8 bits per component.
@@ -579,8 +618,68 @@ Input Commands that are Possibly Subject to Change
     unseekable streams that are going out of sync.
     This command might be changed or removed in the future.
 
-Undocumented commands: ``tv_last_channel`` (TV/DVB only), ``get_property`` (?),
-``ao_reload`` (experimental/internal).
+Undocumented commands: ``tv_last_channel`` (TV/DVB only),
+``get_property`` (deprecated), ``ao_reload`` (experimental/internal).
+
+Hooks
+~~~~~
+
+Hooks are synchronous events between player core and a script or similar. This
+applies to the Lua scripting interface and the client API and only. Normally,
+events are supposed to be asynchronous, and the hook API provides an awkward
+and obscure way to handle events that require stricter coordination. There are
+no API stability guarantees made. Not following the protocol exactly can make
+the player freeze randomly. Basically, nobody should use this API.
+
+There are two special commands involved. Also, the client must listen for
+client messages (``MPV_EVENT_CLIENT_MESSAGE`` in the C API).
+
+``hook_add <hook-name> <id> <priority>``
+    Subscribe to the hook identified by the first argument (basically, the
+    name of event). The ``id`` argument is an arbitrary integer chosen by the
+    user. ``priority`` is used to sort all hook handlers globally across all
+    clients. Each client can register multiple hook handlers (even for the
+    same hook-name). Once the hook is registered, it cannot be unregistered.
+
+    When a specific event happens, all registered handlers are run serially.
+    This uses a protocol every client has to follow explicitly. When a hook
+    handler is run, a client message (``MPV_EVENT_CLIENT_MESSAGE``) is sent to
+    the client which registered the hook. This message has the following
+    arguments:
+
+    1. the string ``hook_run``
+    2. the ``id`` argument the hook was registered with as string (this can be
+       used to correctly handle multiple hooks registered by the same client,
+       as long as the ``id`` argument is unique in the client)
+    3. something undefined, used by the hook mechanism to track hook execution
+       (currently, it's the hook-name, but this might change without warning)
+
+    Upon receiving this message, the client can handle the event. While doing
+    this, the player core will still react to requests, but playback will
+    typically be stopped.
+
+    When the client is done, it must continue the core's hook execution by
+    running the ``hook_ack`` command.
+
+``hook_ack <string>``
+    Run the next hook in the global chain of hooks. The argument is the 3rd
+    argument of the client message that starts hook execution for the
+    current client.
+
+The following hooks are currently defined:
+
+``on_load``
+    Called when a file is to be opened, before anything is actually done.
+    For example, you could read and write the ``stream-open-filename``
+    property to redirect an URL to something else (consider support for
+    streaming sites which rarely give the user a direct media URL), or
+    you could set per-file options with by setting the property
+    ``file-local-options/<option name>``. The player will wait until all
+    hooks are run.
+
+``on_unload``
+    Run before closing a file, and before actually uninitializing
+    everything. It's not possible to resume playback in this state.
 
 Input Command Prefixes
 ----------------------
@@ -696,6 +795,11 @@ Property list
 
     Otherwise, return the ``filename`` property.
 
+``file-format``
+    Symbolic name of the file format. In some cases, this is a comma-separated
+    list of format names, e.g. mp4 is ``mov,mp4,m4a,3gp,3g2,mj2`` (the list
+    may grow in the future for any format).
+
 ``demuxer``
     Name of the current demuxer. (This is useless.)
 
@@ -765,6 +869,33 @@ Property list
 ``disc-titles``
     Number of BD/DVD titles.
 
+    This has a number of sub-properties. Replace ``N`` with the 0-based edition
+    index.
+
+    ``disc-titles/count``
+        Number of titles.
+
+    ``disc-titles/id``
+        Title ID as integer. Currently, this is the same as the title index.
+
+    ``disc-titles/length``
+        Length in seconds. Can be unavailable in a number of cases (currently
+        it works for libdvdnav only).
+
+    When querying the property with the client API using ``MPV_FORMAT_NODE``,
+    or with Lua ``mp.get_property_native``, this will return a mpv_node with
+    the following contents:
+
+    ::
+
+        MPV_FORMAT_NODE_ARRAY
+            MPV_FORMAT_NODE_MAP (for each edition)
+                "id"                MPV_FORMAT_INT64
+                "length"            MPV_FORMAT_DOUBLE
+
+``disc-title-list``
+    List of BD/DVD titles.
+
 ``disc-title`` (RW)
     Current BD/DVD title number. Writing works only for ``dvdnav://`` and
     ``bd://`` (and aliases for these).
@@ -814,7 +945,7 @@ Property list
                 "title"             MPV_FORMAT_STRING
                 "default"           MPV_FORMAT_FLAG
 
-``ab-loop-a``, ``ab-loop-b`` (TW)
+``ab-loop-a``, ``ab-loop-b`` (RW)
     Set/get A-B loop points. See corresponding options and ``ab_loop`` command.
     The special value ``no`` on either of these properties disables looping.
 
@@ -862,6 +993,10 @@ Property list
         MPV_FORMAT_NODE_MAP
             (key and string value for each metadata entry)
 
+``filtered-metadata``
+    Like ``metadata``, but includes only fields listed in the ``--display-tags``
+    option. This is the same set of tags that is printed to the terminal.
+
 ``chapter-metadata``
     Metadata of current chapter. Works similar to ``metadata`` property. It
     also allows the same access methods (using sub-properties).
@@ -886,6 +1021,10 @@ Property list
 ``pause`` (RW)
     Pause status. This is usually ``yes`` or ``no``. See ``--pause``.
 
+``idle``
+    Return ``yes`` if no file is loaded, but the player is staying around
+    because of the ``--idle`` option.
+
 ``core-idle``
     Return ``yes`` if the playback core is paused, otherwise ``no``. This can
     be different ``pause`` in special situations, such as when the player
@@ -1018,6 +1157,9 @@ Property list
 ``border`` (RW)
     See ``--border``.
 
+``on-all-workspaces`` (RW)
+    See ``--on-all-workspaces``. Unsetting may not work on all WMs.
+
 ``framedrop`` (RW)
     See ``--framedrop``.
 
@@ -1046,6 +1188,17 @@ Property list
     Note that you don't know the success of the operation immediately after
     writing this property. It happens with a delay as video is reinitialized.
 
+``detected-hwdec``
+    Return the current hardware decoder that was detected and opened. Returns
+    the same values as ``hwdec``.
+
+    This is known only once the VO has opened (and possibly later). With some
+    VOs (like ``opengl``), this is never known in advance, but only when the
+    decoder attempted to create the hw decoder successfully. Also, hw decoders
+    with ``-copy`` suffix are returned only while hw decoding is active (and
+    unset afterwards). All this reflects how detecting hw decoders are
+    detected and used internally in mpv.
+
 ``panscan`` (RW)
     See ``--panscan``.
 
@@ -1071,6 +1224,16 @@ Property list
         The pixel format as string. This uses the same names as used in other
         places of mpv.
 
+    ``video-params/average-bpp``
+        Average bits-per-pixel as integer. Subsampled planar formats use a
+        different resolution, which is the reason this value can sometimes be
+        odd or confusing. Can be unavailable with some formats.
+
+    ``video-params/plane-depth``
+        Bit depth for each color component as integer. This is only exposed
+        for planar or single-component formats, and is unavailable for other
+        formats.
+
     ``video-params/w``, ``video-params/h``
         Video size as integers, with no aspect correction applied.
 
@@ -1397,6 +1560,14 @@ Property list
 ``seekable``
     Return whether it's generally possible to seek in the current file.
 
+``partially-seekable``
+    Return ``yes`` if the current file is considered seekable, but only because
+    the cache is active. This means small relative seeks may be fine, but larger
+    seeks may fail anyway. Whether a seek will succeed or not is generally not
+    known in advance.
+
+    If this property returns true, ``seekable`` will also return true.
+
 ``playback-abort``
     Return whether playback is stopped or is to be stopped. (Useful in obscure
     situations like during ``on_load`` hook processing, when the user can
@@ -1421,18 +1592,32 @@ Property list
 
     .. admonition:: Example
 
-        --osd-status-msg='This is ${osd-ass-cc/0}{\\b1}bold text'
+        - ``--osd-status-msg='This is ${osd-ass-cc/0}{\\b1}bold text'``
+        - ``show_text "This is ${osd-ass-cc/0}{\b1}bold text"``
 
     Any ASS override tags as understood by libass can be used.
 
     Note that you need to escape the ``\`` character, because the string is
     processed for C escape sequences before passing it to the OSD code.
 
+    A list of tags can be found here: http://docs.aegisub.org/latest/ASS_Tags/
+
 ``vo-configured``
     Return whether the VO is configured right now. Usually this corresponds to
     whether the video window is visible. If the ``--force-window`` option is
     used, this is usually always returns ``yes``.
 
+``packet-video-bitrate``, ``packet-audio-bitrate``, ``packet-sub-bitrate``
+    Bitrate values calculated on the packet level. This works by dividing the
+    bit size of all packets between two keyframes by their presentation
+    timestamp distance. (This uses the timestamps are stored in the file, so
+    e.g. playback speed does not influence the returned values.) In particular,
+    the video bitrate will update only per keyframe, and show the "past"
+    bitrate. To make the property more UI friendly, updates to these properties
+    are throttled in a certain way.
+
+    How exactly these values are calculated might change in the future.
+
 ``audio-device-list``
     Return the list of discovered audio devices. This is mostly for use with
     the client API, and reflects what ``--audio-device=help`` with the command
@@ -1467,6 +1652,16 @@ Property list
 
     How these details are handled may change in the future.
 
+``current-vo``
+    Current video output driver (name as used with ``--vo``).
+
+``current-ao``
+    Current audio output driver (name as used with ``--ao``).
+
+``audio-out-detected-device``
+    Return the audio device selected by the AO driver (only implemented for
+    some drivers: currently only ``coreaudio``).
+
 ``mpv-version``
     Return the mpv version/copyright string. Depending on how the binary was
     built, it might contain either a release version, or just a git hash.

DOCS/man/ipc.rst

@@ -4,8 +4,7 @@ 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 using the option
 ``--input-unix-socket``. Clients can connect to this socket and send commands to
-the player or receive events from it. You can use the ``socat`` tool to send
-commands (and receive reply) from the shell.
+the player or receive events from it.
 
 .. warning::
 
@@ -15,6 +14,38 @@ commands (and receive reply) from the shell.
     which can run arbitrary system commands. The use-case is controlling the
     player locally. This is not different from the MPlayer slave protocol.
 
+Socat example
+-------------
+
+You can use the ``socat`` tool to send commands (and receive reply) from the
+shell. Assuming mpv was started with:
+
+::
+
+    mpv file.mkv --input-unix-socket=/tmp/mpvsocket
+
+Then you can control it using socat:
+
+::
+
+    > echo '{ "command": ["get_property", "playback-time"] }' | socat - /tmp/mpvsocket
+    {"data":190.482000,"error":"success"}
+
+In this case, socat copies data between stdin/stdout and the mpv socket
+connection.
+
+See the ``--idle`` option how to make mpv start without exiting immediately or
+playing a file.
+
+It's also possible to send input.conf style text-only commands:
+
+::
+
+    > 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.)
+
 Protocol
 --------
 
@@ -156,6 +187,14 @@ extra commands can also be used as part of the protocol:
     lead to breakages with future mpv releases. Instead, make a feature request,
     and ask for a proper event that returns the information you need.
 
+``enable_event``, ``disable_event``
+    Enables or disables the named event. Mirrors the ``mpv_request_event`` C
+    API function. If the string ``all`` is used instead of an event name, all
+    events are enabled or disabled.
+
+    By default, most events are enabled, and there is not much use for this
+    command.
+
 ``suspend``
     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

DOCS/man/lua.rst

@@ -1,14 +1,14 @@
 LUA SCRIPTING
 =============
 
-mpv can load Lua scripts. Scripts passed to the ``--lua`` option, or found in
-the ``lua`` subdirectory of the mpv configuration directory (usually
-``~/.config/mpv/lua/``) will be loaded on program start. mpv also appends the
-``lua`` subdirectory to the end of Lua's path so you can import scripts from
+mpv can load Lua scripts. Scripts passed to the ``--script`` option, or found in
+the ``scripts`` subdirectory of the mpv configuration directory (usually
+``~/.config/mpv/scripts/``) will be loaded on program start. mpv also appends the
+``scripts`` subdirectory to the end of Lua's path so you can import scripts from
 there too. Since it's added to the end, don't name scripts you want to import
 the same as Lua libraries because they will be overshadowed by them.
 
-mpv provides the built-in module ``mp``, which provides functions to send
+mpv provides the built-in module ``mp``, which contains functions to send
 commands to the mpv core and to retrieve information about playback state, user
 settings, file information, and so on.
 
@@ -22,21 +22,21 @@ A script which leaves fullscreen mode when the player is paused:
 
 ::
 
-    function on_pause()
-        mp.set_property("fullscreen", "no")
+    function on_pause_change(name, value)
+        if value == true then
+            mp.set_property("fullscreen", "no")
+        end
     end
-    mp.register_event("pause", on_pause)
+    mp.observe_property("pause", "bool", on_pause_change)
 
-This script provides a pretty weird feature, but Lua scripting was made to
-allow users implement features which are not going to be added to the mpv core.
 
-Mode of operation
------------------
+Details on the script initialization and lifecycle
+--------------------------------------------------
 
-Your script will be loaded by the player at program start from the ``lua``
-configuration subdirectory, from a path specified with the ``--lua`` option, or
-in some cases, internally (like ``--osc``). Each script runs in its own
-thread. Your script is first run "as is", and once that is done, the event loop
+Your script will be loaded by the player at program start from the ``scripts``
+configuration subdirectory, or from a path specified with the ``--script``
+option. Some scripts are loaded internally (like ``--osc``). Each script runs in
+its own thread. Your script is first run "as is", and once that is done, the event loop
 is entered. This event loop will dispatch events received by mpv and call your
 own event handlers which you have registered with ``mp.register_event``, or
 timers added with ``mp.add_timeout`` or similar.
@@ -359,7 +359,7 @@ The ``mp`` module is preloaded, although it can be loaded manually with
 
 
 ``mp.get_opt(key)``
-    Return a setting from the ``--lua-opts`` option. It's up to the user and
+    Return a setting from the ``--script-opts`` option. It's up to the user and
     the script how this mechanism is used. Currently, all scripts can access
     this equally, so you should be careful about collisions.
 
@@ -511,12 +511,12 @@ Example config::
     optionC=no
 
 
-Command-line options are read from the ``--lua-opts`` parameter. To avoid
+Command-line options are read from the ``--script-opts`` parameter. To avoid
 collisions, all keys have to be prefixed with ``identifier-``.
 
 Example command-line::
 
-     --lua-opts=myscript-optionA=TEST:myscript-optionB=0:myscript-optionC=yes
+     --script-opts=myscript-optionA=TEST,myscript-optionB=0,myscript-optionC=yes
 
 
 mp.utils options
@@ -573,7 +573,7 @@ strictly part of the guaranteed API.
     Runs an external process and waits until it exits. Returns process status
     and the captured output.
 
-    The paramater ``t`` is a table. The function reads the following entries:
+    The parameter ``t`` is a table. The function reads the following entries:
 
         ``args``
             Array of strings. The first array entry is the executable. This
@@ -623,6 +623,10 @@ 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.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.
+
 Events
 ------
 
@@ -640,7 +644,7 @@ Example:
         print("start of playback!")
     end
 
-    mp.register_event("playback-start", my_fn)
+    mp.register_event("file-loaded", my_fn)
 
 
 
@@ -659,7 +663,9 @@ List of events
     Happens after a file was loaded and begins playback.
 
 ``seek``
-    Happens on seeking (including ordered chapter segment changes).
+    Happens on seeking. (This might include cases when the player seeks
+    internally, even without user interaction. This includes e.g. segment
+    changes when playing ordered chapters Matroska files.)
 
 ``playback-restart``
     Start of playback after seek or after file was loaded.
@@ -676,7 +682,7 @@ List of events
 
 ``shutdown``
     Sent when the player quits, and the script should terminate. Normally
-    handled automatically. See `Mode of operation`_.
+    handled automatically. See `Details on the script initialization and lifecycle`_.
 
 ``log-message``
     Receives messages enabled with ``mp.enable_messages``. The message data
@@ -695,13 +701,8 @@ List of events
         (undocumented) existing ones.
 
     ``text``
-        The log message. Note that this is the direct output of a printf()
-        style output API. The text will contain embedded newlines, and it's
-        possible that a single message contains multiple lines, or that a
-        message contains a partial line.
-
-        It's safe to display messages only if they end with a newline character,
-        and to buffer them otherwise.
+        The log message. The text will end with a newline character. Sometimes
+        it can contain multiple lines.
 
     Keep in mind that these messages are meant to be hints for humans. You
     should not parse them, and prefix/level/text of messages might change
@@ -716,9 +717,6 @@ List of events
 ``command-reply``
     Undocumented (not useful for Lua scripts).
 
-``script-input-dispatch``
-    Undocumented (used internally).
-
 ``client-message``
     Undocumented (used internally).
 
@@ -735,8 +733,8 @@ The following events also happen, but are deprecated: ``tracks-changed``,
 Extras
 ------
 
-This documents experimental features, or features that are "too special" and
-we don't guarantee a stable interface to it.
+This documents experimental features, or features that are "too special" to
+guarantee a stable interface.
 
 ``mp.add_hook(type, priority, fn)``
     Add a hook callback for ``type`` (a string identifying a certain kind of
@@ -747,13 +745,6 @@ we don't guarantee a stable interface to it.
     recommended as neutral default value. ``fn`` is the function that will be
     called during execution of the hook.
 
-    Currently existing hooks:
-
-    ``on_load``
-        Called when a file is to be opened, before anything is actually done.
-        For example, you could read and write the ``stream-open-filename``
-        property to redirect an URL to something else (consider support for
-        streaming sites which rarely give the user a direct media URL), or
-        you could set per-file options with by setting the property
-        ``file-local-options/<option name>``. The player will wait until all
-        hooks are run.
+    See `Hooks`_ for currently existing hooks and what they do - only the hook
+    list is interesting; handling hook execution is done by the Lua script
+    function automatically.

DOCS/man/mpv.rst

@@ -164,6 +164,9 @@ Shift+PGUP and Shift+PGDWN
 D
     Activate/deactivate deinterlacer.
 
+A
+    Cycle aspect ratio override.
+
 (The following keys are valid only when using a video output that supports the
 corresponding adjustment, or the software equalizer (``--vf=eq``).)
 
@@ -235,11 +238,43 @@ is the same as ``--no-fs``.
 If an option is marked as *(XXX only)*, it will only work in combination with
 the *XXX* option or if *XXX* is compiled in.
 
-.. note::
+Escaping spaces and other special characters
+--------------------------------------------
 
-    The suboption parser (used for example for ``--ao=pcm`` suboptions)
-    supports a special kind of string-escaping intended for use with external
-    GUIs.
+Keep in mind that the shell will partially parse and mangle the arguments you
+pass to mpv. For example, you might need to quote or escape options and
+filenames:
+
+    ``mpv "filename with spaces.mkv" --title="window title"``
+
+It gets more complicated if the suboption parser is involved. The suboption
+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 ``[...]``.
+Additionally, there is a special form of quoting with ``%n%`` described below.
+
+For example, the ``opengl`` VO can take multiple options:
+
+    ``mpv test.mkv --vo=opengl:scale=lanczos:icc-profile=file.icc,xv``
+
+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 '--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 recieves the ``"``
+quotes.
+
+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).
+
+A special kind of string-escaping intended for use with external scripts and
+programs is started with ``%``.
 
 It has the following format::
 
@@ -253,6 +288,15 @@ It has the following format::
 
     ``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 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
 -----
 
@@ -340,6 +384,17 @@ setting them to *no*. Even suboptions can be specified in this way.
         # Use quotes for text that can contain spaces:
         status-msg="Time: ${time-pos}"
 
+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 ``"`` 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
 --------------------------------------------------------
 
@@ -386,12 +441,11 @@ profile name ``default`` to continue with normal options.
     ::
 
         [vo.vdpau]
-        # Use hardware decoding (might break playback of some h264 files)
+        # Use hardware decoding
         hwdec=vdpau
 
         [protocol.dvd]
         profile-desc="profile for dvd:// streams"
-        vf=pp=hb/vb/dr/al/fd
         alang=en
 
         [extension.flv]
@@ -436,7 +490,7 @@ listed.
 
 - ``AV:`` or ``V:`` (video only) or ``A:`` (audio only)
 - The current time position in ``HH:MM:SS`` format (``playback-time`` property)
-- The total file duration (or ``00:00:00`` if unknown) (``length`` property)
+- The total file duration (absent if unknown) (``length`` property)
 - Playback speed, e.g. `` x2.0``. Only visible if the speed is not normal. This
   is the user-requested speed, and not the actual speed  (usually they should
   be the same, unless playback is too slow). (``speed`` property.)
@@ -487,7 +541,7 @@ PROTOCOLS
 ``bd://[title][/device]`` ``--bluray-device=PATH``
     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 directly.
+    to the mounted directory directly.
 
 ``bdnav://[title][/device]``
     Play a Blu-Ray disc, with navigation features enabled. This feature is
@@ -712,12 +766,32 @@ FILES
 ``~/.config/mpv/input.conf``
     key bindings (see `INPUT.CONF`_ section)
 
-``~/.config/mpv/lua/``
-    All files in this directly are loaded as if they were passed to the
-    ``--lua`` option. They are loaded in alphabetical order, and sub-directories
+``~/.config/mpv/scripts/``
+    All files in this directory are loaded as if they were passed to the
+    ``--script`` option. They are loaded in alphabetical order, and sub-directories
     and files with no ``.lua`` extension are ignored. The ``--load-scripts=no``
     option disables loading these files.
 
+``~/.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.
+
+    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
+    all) settings that were changed during playback. The filenames are hashed
+    from the full paths of the media files. It's in general not possible to
+    extract the media filename from this hash. However, you can set the
+    ``--write-filename-in-watch-later-config`` option, and the player will
+    add the media filename to the contents of the resume config file.
+
+``~/.config/mpv/lua-settings/osc.conf``
+    This is loaded by the OSC script. See the `ON SCREEN CONTROLLER`_ docs
+    for details.
+
+    Other files in this directory are specific to the corresponding scripts
+    as well, and the mpv core doesn't touch them.
+
 Note that the environment variables ``$XDG_CONFIG_HOME`` and ``$MPV_HOME`` can
 override the standard directory ``~/.config/mpv/``.
 
@@ -728,18 +802,16 @@ FILES ON WINDOWS
 ================
 
 On win32 (if compiled with MinGW, but not Cygwin), the default config file
-locations are different:
+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
 
-``%APPDATA%/mpv/mpv.conf``
-    Preferred mpv config file. This maps to a system and user-specific path,
-    for example ``C:\users\USERNAME\Application Data\mpv\mpv.conf``. You can
-    find the exact path by running ``echo %APPDATA%\mpv\mpv.conf`` in cmd.exe.
+    ``C:\users\USERNAME\Application Data\mpv\mpv.conf``
 
-``%APPDATA%/mpv/input.conf``
-    key bindings (see `INPUT.CONF`_ section)
+You can find the exact path by running ``echo %APPDATA%\mpv\mpv.conf`` in cmd.exe.
 
-``%APPDATA%/mpv/lua/``
-    equivalent of ``~/.config/mpv/lua/`` on Unix.
+Other config files (such as ``input.conf``) are in the same directory. See the
+`FILES`_ section above.
 
 The environment variable ``$MPV_HOME`` completely overrides these, like on
 UNIX.

DOCS/man/options.rst

@@ -51,8 +51,8 @@ Track Selection
     other software using FFmpeg (consider ``ffprobe``).
 
     Note that with external tracks (added with ``--sub-file`` and similar
-    options) will have duplicate IDs. In that case, the first stream in order
-    is selected.
+    options), there will be streams with duplicate IDs. In this case, the
+    first stream in order is selected.
 
 ``--edition=<ID|auto>``
     (Matroska files only)
@@ -107,12 +107,17 @@ Playback Control
     If ``--audio-pitch-correction`` is used, playing with a speed higher than
     normal automatically inserts the ``scaletempo`` audio filter.
 
-``--loop=<N|inf|no>``
+``--loop=<N|inf|force|no>``
     Loops playback ``N`` times. A value of ``1`` plays it one time (default),
     ``2`` two times, etc. ``inf`` means forever. ``no`` is the same as ``1`` and
     disables looping. If several files are specified on command line, the
     entire playlist is looped.
 
+    The ``force`` mode is like ``inf``, but does not skip playlist entries
+    which have been marked as failing. This means the player might waste CPU
+    time trying to loop a file that doesn't exist. But it might be useful for
+    playing webradios under very bad network conditions.
+
 ``--pause``
     Start the player in paused state.
 
@@ -124,8 +129,8 @@ Playback Control
     chapter to end playing at. Also see ``--start``.
 
 ``--playlist=<filename>``
-    Play files according to a playlist file (Supports some common formats.If
-    no format is detected, t will be treated as list of files, separated by
+    Play files according to a playlist file (Supports some common formats. If
+    no format is detected, it will be treated as list of files, separated by
     newline characters. Note that XML playlist formats are not supported.)
 
     You can play playlists directly and without this option, however, this
@@ -305,6 +310,11 @@ Program Behavior
 ``--list-protocols``
     Print a list of the supported protocols.
 
+``--log-file=<path>``
+    Opens the given path for writing, and print log messages to it. Existing
+    files will be truncated. The log level always corresponds to ``-v``,
+    regardless of terminal verbosity levels.
+
 ``--config-dir=<path>``
     Force a different configuration directory. If this is set, the given
     directory is used to load configuration files, and all other configuration
@@ -333,37 +343,36 @@ Program Behavior
 
     This option is useful for debugging only.
 
-``--idle``
+``--idle=<no|yes|once>``
     Makes mpv wait idly instead of quitting when there is no file to play.
     Mostly useful in slave mode, where mpv can be controlled through input
     commands (see also ``--slave-broken``).
 
+    ``once`` will only idle at start and let the player close once the
+    first playlist has finished playing back.
+
 ``--include=<configuration-file>``
     Specify configuration file to be parsed after the default ones.
 
 ``--load-scripts=<yes|no>``
-    If set to ``no``, don't auto-load scripts from the ``lua`` configuration
-    subdirectory (usually ``~/.config/mpv/lua/``).
+    If set to ``no``, don't auto-load scripts from the ``scripts``
+    configuration subdirectory (usually ``~/.config/mpv/scripts/``).
     (Default: ``yes``)
 
-``--lua=<filename>``
+``--script=<filename>``
     Load a Lua script. You can load multiple scripts by separating them with
     commas (``,``).
 
-``--lua-opts=key1=value1,key2=value2,...``
-    Set options for scripts. A Lua script can query an option by key. If an
+``--script-opts=key1=value1,key2=value2,...``
+    Set options for scripts. A script can query an option by key. If an
     option is used and what semantics the option value has depends entirely on
-    the loaded Lua scripts. Values not claimed by any scripts are ignored.
+    the loaded scripts. Values not claimed by any scripts are ignored.
 
 ``--merge-files``
     Pretend that all files passed to mpv are concatenated into a single, big
     file. This uses timeline/EDL support internally. Note that this won't work
     for ordered chapter files.
 
-    This option is interpreted at program start, and doesn't affect for
-    example files or playlists loaded with the ``loadfile`` or ``loadlist``
-    commands.
-
 ``--no-resume-playback``
     Do not restore playback position from the ``watch_later`` configuration
     subdirectory (usually ``~/.config/mpv/watch_later/``).
@@ -411,6 +420,9 @@ Program Behavior
         This option may expose privacy-sensitive information and is thus
         disabled by default.
 
+``--ignore-path-in-watch-later-config``
+    Ignore path (i.e. use filename only) when using watch later feature.
+
 ``--show-profile=<profile>``
     Show the description and content of a profile.
 
@@ -425,21 +437,21 @@ Program Behavior
 ``--ytdl``, ``--no-ytdl``
     Enable the youtube-dl hook-script. It will look at the input URL, and will
     play the video located on the website. This works with many streaming sites,
-    not just the one the scripts are named after. This requires a recent version
-    of youtube-dl to be installed on the system.
+    not just the one that the script is named after. This requires a recent
+    version of youtube-dl to be installed on the system. (Enabled by default.)
 
     If the script can't do anything with an URL, it will do nothing.
 
-    Currently disabled by default, because youtube-dl's generic extractor can
-    get stuck on some URL, preventing playback.
-
     (Note: this is the replacement for the now removed libquvi support.)
 
 ``--ytdl-format=<best|worst|mp4|webm|...>``
     Video format/quality that is directly passed to youtube-dl. The possible
     values are specific to the website and the video, for a given url the
     available formats can be found with the command
-    ``youtube-dl --list-formats URL``.
+    ``youtube-dl --list-formats URL``. See youtube-dl's documentation for
+    available aliases. To use experimental DASH support for youtube, use
+    ``bestvideo+bestaudio``.
+    (Default: ``best``)
 
 Video
 -----
@@ -498,7 +510,7 @@ Video
         in mpv 0.5.x and before.) This tells the decoder to skip frames (unless
         they are needed to decode future frames). May help with slow systems,
         but can produce unwatchably choppy output, or even freeze the display
-        complete. Not recommended.
+        completely. Not recommended.
         The ``--vd-lavc-framedrop`` option controls what frames to drop.
     <decoder+vo>
         Enable both modes. Not recommended.
@@ -539,7 +551,8 @@ Video
 
     The ``vaapi-copy`` mode allows you to use vaapi with any VO. Because
     this copies the decoded video back to system RAM, it's likely less efficient
-    than the ``vaapi`` mode.
+    than the ``vaapi`` mode. But there are reports that this is actually faster
+    as well, and avoids many issues with ``vaapi``.
 
     .. note::
 
@@ -576,9 +589,8 @@ Video
 ``--video-unscaled``
     Disable scaling of the video. If the window is larger than the video,
     black bars are added. Otherwise, the video is cropped. The video still
-    can be influenced by the other ``--video-...`` options. (If the
-    ``--video-zoom`` option is set to a value other than ``1``, scaling is
-    enabled, but the video isn't automatically scaled to the window size.)
+    can be influenced by the other ``--video-...`` options. (But not all; for
+    example ``--video-zoom`` does nothing if this option is enabled.)
 
     The video and monitor aspects aspect will be ignored. Aspect correction
     would require to scale the video in the X or Y direction, but this option
@@ -926,7 +938,7 @@ Audio
     ``--dtshd`` and ``--no-dtshd`` are deprecated aliases.
 
 ``--audio-channels=<number|layout>``
-    Request a channel layout for audio output (default: stereo). This  will ask
+    Request a channel layout for audio output (default: auto). This  will ask
     the AO to open a device with the given channel layout. It's up to the AO
     to accept this layout, or to pick a fallback or to error out if the
     requested layout is not supported.
@@ -939,9 +951,9 @@ Audio
     lists speaker names, which can be used to express arbitrary channel
     layouts (e.g. ``fl-fr-lfe`` is 2.1).
 
-    You can use ``--audio-channels=auto`` to disable this. In this case, the AO
-    use the channel layout as the audio filter chain indicates. (``empty`` is
-    an accepted obsolete for ``auto``.)
+    The default is ``--audio-channels=auto``, which tries to play audio using
+    the input file's channel layout. (Or more precisely, the output of the
+    audio filter chain.) (``empty`` is an accepted obsolete alias for ``auto``.)
 
     This will also request the channel layout from the decoder. If the decoder
     does not support the layout, it will fall back to its native channel layout.
@@ -1033,6 +1045,16 @@ Audio
         maximum amplification, i.e. amplify by 200%. The default volume (no
         change in volume) will be ``50`` in this case.
 
+``--audio-file-auto=<no|exact|fuzzy|all>``, ``--no-audio-file-auto``
+    Load additional audio files matching the video filename. The parameter
+    specifies how external audio files are matched. ``exact`` is enabled by
+    default.
+
+    :no:    Don't automatically load external audio files.
+    :exact: Load the media filename with audio file extension (default).
+    :fuzzy: Load all audio files containing media filename.
+    :all:   Load all audio files in the current directory.
+
 ``--audio-client-name=<name>``
     The application name the player reports to the audio API. Can be useful
     if you want to force a different audio profile (e.g. with PulseAudio),
@@ -1122,12 +1144,23 @@ Subtitles
         This affects ASS subtitles as well, and may lead to incorrect subtitle
         rendering. Use with care, or use ``--sub-text-font-size`` instead.
 
+``--sub-scale-by-window=<yes|no>``
+    Whether to scale subtitles with the window size (default: yes). If this is
+    disabled, changing the window size won't change the subtitle font size.
+
+    Like ``--sub-scale``, this can break ASS subtitles.
+
 ``--sub-scale-with-window=<yes|no>``
     Make the subtitle font size relative to the window, instead of the video.
     This is useful if you always want the same font size, even if the video
     doesn't covert the window fully, e.g. because screen aspect and window
     aspect mismatch (and the player adds black bars).
 
+    This option is misnamed. The difference to the confusingly similar sounding
+    option ``--sub-scale-by-window`` is that ``--sub-scale-with-window`` still
+    scales with the approximate window size, while the other option disables
+    this scaling.
+
     Like ``--sub-scale``, this can break ASS subtitles.
 
 ``--embeddedfonts``, ``--no-embeddedfonts``
@@ -1434,15 +1467,16 @@ Window
 ------
 
 ``--title=<string>``
-    Set the window title. Properties are expanded on playback start.
-    (See `Property Expansion`_.)
+    Set the window title. This is used for the video window, and if possible,
+    also sets the audio stream title.
+
+    Properties are expanded. (See `Property Expansion`_.)
 
     .. warning::
 
         There is a danger of this causing significant CPU usage, depending on
-        the properties used and the window manager. Changing the window title
-        is often a slow operation, and if the title changes every frame,
-        playback can be ruined.
+        the properties used. Changing the window title is often a slow
+        operation, and if the title changes every frame, playback can be ruined.
 
 ``--screen=<default|0-32>``
     In multi-monitor configurations (i.e. a single desktop that spans across
@@ -1478,26 +1512,41 @@ Window
 
     See also ``--screen``.
 
-``--keep-open``
+``--fs-black-out-screens``
+
+    OS X only. Black out other displays when going fullscreen.
+
+``--keep-open=<yes|no|always>``
     Do not terminate when playing or seeking beyond the end of the file, and
     there is not next file to be played (and ``--loop`` is not used).
     Instead, pause the player. When trying to seek beyond end of the file, the
-    player will pause at an arbitrary playback position (or, in corner cases,
-    not redraw the window at all).
+    player will attempt to seek to the last frame.
+
+    The following arguments can be given:
+
+    :no:        If the current file ends, go to the next file or terminate.
+                (Default.)
+    :yes:       Don't terminate if the current file is the last playlist entry.
+                Equivalent to ``--keep-open`` without arguments.
+    :always:    Like ``yes``, but also applies to files before the last playlist
+                entry. This means playback will never automatically advance to
+                the next file.
 
     .. note::
 
-        This option is not respected when using ``--frames``, ``--end``,
-        ``--length``, or when passing a chapter range to ``--chapter``.
-        Explicitly skipping to the next file or skipping beyond the last
-        chapter will terminate playback as well, even if ``--keep-open`` is
-        given.
+        This option is not respected when using ``--frames``. Explicitly
+        skipping to the next file if the binding uses ``force`` will terminate
+        playback as well.
+
+        Also, if errors or unusual circumstances happen, the player can quit
+        anyway.
 
     Since mpv 0.6.0, this doesn't pause if there is a next file in the playlist,
     or the playlist is looped. Approximately, this will pause when the player
     would normally exit, but in practice there are corner cases in which this
     is not the case (e.g. ``mpv --keep-open file.mkv /dev/null`` will play
-    file.mkv normally, then fail to open ``/dev/null``, then exit).
+    file.mkv normally, then fail to open ``/dev/null``, then exit). (In
+    mpv 0.8.0, ``always`` was introduced, which restores the old behavior.)
 
 ``--force-window``
     Create a video output window even if there is no video. This can be useful
@@ -1520,6 +1569,10 @@ Window
     Play video with window border and decorations. Since this is on by
     default, use ``--no-border`` to disable the standard window decorations.
 
+``--on-all-workspaces``
+    (X11 only)
+    Show the video window on all virtual desktops.
+
 ``--geometry=<[W[xH]][+-x+-y]>``, ``--geometry=<x:y>``
     Adjust the initial window position or size. ``W`` and ``H`` set the window
     size in pixels. ``x`` and ``y`` set the window position, measured in pixels
@@ -1622,6 +1675,17 @@ Window
             screen height, make the window smaller until either its width is 90%
             of the screen, or its height is 80% of the screen.
 
+``--autofit-smaller=<[W[xH]]>``
+    This option behaves exactly like ``--autofit``, except that it sets the
+    minimum size of the window (just as ``--autofit-larger`` sets the maximum).
+
+    .. admonition:: Example
+
+        ``500x500``
+            Make the window at least 500 pixels wide and 500 pixels high
+            (depending on the video aspect ratio, the width or height will be
+            larger than 500 in order to keep the aspect ratio the same).
+
 ``--autosync=<factor>``
     Gradually adjusts the A/V sync based on audio delay measurements.
     Specifying ``--autosync=0``, the default, will cause frame timing to be
@@ -2147,6 +2211,9 @@ Demuxer
     a timestamp difference higher than the readahead amount relative to the
     last packet returned to the decoder, the demuxer keeps reading.
 
+    Note that the ``--cache-secs`` option will override this value if a cache
+    is enabled, and the value is larger.
+
     (This value tends to be fuzzy, because many file formats don't store linear
     timestamps.)
 
@@ -2274,7 +2341,7 @@ Input
 
 ``--input-vo-keyboard=<yes|no>``
     Disable all keyboard input on for VOs which can't participate in proper
-    keyboard input dispatching. This currently affects X11. Generally useful for
+    keyboard input dispatching. May not affect all VOs. Generally useful for
     embedding only.
 
     On X11, a sub-window with input enabled grabs all keyboard input as long
@@ -2286,11 +2353,14 @@ Input
     behavior, but naively embedding foreign windows breaks it.
 
     The only way to handle this reasonably is using the XEmbed protocol, which
-    was designed to solve these problems. But Qt has questionable support, and
-    mpv doesn't implement it yet.
+    was designed to solve these problems. GTK provides ``GtkSocket``, which
+    supports XEmbed. Qt doesn't seem to provide anything working in newer
+    versions.
 
-    As a workaround, this option is disabled by default in libmpv. (Note that
-    ``input-default-bindings`` is disabled by default in libmpv as well.)
+    If the embedder supports XEmbed, input should work with default settings
+    and with this option disabled. Note that ``input-default-bindings`` is
+    disabled by default in libmpv as well - it should be enabled if you want
+    the mpv default key bindings.
 
     (This option was renamed from ``--input-x11-keyboard``.)
 
@@ -2434,7 +2504,7 @@ OSD
     Alternatively, the color can be specified as a RGB hex triplet in the form
     ``#RRGGBB``, where each 2-digit group expresses a color value in the
     range 0 (``00``) to 255 (``FF``). For example, ``#FF0000`` is red.
-    This is similar to web colors.
+    This is similar to web colors. Alpha is given with ``#AARRGGBB``.
 
     .. admonition:: Examples
 
@@ -2681,7 +2751,7 @@ Terminal
 ``--no-msg-color``
     Disable colorful console output on terminals.
 
-``--msg-level=<module1=level1:module2=level2:...>``
+``--msg-level=<module1=level1,module2=level2,...>``
     Control verbosity directly for each module. The ``all`` module changes the
     verbosity of all the modules not explicitly specified on the command line.
 
@@ -3020,7 +3090,7 @@ Cache
 ``--cache-secs=<seconds>``
     How many seconds of audio/video to prefetch if the cache is active. This
     overrides the ``--demuxer-readahead-secs`` option if and only if the cache
-    is enabled. (Default: 2.)
+    is enabled and the value is larger. (Default: 2.)
 
 ``--cache-pause``, ``--no-cache-pause``
     Whether the player should automatically pause when the cache runs low,
@@ -3071,6 +3141,11 @@ Network
 ``--referrer=<string>``
     Specify a referrer path or URL for HTTP requests.
 
+``--network-timeout=<seconds>``
+    Specify the network timeout in seconds. This affects at least HTTP. The
+    special value 0 (default) uses the FFmpeg/Libav defaults. If a protocol
+    is used which does not support timeouts, this option is silently ignored.
+
 ``--rtsp-transport=<lavf|udp|tcp|http>``
     Select RTSP transport method (default: tcp). This selects the underlying
     network transport when playing ``rtsp://...`` URLs. The value ``lavf``
@@ -3081,9 +3156,9 @@ Network
     by default. The option allows the following parameters:
 
     :no:        Don't do anything special. Typically, this will simply pick the
-                first audio/video streams it can find. (Default.)
+                first audio/video streams it can find.
     :min:       Pick the streams with the lowest bitrate.
-    :max:       Same, but highest bitrate.
+    :max:       Same, but highest bitrate. (Default.)
 
     The bitrate as used is sent by the server, and there's no guarantee it's
     actually meaningful.
@@ -3099,11 +3174,28 @@ DVB
     in the mpv configuration directory (usually ``~/.config/mpv``) with the
     filename ``channels.conf.{sat,ter,cbl,atsc}`` (based on your card type) or
     ``channels.conf`` as a last resort.
+    For DVB-S/2 cards, a VDR 1.7.x format channel list is recommended
+    as it allows tuning to DVB-S2 channels, enabling subtitles and
+    decoding the PMT (which largely improves the demuxing).
+    Classic mplayer format channel lists are still supported (without
+    these improvements), and for other card types, only limited VDR
+    format channel list support is implemented (patches welcome).
+    For channels with dynamic PID switching or incomplete
+    ``channels.conf``, ``--dvbin-full-transponder`` or the magic PID
+    ``8192`` are recommended.
 
 ``--dvbin-timeout=<1-30>``
     Maximum number of seconds to wait when trying to tune a frequency before
     giving up (default: 30).
 
+``--dvbin-full-transponder=<yes|no>``
+    Apply no filters on program PIDs, only tune to frequency and pass full
+    transponder to demuxer. This is useful to record multiple programs
+    on a single transponder, or to work around issues in the ``channels.conf``.
+    It is also recommended to use this for channels which switch PIDs
+    on-the-fly, e.g. for regional news.
+
+    Default: ``no``
 
 PVR
 ---
@@ -3167,6 +3259,15 @@ PVR
 Miscellaneous
 -------------
 
+``--display-tags=tag1,tags2,...``
+    Set the list of tags that should be displayed on the terminal. Tags that
+    are in the list, but are not present in the played file, will not be shown.
+    If a value ends with ``*``, all tags are matched by prefix (though there
+    is no general globbing). Just passing ``*`` essentially filtering.
+
+    The default includes a common list of tags, call mpv with ``--list-options``
+    to see it.
+
 ``--mc=<seconds/frame>``
     Maximum A-V sync correction per frame (in seconds)
 
@@ -3187,6 +3288,9 @@ Miscellaneous
     interrupted. Note that, due to cache latencies, captured data may begin and
     end somewhat delayed compared to what you see displayed.
 
+    The destination file is always appended. (Before mpv 0.8.0, the file was
+    overwritten.)
+
 ``--stream-dump=<filename>``
     Same as ``--stream-capture``, but do not start playback. Instead, the entire
     file is dumped.

DOCS/man/osc.rst

@@ -127,7 +127,7 @@ Key Bindings
 
 These key bindings are active by default if nothing else is already bound to
 these keys. In case of collision, the function needs to be bound to a
-different key. See `Script Commands`_ section.
+different key. See the `Script Commands`_ section.
 
 =============   ================================================
 del             Hide the OSC permanently until mpv is restarted.
@@ -138,7 +138,7 @@ Configuration
 
 The OSC offers limited configuration through a config file
 ``lua-settings/osc.conf`` placed in mpv's user dir and through the
-``--lua-opts`` command-line option. Options provided through the command-line
+``--script-opts`` command-line option. Options provided through the command-line
 will override those from the config file.
 
 Config Syntax
@@ -161,7 +161,7 @@ To avoid collisions with other scripts, all options need to be prefixed with
 
 Example::
 
-    --lua-opts=osc-optionA=value1,osc-optionB=value2
+    --script-opts=osc-optionA=value1,osc-optionB=value2
 
 
 Configurable Options
@@ -225,9 +225,10 @@ Configurable Options
     | Minimum amount of pixels the mouse has to move between ticks to make
       the OSC show up
 
-``seektooltip``
-    | Default: yes
-    | Display a tooltip over the seekbar indicating time at mouse position.
+``layout``
+    | Default: box
+    | The layout for the OSC. Currently available are: box, slimbox,
+      bottombar and topbar.
 
 ``seekbarstyle``
     | Default: slider
@@ -245,6 +246,10 @@ in ``input.conf``, or sent by other scripts.
 ``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.
+
 
 Example
 

DOCS/man/vf.rst

@@ -143,8 +143,8 @@ Available filters are:
         Accurate rounding for the vertical scaler, which may be faster or
         slower than the default rounding.
 
-        :0: Disable accurate rounding (default).
-        :1: Enable accurate rounding.
+        :no:  Disable accurate rounding (default).
+        :yes: Enable accurate rounding.
 
 ``dsize[=w:h:aspect-method:r:aspect]``
     Changes the intended display size/aspect at an arbitrary point in the
@@ -231,156 +231,6 @@ Available filters are:
     ``<fmt>``
         Format name, e.g. rgb15, bgr24, 420p, etc. (default: 420p).
 
-``pp=[filter string]``
-    Enables the specified chain of post-processing subfilters. Subfilters must
-    be separated by '/' and can be disabled by prepending a '-'. Each
-    subfilter and some options have a short and a long name that can be used
-    interchangeably, i.e. ``dr``/``dering`` are the same.
-
-    .. note::
-
-        Unlike in MPlayer or in earlier versions, you must quote the pp string
-        if it contains ``:`` characters, e.g. ``'--vf=pp=[...]'``.
-
-    .. admonition:: Warning
-
-        This filter is most likely useless on modern HD video. It might be
-        helpful with old low-resolution files.
-
-    All subfilters share common options to determine their scope:
-
-    ``a/autoq``
-        Automatically switch the subfilter off if the CPU is too slow.
-    ``c/chrom``
-        Do chrominance filtering, too (default).
-    ``y/nochrom``
-        Do luminance filtering only (no chrominance).
-    ``n/noluma``
-        Do chrominance filtering only (no luminance).
-
-    .. note::
-
-        ``--vf=pp:help`` shows a list of available subfilters.
-
-    Available subfilters are:
-
-    ``hb/hdeblock[:difference[:flatness]]``
-        horizontal deblocking filter
-
-        :<difference>: Difference factor where higher values mean more
-                       deblocking (default: 32).
-        :<flatness>:   Flatness threshold where lower values mean more
-                       deblocking (default: 39).
-
-    ``vb/vdeblock[:difference[:flatness]]``
-        vertical deblocking filter
-
-        :<difference>: Difference factor where higher values mean more
-                       deblocking (default: 32).
-        :<flatness>:   Flatness threshold where lower values mean more
-                       deblocking (default: 39).
-
-    ``ha/hadeblock[:difference[:flatness]]``
-        accurate horizontal deblocking filter
-
-        :<difference>: Difference factor where higher values mean more
-                       deblocking (default: 32).
-        :<flatness>:   Flatness threshold where lower values mean more
-                       deblocking (default: 39).
-
-    ``va/vadeblock[:difference[:flatness]]``
-        accurate vertical deblocking filter
-
-        :<difference>: Difference factor where higher values mean more
-                       deblocking (default: 32).
-        :<flatness>:   Flatness threshold where lower values mean more
-                       deblocking (default: 39).
-
-    The horizontal and vertical deblocking filters share the difference and
-    flatness values so you cannot set different horizontal and vertical
-    thresholds.
-
-    ``h1/x1hdeblock``
-        experimental horizontal deblocking filter
-
-    ``v1/x1vdeblock``
-        experimental vertical deblocking filter
-
-    ``dr/dering``
-        deringing filter
-
-    ``tn/tmpnoise[:threshold1[:threshold2[:threshold3]]]``
-        temporal noise reducer
-
-        :<threshold1>: larger -> stronger filtering
-        :<threshold2>: larger -> stronger filtering
-        :<threshold3>: larger -> stronger filtering
-
-    ``al/autolevels[:f/fullyrange]``
-        automatic brightness / contrast correction
-
-        :f/fullyrange: Stretch luminance to (0-255).
-
-    ``lb/linblenddeint``
-        Linear blend deinterlacing filter that deinterlaces the given block by
-        filtering all lines with a (1 2 1) filter.
-
-    ``li/linipoldeint``
-        Linear interpolating deinterlacing filter that deinterlaces the given
-        block by linearly interpolating every second line.
-
-    ``ci/cubicipoldeint``
-        Cubic interpolating deinterlacing filter deinterlaces the given block
-        by cubically interpolating every second line.
-
-    ``md/mediandeint``
-        Median deinterlacing filter that deinterlaces the given block by
-        applying a median filter to every second line.
-
-    ``fd/ffmpegdeint``
-        FFmpeg deinterlacing filter that deinterlaces the given block by
-        filtering every second line with a (-1 4 2 4 -1) filter.
-
-    ``l5/lowpass5``
-        Vertically applied FIR low-pass deinterlacing filter that deinterlaces
-        the given block by filtering all lines with a (-1 2 6 2 -1) filter.
-
-    ``fq/forceQuant[:quantizer]``
-        Overrides the quantizer table from the input with the constant
-        quantizer you specify.
-
-        :<quantizer>: quantizer to use
-
-    ``de/default``
-        default pp filter combination (hb:a,vb:a,dr:a)
-
-    ``fa/fast``
-        fast pp filter combination (h1:a,v1:a,dr:a)
-
-    ``ac``
-        high quality pp filter combination (ha:a:128:7,va:a,dr:a)
-
-    .. note::
-
-        This filter is only available if FFmpeg/Libav has been compiled
-        with libpostproc enabled.
-
-    .. admonition:: Examples
-
-        ``--vf=pp=hb/vb/dr/al``
-            horizontal and vertical deblocking, deringing and automatic
-            brightness/contrast
-
-        ``--vf=pp=de/-al``
-            default filters without brightness/contrast correction
-
-        ``--vf=pp=[default/tmpnoise:1:2:3]``
-            Enable default filters & temporal denoiser.
-
-        ``--vf=pp=[hb:y/vb:a]``
-            Horizontal deblocking on luminance only, and switch vertical
-            deblocking on or off automatically depending on available CPU time.
-
 ``lavfi=graph[:sws-flags[:o=opts]]``
     Filter video using FFmpeg's libavfilter.
 
@@ -451,10 +301,6 @@ Available filters are:
     ``uniform``
         uniform noise (Gaussian otherwise)
 
-    ``hq``
-        high quality (slightly better looking, slightly slower) - not available
-        when using libavfilter
-
 ``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.).
@@ -495,19 +341,6 @@ 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).
 
-``ilpack[=mode]``
-    When interlaced video is stored in YUV 4:2:0 formats, chroma interlacing
-    does not line up properly due to vertical downsampling of the chroma
-    channels. This filter packs the planar 4:2:0 data into YUY2 (4:2:2) format
-    with the chroma lines in their proper locations, so that in any given
-    scanline, the luma and chroma data both come from the same field.
-
-    ``<mode>``
-        Select the sampling mode.
-
-        :0: nearest-neighbor sampling, fast but incorrect
-        :1: linear interpolation (default)
-
 ``unsharp[=lx:ly:la:cx:cy:ca]``
     unsharp mask / Gaussian blur
 
@@ -525,9 +358,6 @@ Available filters are:
         :<0: blur
         :>0: sharpen
 
-``swapuv``
-    Swap U & V plane.
-
 ``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
@@ -559,120 +389,6 @@ 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.
 
-``divtc[=options]``
-    Inverse telecine for deinterlaced video. If 3:2-pulldown telecined video
-    has lost one of the fields or is deinterlaced using a method that keeps
-    one field and interpolates the other, the result is a juddering video that
-    has every fourth frame duplicated. This filter is intended to find and
-    drop those duplicates and restore the original film framerate. Two
-    different modes are available: One-pass mode is the default and is
-    straightforward to use, but has the disadvantage that any changes in the
-    telecine phase (lost frames or bad edits) cause momentary judder until the
-    filter can resync again. Two-pass mode avoids this by analyzing the entire
-    video beforehand so it will have forward knowledge about the phase changes
-    and can resync at the exact spot. These passes do *not* correspond to pass
-    one and two of the encoding process. You must run an extra pass using
-    ``divtc`` pass one before the actual encoding throwing the resulting video
-    away. Then use ``divtc`` pass two for the actual encoding. If you use
-    multiple encoder passes, use ``divtc`` pass two for all of them.
-
-    The options are:
-
-    ``pass=1|2``
-        Use two pass mode.
-
-    ``file=<filename>``
-        Set the two pass log filename (default: ``framediff.log``).
-
-    ``threshold=<value>``
-        Set the minimum strength the telecine pattern must have for the filter
-        to believe in it (default: 0.5). This is used to avoid recognizing
-        false pattern from the parts of the video that are very dark or very
-        still.
-
-    ``window=<numframes>``
-        Set the number of past frames to look at when searching for pattern
-        (default: 30). Longer window improves the reliability of the pattern
-        search, but shorter window improves the reaction time to the changes
-        in the telecine phase. This only affects the one-pass mode. The
-        two-pass mode currently uses fixed window that extends to both future
-        and past.
-
-    ``phase=0|1|2|3|4``
-        Sets the initial telecine phase for one pass mode (default: 0). The
-        two-pass mode can see the future, so it is able to use the correct
-        phase from the beginning, but one-pass mode can only guess. It catches
-        the correct phase when it finds it, but this option can be used to fix
-        the possible juddering at the beginning. The first pass of the two
-        pass mode also uses this, so if you save the output from the first
-        pass, you get constant phase result.
-
-    ``deghost=<value>``
-        Set the deghosting threshold (0-255 for one-pass mode, -255-255 for
-        two-pass mode, default 0). If nonzero, deghosting mode is used. This
-        is for video that has been deinterlaced by blending the fields
-        together instead of dropping one of the fields. Deghosting amplifies
-        any compression artifacts in the blended frames, so the parameter
-        value is used as a threshold to exclude those pixels from deghosting
-        that differ from the previous frame less than specified value. If two
-        pass mode is used, then negative value can be used to make the filter
-        analyze the whole video in the beginning of pass-2 to determine
-        whether it needs deghosting or not and then select either zero or the
-        absolute value of the parameter. Specify this option for pass 2, it
-        makes no difference on pass 1.
-
-``phase[=t|b|p|a|u|T|B|A|U][:v]``
-    Delay interlaced video by one field time so that the field order changes.
-    The intended use is to fix PAL videos that have been captured with the
-    opposite field order to the film-to-video transfer. The options are:
-
-    ``t``
-        Capture field order top-first, transfer bottom-first. Filter will
-        delay the bottom field.
-
-    ``b``
-        Capture bottom-first, transfer top-first. Filter will delay the top
-        field.
-
-    ``p``
-        Capture and transfer with the same field order. This mode only exists
-        for the documentation of the other options to refer to, but if you
-        actually select it, the filter will faithfully do nothing ;-)
-
-    ``a``
-        Capture field order determined automatically by field flags, transfer
-        opposite. Filter selects among ``t`` and ``b`` modes on a frame by frame
-        basis using field flags. If no field information is available, then this
-        works just like ``u``.
-
-    ``u``
-        Capture unknown or varying, transfer opposite. Filter selects among
-        ``t`` and ``b`` on a frame by frame basis by analyzing the images and
-        selecting the alternative that produces best match between the fields.
-
-    ``T``
-        Capture top-first, transfer unknown or varying. Filter selects among
-        ``t`` and ``p`` using image analysis.
-
-    ``B``
-        Capture bottom-first, transfer unknown or varying. Filter selects
-        among ``b`` and ``p`` using image analysis.
-
-    ``A``
-        Capture determined by field flags, transfer unknown or varying. Filter
-        selects among ``t``, ``b`` and ``p`` using field flags and image
-        analysis. If no field information is available, then this works just
-        like ``U``. This is the default mode.
-
-    ``U``
-        Both capture and transfer unknown or varying. Filter selects among
-        ``t``, ``b`` and ``p`` using image analysis only.
-
-    ``v``
-        Verbose operation. Prints the selected mode for each frame and the
-        average squared difference between fields for ``t``, ``b``, and ``p``
-        alternatives. (Ignored when libavfilter is used.)
-
 ``yadif=[mode[:enabled=yes|no]]``
     Yet another deinterlacing filter
 
@@ -903,13 +619,39 @@ Available filters are:
         filters work anyway.)
 
     ``concurrent-frames``
-        Number of frames that should be requested in parallel (default: 2). The
+        Number of frames that should be requested in parallel. The
         level of concurrency depends on the filter and how quickly mpv can
         decode video to feed the filter. This value should probably be
         proportional to the number of cores on your machine. Most time,
         making it higher than the number of cores can actually make it
         slower.
 
+        By default, this uses the special value ``auto``, which sets the option
+        to the number of detected logical CPU cores.
+
+    The following variables are defined by mpv:
+
+    ``video_in``
+        The mpv video source as vapoursynth clip. Note that this has no length
+        set, which confuses many filters. Using ``Trim`` on the clip with a
+        high dummy length can turn it into a finite clip.
+
+    ``video_in_dw``, ``video_in_dh``
+        Display size of the video. Can be different from video size if the
+        video does not use square pixels (e.g. DVD).
+
+    ``container_fps``
+        FPS value as reported by file headers. This value can be wrong or
+        completely broken (e.g. 0 or NaN). Even if the value is correct,
+        if another filter changes the real FPS (by dropping or inserting
+        frames), the value of this variable might not be useful. Note that
+        the ``--fps`` command line option overrides this value.
+
+        Useful for some filters which insist on having a FPS.
+
+    ``display_fps``
+        Refresh rate of the current display. Note that this value can be 0.
+
 ``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
@@ -950,6 +692,10 @@ Available filters are:
             Show only first field (going by ``--field-dominance``).
         bob
             bob deinterlacing (default).
+        weave, motion-adaptive, motion-compensated
+            Advanced deinterlacing algorithms. Whether these actually work
+            depends on the GPU hardware, the GPU drivers, driver bugs, and
+            mpv bugs.
 
 ``vdpaupp``
     VDPAU video post processing. Works with ``--vo=vdpau`` and ``--vo=opengl``

DOCS/man/vo.rst

@@ -278,109 +278,88 @@ Available video output drivers are:
     ``opengl-hq`` to use this driver with defaults set to high quality
     rendering.
 
-    Requires at least OpenGL 2.1 and the ``GL_ARB_texture_rg`` extension. For
-    older drivers, ``opengl-old`` may work.
+    Requires at least OpenGL 2.1.
 
     Some features are available with OpenGL 3 capable graphics drivers only
     (or if the necessary extensions are available).
 
+    OpenGL ES 2.0 and 3.0 are supported as well.
+
     Hardware decoding over OpenGL-interop is supported to some degree. Note
     that in this mode, some corner case might not be gracefully handled, and
     color space conversion and chroma upsampling is generally in the hand of
     the hardware decoder APIs.
 
-    ``lscale=<filter>``
+    ``scale=<filter>``
 
         ``bilinear``
-            Bilinear hardware texture filtering (fastest, mid-quality).
-            This is the default.
-
-        ``lanczos2``
-            Lanczos scaling with radius=2. Provides good quality and speed.
-
-        ``lanczos3``
-            Lanczos with radius=3.
-
-        ``lanczos``
-            Generic Lanczos scaling filter. Set radius with ``lradius``.
+            Bilinear hardware texture filtering (fastest, very low quality).
+            This is the default for compatibility reasons.
 
         ``spline36``
-            This is the default when using ``opengl-hq``.
+            Mid quality and speed. This is the default when using ``opengl-hq``.
 
-        ``bicubic_fast``
-            Bicubic filter. Has a blurring effect on the image, even if no
-            scaling is done.
+        ``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.
 
-        ``sharpen3``
-            Unsharp masking (sharpening) with radius=3 and a default strength
-            of 0.5 (see ``lparam1``).
+            This filter corresponds to the old ``lanczos3`` alias if the default
+            radius is used, while ``lanczos2`` corresponds to a radius of 2.
 
-        ``sharpen5``
-            Unsharp masking (sharpening) with radius=5 and a default strength
-            of 0.5 (see ``lparam1``).
+        ``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
-            ``lparam1`` and ``lparam2``. Both are set to 1/3 by default.
+            ``scale-param1`` and ``scale-param2``. Both are set to 1/3 by default.
+            This filter is very good at downscaling (see ``scale-down``).
 
-        ``gaussian``
-            Gaussian filter with a parameter ``p`` for sharpness control.
-            ``p`` can be set to float number between 1(blurry) and 100(sharp)
-            and has a default value of about 28.8 (see ``lparam1``).
+        There are some more filters, but most are not as useful. For a complete
+        list, pass ``help`` as value, e.g.::
 
-            Note that for extremely small value of ``p``, a large filter radius
-            might be required to avoid unintended artifacts (see ``lradius``).
+            mpv --vo=opengl:scale=help
 
-
-        There are some more filters. For a complete list, pass ``help`` as
-        value, e.g.::
-
-            mpv --vo=opengl:lscale=help
-
-    ``lparam1=<value>``
+    ``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.
 
-    ``lparam2=<value>``
-        See ``lparam1``.
+    ``scale-param2=<value>``
+        See ``scale-param1``.
 
-    ``lradius=<r>``
+    ``scale-radius=<r>``
         Set radius for filters listed below, must be a float number between 1.0
-        and 8.0. Defaults to be 2.0 if not specified.
+        and 16.0. Defaults to be 3.0 if not specified.
 
-            ``sinc``, ``lanczos``, ``blackman``, ``gaussian``
+            ``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 ``lscale``. Bilinear
+        ``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``, although the different
-        processing chain might do chroma scaling differently if ``lscale`` is
-        disabled.
-
-    ``stereo=<value>``
-        Select a method for stereo display. You may have to use
-        ``--video-aspect`` to fix the aspect value. Experimental, do not expect
-        too much from it.
-
-        no
-            Normal 2D display
-        red-cyan
-            Convert side by side input to full-color red-cyan stereo.
-        green-magenta
-            Convert side by side input to full-color green-magenta stereo.
-        quadbuffer
-            Convert side by side input to quad buffered stereo. Only supported
-            by very few OpenGL cards.
+        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 light scaling. It also forces
-        the options ``indirect`` and ``gamma``.
+        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
@@ -423,7 +402,8 @@ Available video output drivers are:
         Used in ``dither=fruit`` mode only.
 
     ``dither=<fruit|ordered|no>``
-        Select dithering algorithm (default: fruit).
+        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
@@ -441,34 +421,48 @@ Available video output drivers are:
         Interval in displayed frames between two buffer swaps.
         1 is equivalent to enable VSYNC, 0 to disable VSYNC.
 
-    ``no-scale-sep``
-        When using a separable scale filter for luma, usually two filter
-        passes are done. This is often faster. However, it forces
-        conversion to RGB in an extra pass, so it can actually be slower
-        if used with fast filters on small screen resolutions. Using
-        this options will make rendering a single operation.
-        Note that chroma scalers are always done as 1-pass filters.
-
     ``cscale=<filter>``
-        As ``lscale``, but for chroma (2x slower with little visible effect).
-        Note that with some scaling filters, upscaling is always done in
-        RGB. If chroma is not subsampled, this option is ignored, and the
-        luma scaler is used instead. Setting this option is often useless.
+        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.
 
-    ``lscale-down=<filter>``, ``cscale-down=<filter>``
-        Like ``lscale`` and ``cscale``, but apply these filters on downscaling
-        instead. If these options are unset, the filter implied by ``lscale``
-        (and ``cscale``, respectively) will be applied.
+    ``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.
 
-    ``cparam1``, ``cparam2``, ``cradius``
+    ``cscale-param1``, ``cscale-param2``, ``cscale-radius``, ``cscale-antiring``
         Set filter parameters and radius for ``cscale``.
 
-        See ``lparam1``, ``lparam2`` and ``lradius``.
+        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.
@@ -476,14 +470,15 @@ Available video output drivers are:
     ``glfinish``
         Call ``glFinish()`` before and after swapping buffers (default: disabled).
         Slower, but might help getting better results when doing framedropping.
-        The details depend entirely on the OpenGL driver.
+        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 only.
+        X11/GLX only.
 
     ``sw``
         Continue even if a software renderer is detected.
@@ -499,19 +494,12 @@ Available video output drivers are:
             Cocoa/OS X
         win
             Win32/WGL
-        x11
-            X11/GLX
+        x11, x11es
+            X11/GLX (the ``es`` variant forces GLES)
         wayland
             Wayland/EGL
-
-    ``indirect``
-        Do YUV conversion and scaling as separate passes. This will first render
-        the video into a video-sized RGB texture, and draw the result on screen.
-        The luma scaler is used to scale the RGB image when rendering to screen.
-        The chroma scaler is used only on YUV conversion, and only if the video
-        is chroma-subsampled (usually the case).
-        This mechanism is disabled on RGB input.
-        Specifying this option directly is generally useful for debugging only.
+        x11egl, x11egles
+            X11/EGL (the ``es`` variant forces GLES)
 
     ``fbo-format=<fmt>``
         Selects the internal format of textures used for FBOs. The format can
@@ -519,28 +507,34 @@ Available video output drivers are:
         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: rgb.
+        Default: rgba.
 
-    ``gamma=<0.0..10.0>``
-        Set a gamma value. 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.
+    ``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.
 
-        Setting this value to 1.0 can be used to always enable gamma control.
-        (Disables delayed enabling.)
+        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
-        light scaling.
+        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 with Cocoa.
+        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.
@@ -562,16 +556,6 @@ Available video output drivers are:
         3
             absolute colorimetric
 
-    ``approx-gamma``
-        Approximate the actual gamma function as a pure power curve of
-        1.95. A number of video editing programs and studios apparently use this
-        for mastering instead of the true curve. Most notably, anything in the
-        Apple ecosystem uses this approximation - including all programs
-        compatible with it. It's a sound idea to try enabling this flag first
-        when watching videos and shows to see if things look better that way.
-
-        This only affects the output when using either ``icc-profile`` or ``srgb``.
-
     ``3dlut-size=<r>x<g>x<b>``
         Size of the 3D LUT generated from the ICC profile in each dimension.
         Default is 128x256x64.
@@ -587,8 +571,8 @@ Available video output drivers are:
             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 when using FBO indirections (such as with ``opengl-hq``), an FBO
-            format with alpha must be specified with the ``fbo-format`` option.
+            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.
 
@@ -601,12 +585,58 @@ Available video output drivers are:
         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:lscale=spline36:dither-depth=auto:fbo-format=rgba16
+        --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.
@@ -618,188 +648,6 @@ Available video output drivers are:
     float texture support, and some OS X setups being very slow with ``rgb16``
     but fast with ``rgb32f``.
 
-``opengl-old``
-    OpenGL video output driver, old version. Video size must be smaller
-    than the maximum texture size of your OpenGL implementation. Intended to
-    work even with the most basic OpenGL implementations, but also makes use
-    of newer extensions which allow support for more color spaces.
-
-    The code performs very few checks, so if a feature does not work, this
-    might be because it is not supported by your card and/or OpenGL
-    implementation, even if you do not get any error message. Use ``glxinfo``
-    or a similar tool to display the supported OpenGL extensions.
-
-    .. note:: This driver is for compatibility with old systems.
-
-    ``(no-)ati-hack``
-        ATI drivers may give a corrupted image when PBOs are used (when using
-        ``force-pbo``). This option fixes this, at the expense of using a bit
-        more memory.
-    ``(no-)force-pbo``
-        Always uses PBOs to transfer textures even if this involves an extra
-        copy. Currently this gives a little extra speed with NVIDIA drivers
-        and a lot more speed with ATI drivers. May need the ``ati-hack``
-        suboption to work correctly.
-    ``(no-)scaled-osd``
-        Scales the OSD and subtitles instead of rendering them at display size
-        (default: disabled).
-    ``rectangle=<0,1,2>``
-        Select usage of rectangular textures, which saves video RAM, but often
-        is slower (default: 0).
-
-        0
-            Use power-of-two textures (default).
-        1
-            Use the ``GL_ARB_texture_rectangle`` extension.
-        2
-            Use the ``GL_ARB_texture_non_power_of_two`` extension. In some
-            cases only supported in software and thus very slow.
-
-    ``swapinterval=<n>``
-        Minimum interval between two buffer swaps, counted in displayed frames
-        (default: 1). 1 is equivalent to enabling VSYNC, 0 to disabling VSYNC.
-        Values below 0 will leave it at the system default. This limits the
-        framerate to (horizontal refresh rate / n). Requires
-        ``GLX_SGI_swap_control`` support to work. With some (most/all?)
-        implementations this only works in fullscreen mode.
-    ``ycbcr``
-        Use the ``GL_MESA_ycbcr_texture`` extension to convert YUV to RGB. In
-        most cases this is probably slower than doing software conversion to
-        RGB.
-    ``yuv=<n>``
-        Select the type of YUV to RGB conversion. The default is
-        auto-detection deciding between values 0 and 2.
-
-        0
-            Use software conversion. Compatible with all OpenGL versions.
-            Provides brightness, contrast and saturation control.
-        1
-            Same as 2. This used to use NVIDIA-specific extensions, which
-            did not provide any advantages over using fragment programs, except
-            possibly on very ancient graphics cards. It produced a gray-ish
-            output, which is why it has been removed.
-        2
-            Use a fragment program. Needs the ``GL_ARB_fragment_program``
-            extension and at least three texture units. Provides brightness,
-            contrast, saturation and hue control.
-        3
-            Use a fragment program using the ``POW`` instruction. Needs the
-            ``GL_ARB_fragment_program`` extension and at least three texture
-            units. Provides brightness, contrast, saturation, hue and gamma
-            control. Gamma can also be set independently for red, green and
-            blue. Method 4 is usually faster.
-        4
-            Use a fragment program with additional lookup. Needs the
-            ``GL_ARB_fragment_program`` extension and at least four texture
-            units. Provides brightness, contrast, saturation, hue and gamma
-            control. Gamma can also be set independently for red, green and
-            blue.
-        5
-            Use ATI-specific method (for older cards). This uses an
-            ATI-specific extension (``GL_ATI_fragment_shader`` - not
-            ``GL_ARB_fragment_shader``!). At least three texture units are
-            needed. Provides saturation and hue control. This method is fast
-            but inexact.
-        6
-            Use a 3D texture to do conversion via lookup. Needs the
-            ``GL_ARB_fragment_program extension`` and at least four texture
-            units. Extremely slow (software emulation) on some (all?) ATI
-            cards since it uses a texture with border pixels. Provides
-            brightness, contrast, saturation, hue and gamma control. Gamma can
-            also be set independently for red, green and blue. Speed depends
-            more on GPU memory bandwidth than other methods.
-
-    ``lscale=<n>``
-        Select the scaling function to use for luminance scaling. Only valid
-        for yuv modes 2, 3, 4 and 6.
-
-        0
-            Use simple linear filtering (default).
-        1
-            Use bicubic B-spline filtering (better quality). Needs one
-            additional texture unit. Older cards will not be able to handle
-            this for chroma at least in fullscreen mode.
-        2
-            Use cubic filtering in horizontal, linear filtering in vertical
-            direction. Works on a few more cards than method 1.
-        3
-            Same as 1 but does not use a lookup texture. Might be faster on
-            some cards.
-        4
-            Use experimental unsharp masking with 3x3 support and a default
-            strength of 0.5 (see ``filter-strength``).
-        5
-            Use experimental unsharp masking with 5x5 support and a default
-            strength of 0.5 (see ``filter-strength``).
-
-    ``cscale=<n>``
-        Select the scaling function to use for chrominance scaling. For
-        details see ``lscale``.
-    ``filter-strength=<value>``
-        Set the effect strength for the ``lscale``/``cscale`` filters that
-        support it.
-    ``stereo=<value>``
-        Select a method for stereo display. You may have to use
-        ``--video-aspect`` to fix the aspect value. Experimental, do not expect
-        too much from it.
-
-        0
-            Normal 2D display
-        1
-            Convert side by side input to full-color red-cyan stereo.
-        2
-            Convert side by side input to full-color green-magenta stereo.
-        3
-            Convert side by side input to quad buffered stereo. Only supported
-            by very few OpenGL cards.
-
-    The following options are only useful if writing your own fragment programs.
-
-    ``customprog=<filename>``
-        Load a custom fragment program from ``<filename>``.
-    ``customtex=<filename>``
-        Load a custom "gamma ramp" texture from ``<filename>``. This can be used
-        in combination with ``yuv=4`` or with the ``customprog`` option.
-    ``(no-)customtlin``
-        If enabled (default) use ``GL_LINEAR`` interpolation, otherwise use
-        ``GL_NEAREST`` for customtex texture.
-    ``(no-)customtrect``
-        If enabled, use ``texture_rectangle`` for the ``customtex`` texture.
-        Default is disabled.
-    ``(no-)mipmapgen``
-        If enabled, mipmaps for the video are automatically generated. This
-        should be useful together with the ``customprog`` and the ``TXB``
-        instruction to implement blur filters with a large radius. For most
-        OpenGL implementations, this is very slow for any non-RGB formats.
-        Default is disabled.
-
-    Normally there is no reason to use the following options; they mostly
-    exist for testing purposes.
-
-    ``(no-)glfinish``
-        Call ``glFinish()`` before swapping buffers. Slower but in some cases
-        more correct output (default: disabled).
-    ``(no-)manyfmts``
-        Enables support for more (RGB and BGR) color formats (default: enabled).
-        Needs OpenGL version >= 1.2.
-    ``slice-height=<0-...>``
-        Number of lines copied to texture in one piece (default: 0). 0 for
-        whole image.
-    ``sw``
-        Continue even if a software renderer is detected.
-
-    ``backend=<sys>``
-        auto
-            auto-select (default)
-        cocoa
-            Cocoa/OS X
-        win
-            Win32/WGL
-        x11
-            X11/GLX
-        wayland
-            Wayland/EGL
-
 ``sdl``
     SDL 2.0+ Render video output driver, depending on system with or without
     hardware acceleration. Should work on all platforms supported by SDL 2.0.
@@ -924,3 +772,30 @@ Available video output drivers are:
         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.
+
+    With default options, ``opengl-cb`` renders only the latest frame and drops
+    all frames handed over while waiting render function after update callback.
+
+    ``frame-queue-size=<1..100>``
+        The maximum count of frames which the frame queue can hold (default: 1)
+
+    ``frame-drop-mode=<pop|clear>``
+        Select the behavior when the frame queue is full.
+
+        pop
+            Drop the oldest frame in the frame queue. (default)
+        clear
+            Drop all frames in the frame queue.
+
+    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

@@ -0,0 +1,443 @@
+CHANGES FROM OTHER VERSIONS OF MPLAYER
+======================================
+
+**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.
+
+.. note::
+    These lists are incomplete.
+
+General Changes from MPlayer to mpv
+-----------------------------------
+
+This listing is about changes introduced by mplayer2 and mpv relatively to
+MPlayer.
+
+Player
+~~~~~~
+
+* New name for the binary (``mpv``). New location for config files (either
+  ``~/.config/mpv/mpv.conf``, or if you want, ``~/.mpv/config``).
+* Encoding functionality (replacement for MEncoder, see the `ENCODING`_ section).
+* Support for Lua scripting (see the `LUA SCRIPTING`_ section).
+* Better pause handling (e.g. do not unpause on a command).
+* Precise seeking support.
+* Improvements in audio/video sync handling.
+* Do not lose settings when playing a new file in the same player instance.
+* 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.
+* ``--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
+  (see ``libmpv/client.h`` in the sources).
+
+Input
+~~~~~
+
+* Improved default keybindings. MPlayer bindings are also available (see
+  ``etc/mplayer-input.conf`` in the source tree).
+* Improved responsiveness on user input.
+* Support for modifier keys (alt, shift, ctrl) in input.conf.
+* 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.
+
+Audio
+~~~~~
+
+* Support for gapless audio (see the ``--gapless-audio`` option).
+* Support for OSS4 volume control.
+* Improved support for PulseAudio.
+* Make ``--softvol`` default (**mpv** is not a mixer control panel).
+* By default, do pitch correction if playback speed is increased.
+* Improved downmixing and output of surround audio:
+
+  - Instead of using hardcoded pan filters to do remixing, libavresample is used
+  - Channel maps are used to identify the channel layout, so e.g. ``3.0`` and
+    ``2.1`` audio can be distinguished.
+
+Video
+~~~~~
+
+* Wayland support.
+* Native support for VAAPI and VDA. Improved VDPAU video output.
+* Improved OpenGL output (see the ``opengl-hq`` video output).
+* Make hardware decoding work with the ``opengl`` video output.
+* Support for libavfilter (for video->video and audio->audio). This allows
+  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) 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.
+* Better subtitle rendering using libass by default.
+* Improvements when playing multiple files (``-fixed-vo`` is default, do not
+  reset settings by default when playing a new file).
+* Replace image video outputs (``--vo=jpeg`` etc.) with ``--vo=image``.
+* Removal of ``--vo=gif89a``, ``--vo=md5sum``, ``--vo=yuv4mpeg``, as encoding
+  can handle these use cases. For yuv4mpeg, for example, use::
+
+    mpv input.mkv -o output.y4m --no-audio --oautofps --oneverdrop
+
+* Image subtitles (DVDs etc.) are rendered in color and use more correct
+  positioning (color for image subs can be disabled with ``--sub-gray``).
+
+OSD and terminal
+~~~~~~~~~~~~~~~~
+
+* Cleaned up terminal output: nicer status line, less useless noise.
+* Improved OSD rendering using libass, with full Unicode support.
+* New OSD bar with chapter marks. Not positioned in the middle of the video
+  (this can be customized with the ``--osd-bar-align-y`` option).
+* Display list of chapters and audio/subtitle tracks on OSD (see the
+  `Properties`_ section).
+
+Screenshots
+~~~~~~~~~~~
+
+* Instant screenshots without 1-frame delay.
+* Support for taking screenshots even with hardware decoding.
+* Support for saving screenshots as JPEG or PNG.
+* Support for configurable file names.
+* Support for taking screenshots with or without subtitles.
+
+Note that the ``screenshot`` video filter is not needed anymore, and should not
+be put into the mpv config file.
+
+Miscellaneous
+~~~~~~~~~~~~~
+
+* Better MKV support (e.g. ordered chapters, 3D metadata).
+* Matroska edition switching at runtime.
+* Support for playing URLs of popular streaming sites directly.
+  (e.g. ``mpv https://www.youtube.com/watch?v=...``).
+  Requires a recent version of ``youtube-dl`` to be installed. Can be
+  disabled with ``ytdl=no`` in the mpv config file.
+* Support for precise scrolling which scales the parameter of commands. If the
+  input doesn't support precise scrolling the scale factor stays 1.
+* Allow changing/adjusting video filters at runtime. (This is also used to make
+  the ``D`` key insert vf_yadif if deinterlacing is not supported otherwise).
+* Improved support for .cue files.
+
+Mac OS X
+~~~~~~~~
+
+* Native OpenGL backend.
+* Cocoa event loop is independent from MPlayer's event loop, so user
+  actions like accessing menus and live resizing do not block the playback.
+* Apple Remote support.
+* Media Keys support.
+* VDA support using libavcodec hwaccel API instead of FFmpeg's decoder with up
+  to 2-2.5x reduction in CPU usage.
+
+Windows
+~~~~~~~
+
+* Improved support for Unicode file names.
+* Improved window handling.
+* Do not block playback when moving the window.
+* Improved Direct3D video output.
+* Added WASAPI audio output.
+
+Internal changes
+~~~~~~~~~~~~~~~~
+
+* Switch to GPLv2+ (see ``Copyright`` file for details).
+* Removal of lots of cruft:
+
+  - Internal GUI (replaced by the OSC, see the `ON SCREEN CONTROLLER`_ section).
+  - MEncoder (replaced by native encoding, see the `ENCODING`_ section).
+  - OSD menu.
+  - Kernel video drivers for Linux 2.4 (including VIDIX).
+  - Teletext support.
+  - Support for dead platforms.
+  - Most built-in demuxers have been replaced by their libavformat counterparts.
+  - Built-in network support has been replaced by libavformat's (which also
+    supports https URLs).
+  - Embedded copies of libraries (such as FFmpeg).
+
+* General code cleanups (including refactoring or rewrites of many parts).
+* New build system.
+* Many bug fixes and removal of long-standing issues.
+* Generally preferring FFmpeg/Libav over internal demuxers, decoders, and
+  filters.
+
+Detailed Listing of User-visible Changes
+----------------------------------------
+
+This listing is about changed command line switches, slave commands, and similar
+things. Completely removed features are not listed.
+
+Command Line Switches
+~~~~~~~~~~~~~~~~~~~~~
+
+* There is a new command line syntax, which is generally preferred over the old
+  syntax. ``-optname optvalue`` becomes ``--optname=optvalue``.
+
+  The old syntax will not be removed. However, the new syntax is mentioned in
+  all documentation and so on, and unlike the old syntax is not ambiguous,
+  so it is a good thing to know about this change.
+* In general, negating switches like ``-noopt`` now have to be written as
+  ``-no-opt`` or ``--no-opt``.
+* Per-file options are not the default anymore. You can explicitly specify
+  file-local options. See ``Usage`` section.
+* Many options have been renamed, removed or changed semantics. Some options
+  that are required for a good playback experience with MPlayer are now
+  superfluous or even worse than the defaults, so make sure to read the manual
+  before trying to use your existing configuration with **mpv**.
+* Table of renamed/replaced switches:
+
+    =========================== ========================================
+    Old                         New
+    =========================== ========================================
+    ``-no<opt>``                ``--no-<opt>`` (add a dash)
+    ``-a52drc level``           ``--ad-lavc-ac3drc=level``
+    ``-ac spdifac3``            ``--ad=spdif:ac3`` (see ``--ad=help``)
+    ``-af volnorm``             ``--af=drc`` (renamed)
+    ``-afm hwac3``              ``--ad=spdif:ac3,spdif:dts``
+    ``-ao alsa:device=hw=0.3``  ``--ao=alsa:device=[hw:0,3]``
+    ``-aspect``                 ``--video-aspect``
+    ``-ass-bottom-margin``      ``--vf=sub=bottom:top``
+    ``-ass``                    ``--sub-ass``
+    ``-audiofile-cache``        (removed; the main cache settings are used)
+    ``-audiofile``              ``--audio-file``
+    ``-benchmark``              ``--untimed`` (no stats)
+    ``-capture``                ``--stream-capture=<filename>``
+    ``-channels``               ``--audio-channels`` (changed semantics)
+    ``-cursor-autohide-delay``  ``--cursor-autohide``
+    ``-delay``                  ``--audio-delay``
+    ``-dumpstream``             ``--stream-dump=<filename>``
+    ``-dvdangle``               ``--dvd-angle``
+    ``-endpos``                 ``--length``
+    ``-fixed-vo``               (removed; always the default)
+    ``-font``                   ``--osd-font``
+    ``-forcedsubsonly``         ``--sub-forced-only``
+    ``-forceidx``               ``--index``
+    ``-format``                 ``--audio-format``
+    ``-fsmode-dontuse``         (removed)
+    ``-fstype``                 ``--x11-netwm`` (changed semantics)
+    ``-hardframedrop``          ``--framedrop=hard``
+    ``-identify``               (removed; use TOOLS/mpv_identify.sh)
+    ``-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``)
+    ``-mouse-movements``        ``--input-cursor``
+    ``-msgcolor``               ``--msg-color``
+    ``-msglevel``               ``--msg-level`` (changed semantics)
+    ``-msgmodule``              ``--msg-module``
+    ``-name``                   ``--x11-name``
+    ``-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``
+    ``-playing-msg``            ``--term-playing-msg``
+    ``-pp ...``                 ``'--vf=lavfi=[pp=...]'``
+    ``-pphelp``                 (See FFmpeg libavfilter documentation.)
+    ``-rawaudio ...``           ``--demuxer-rawaudio-...``
+    ``-rawvideo ...``           ``--demuxer-rawvideo-...``
+    ``-spugauss``               ``--sub-gauss``
+    ``-srate``                  ``--audio-samplerate``
+    ``-ss``                     ``--start``
+    ``-ssf <sub>``              ``--sws-...``
+    ``-stop-xscreensaver``      ``--stop-screensaver``
+    ``-sub-fuzziness``          ``--sub-auto``
+    ``-sub``                    ``--sub-file``
+    ``-subcp``                  ``--sub-codepage``
+    ``-subdelay``               ``--sub-delay``
+    ``-subfile``                ``--sub-file``
+    ``-subfont-*``              ``--sub-text-*``, ``--osd-*``
+    ``-subfont-text-scale``     ``--sub-scale``
+    ``-subfont``                ``--sub-text-font``
+    ``-subfps``                 ``--sub-fps``
+    ``-subpos``                 ``--sub-pos``
+    ``-sws``                    ``--sws-scaler``
+    ``-tvscan``                 ``--tv-scan``
+    ``-use-filename-title``     ``--title='${filename}'``
+    ``-vc ffh264vdpau`` (etc.)  ``--hwdec=vdpau``
+    ``-vobsub``                 ``--sub-file`` (pass the .idx file)
+    ``-x W``, ``-y H``          ``--geometry=WxH`` + ``--no-keepaspect``
+    ``-xineramascreen``         ``--screen`` (different values)
+    ``-xy W``                   ``--autofit=W``
+    ``-zoom``                   Inverse available as ``--video-unscaled``
+    ``dvdnav://``               ``dvdnav://menu``
+    ``dvd://1``                 ``dvd://0`` (0-based offset)
+    =========================== ========================================
+
+.. note::
+
+    ``-opt val`` becomes ``--opt=val``.
+
+.. note::
+
+    Quite some video filters, video outputs, audio filters, audio outputs, had
+    changes in their option parsing. These aren't mentioned in the table above.
+
+    Also, some video and audio filters have been removed, and you have to use
+    libavfilter (using ``--vf=lavfi=[...]`` or ``--af=lavfi=[...]``) to get
+    them back.
+
+input.conf and Slave Commands
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* Table of renamed input commands:
+
+    This lists only commands that are not always gracefully handled by the
+    internal legacy translation layer. If an input.conf contains any legacy
+    commands, a warning will be printed when starting the player. The warnings
+    also show the replacement commands.
+
+    Properties containing ``_`` to separate words use ``-`` instead.
+
+    +--------------------------------+----------------------------------------+
+    | Old                            | New                                    |
+    +================================+========================================+
+    | ``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)``  |
+    +--------------------------------+----------------------------------------+
+    | ``switch_ratio [<ratio>]``     | ``set video-aspect <ratio>``           |
+    |                                |                                        |
+    |                                | ``set video-aspect 0`` (reset aspect)  |
+    +--------------------------------+----------------------------------------+
+    | ``step_property_osd <prop>``   | ``cycle <prop> <step>`` (wraps),       |
+    | ``<step> <dir>``               | ``add <prop> <step>`` (clamps).        |
+    |                                | ``<dir>`` parameter unsupported. Use   |
+    |                                | a negative ``<step>`` instead.         |
+    +--------------------------------+----------------------------------------+
+    | ``step_property <prop>``       | Prefix ``cycle`` or ``add`` with       |
+    | ``<step> <dir>``               | ``no-osd``: ``no-osd cycle <prop>``    |
+    |                                | ``<step>``                             |
+    +--------------------------------+----------------------------------------+
+    | ``osd_show_property_text``     | ``show_text <text>``                   |
+    | ``<text>``                     | The property expansion format string   |
+    |                                | syntax slightly changed.               |
+    +--------------------------------+----------------------------------------+
+    | ``osd_show_text``              | Now does the same as                   |
+    |                                | ``osd_show_property_text``. Use the    |
+    |                                | ``raw`` prefix to disable property     |
+    |                                | expansion.                             |
+    +--------------------------------+----------------------------------------+
+    | ``show_tracks``                | ``show_text ${track-list}``            |
+    +--------------------------------+----------------------------------------+
+    | ``show_chapters``              | ``show_text ${chapter-list}``          |
+    +--------------------------------+----------------------------------------+
+    | ``af_switch``, ``af_add``, ... | ``af set|add|...``                     |
+    +--------------------------------+----------------------------------------+
+    | ``tv_start_scan``              | ``set tv-scan yes``                    |
+    +--------------------------------+----------------------------------------+
+    | ``tv_set_channel <val>``       | ``set tv-channel <val>``               |
+    +--------------------------------+----------------------------------------+
+    | ``tv_step_channel``            | ``cycle tv-channel``                   |
+    +--------------------------------+----------------------------------------+
+    | ``dvb_set_channel <v1> <v2>``  | ``set dvb-channel <v1>-<v2>``          |
+    +--------------------------------+----------------------------------------+
+    | ``dvb_step_channel``           | ``cycle dvb-channel``                  |
+    +--------------------------------+----------------------------------------+
+    | ``tv_set_freq <val>``          | ``set tv-freq <val>``                  |
+    +--------------------------------+----------------------------------------+
+    | ``tv_step_freq``               | ``cycle tv-freq``                      |
+    +--------------------------------+----------------------------------------+
+    | ``tv_set_norm <norm>``         | ``set tv-norm <norm>``                 |
+    +--------------------------------+----------------------------------------+
+    | ``tv_step_norm``               | ``cycle tv-norm``                      |
+    +--------------------------------+----------------------------------------+
+
+    .. note::
+
+        Due to lack of hardware and users using the TV/DVB/PVR features, and
+        due to the need to cleanup the related command code, it's possible
+        that the new commands are buggy or behave worse. This can be improved
+        if testers are available. Otherwise, some of the TV code will be
+        removed at some point.
+
+Slave mode
+~~~~~~~~~~
+
+* Slave mode was removed. A proper slave mode application needed tons of code
+  and hacks to get
+  it right. The main problem is that slave mode is a bad and incomplete
+  interface, and to get around that, applications parsed output messages
+  intended for users. It is hard to know which messages exactly are parsed by
+  slave mode applications. This makes it virtually impossible to improve
+  terminal output intended for users without possibly breaking something.
+
+  This is absolutely insane, and since initial improvements to **mpv** quickly
+  made slave mode incompatible to most applications, it was removed as useless
+  cruft. The client API (see below) is provided instead.
+
+  ``--identify`` was replaced by the ``TOOLS/mpv_identify.sh`` wrapper script.
+
+* For some time (until including release 0.4.x), mpv supported a
+  ``--slave-broken`` option. The following options are equivalent:
+
+  ::
+
+        --input-file=/dev/stdin --input-terminal=no
+
+
+  Assuming the system supports ``/dev/stdin``.
+
+  (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.
+
+* **mpv** also provides a client API, which can be used to embed the player
+  by loading it as shared library. (See ``libmpv/client.h`` in the sources.)
+  It might also be possible to implement a custom slave mode-like protocol
+  using Lua scripting.
+
+Policy for Removed Features
+---------------------------
+
+**mpv** is in active development. If something is in the way of more important
+development (such as fixing bugs or implementing new features), we sometimes
+remove features. Usually this happens only with old features that either seem
+to be useless, or are not used by anyone. Often these are obscure, or
+"inherited", or were marked experimental, but never received any particular
+praise by any users.
+
+Sometimes, features are replaced by something new. The new code will be either
+simpler or more powerful, but doesn't necessarily provide everything the old
+feature did.
+
+We can not exclude that we accidentally remove features that are actually
+popular. Generally, we do not know how much a specific functionality is used.
+If you miss a feature and think it should be re-added, please open an issue
+on the mpv bug tracker. Hopefully, a solution can be found. Often, it turns
+out that re-adding something is not much of a problem, or that there are
+better alternatives.
+
+Why this Fork?
+--------------
+
+mplayer2 is practically dead, and mpv started out as a branch containing
+new/experimental development. (Some of it was merged right *after* the fork
+was made public, seemingly as an acknowledgment that development, or at
+least merging, should have been more active.)
+
+MPlayer is focused on not breaking anything, but is stuck with a horrible
+codebase resistant to cleanup. (Unless you do what mpv did - merciless and
+consequent pruning of bad, old code.) Cleanup and keeping broken things
+conflict, so the kind of development mpv strives for can't be done within
+MPlayer due to clashing development policies.
+
+Additionally, mplayer2 already had lots of changes over MPlayer, which would
+have needed to be backported to the MPlayer codebase. This would not only
+have been hard (several years of diverging development), but also would have
+been impossible due to the aforementioned MPlayer development policy.

README.md

@@ -1,14 +1,10 @@
 mpv
 ===
 
-[![Build Status](https://api.travis-ci.org/mpv-player/mpv.png)](https://travis-ci.org/mpv-player/mpv)
-
-[![Coverity Scan Build Status](https://scan.coverity.com/projects/1232/badge.svg)](https://scan.coverity.com/projects/1232)
-
 Overview
 --------
 
-**mpv** is a movie player based on MPlayer and mplayer2. It supports a wide
+**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.
 
 If you are wondering what's different from mplayer2 and MPlayer you can read
@@ -46,16 +42,25 @@ Essential dependencies (incomplete list):
 
 - gcc or clang
 - X development headers (xlib, X extensions, libvdpau, libGL, libXv, ...)
-- Audio output development headers (libasound, pulseaudio)
-- FFmpeg libraries (libavutil libavcodec libavformat libswscale libavresample)
+- Audio output development headers (libasound/ALSA, pulseaudio)
+- FFmpeg libraries (libavutil libavcodec libavformat libswscale libavfilter
+  and either libswresample or libavresample)
   At least FFmpeg 2.1.4 or Libav 10 is required.
-- libjpeg (for screenshots)
-- Lua (strictly speaking optional, but required for the OSC pseudo-GUI)
+- zlib
+- iconv (normally provided by the system libc)
+- libass
+- Lua (optional, required for the OSC pseudo-GUI and youtube-dl integration)
+- libjpeg (optional, used for screenshots only)
+- Enca (optional, for subtitle charset detection)
+- vdpau and vaapi libraries for hardware decoding on Linux (optional)
 
 Libass dependencies:
 
 - gcc or clang, yasm on x86 and x86_64
 - fribidi, freetype, fontconfig development headers (for libass)
+- harfbuzz (optional, required for correct rendering of combining characters,
+  particularly for correct rendering of non-English text on OSX, and
+  Arabic/Indic scripts on any platform)
 
 FFmpeg dependencies:
 
@@ -76,6 +81,9 @@ If you are running Mac OSX and using homebrew we provide [homebrew-mpv][homebrew
 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
 ----------------
 
@@ -139,3 +147,4 @@ only if discretion is required.
 [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

RELEASE_NOTES

@@ -0,0 +1,196 @@
+Release 0.8.1
+=============
+
+Changes
+-------
+
+- DOCS/client-api-changes has been correctly updated for the v0.8.0 release
+  series.
+- Quality and major perfomance improvements to smoothmotion.
+- Silence the "[ytdl_hook] WARNING: video doesn't have subtitles" warning.
+- Other documentation updates.
+
+Bug fixes
+---------
+
+- Attempt to fix OpenGL shader compilation on Intel windows drivers. (bug
+  #1536)
+- Attempt to improve the OpenGL shader's compatibility with GLES2.
+- (Windows) Fix noise when seeking while using wasapi:exclusive. (bug #1529)
+- Fix the waf-based build system when used with newer versions of waf with
+  python3.
+- Documentation fixes. (includes bug #1608)
+
+New features
+------------
+
+- mpv now tries to load '.vtt' subtitles.
+
+This listing is not complete. A complete changelog can be seen by running
+`git log v0.8.0..v0.8.1` in the git repository.
+
+Release 0.8.0
+=============
+
+Changes
+-------
+
+Changes that may break users' config files have been annotated with a `(!)`.
+
+- `(!)` vo_opengl_old has been removed. OpenGL rendering now requires hardware
+  that can do at least OpenGL 2.1, the oldest version supported by vo_opengl.
+- `(!)` vf_pp has been removed. A version of it can still be accessed through
+  lavfilter (e.g. --vf=lavfi=[pp...]), but it receives no QP information.
+  Also, vf_dlopen no longer passes QP information to its loaded plugin either
+  (it's always 0).
+- `(!)` vf_softpulldown, vf_swapuv, vf_phase, vf_divtc and vf_ilpack have all
+  been removed. Ports or alternative versions of these filters are available
+  through libavfilter (vf_lavfi).
+- vf_pullup and vf_noise now are simply wrappers to their libavfilter
+  equivalents. Both are only currently available on FFmpeg (not Libav).
+- `(!)` ao_portaudio has been removed. There is good support for the native
+  audio drivers of all major desktop platforms, as well as ao_sdl and
+  ao_openal as fallbacks.
+- `(!)` vo_opengl's `lscale` suboption has been renamed to `scale`; `lradius`
+  is now `scale-radius`, `lparam1` and `lparam2` are now respectively
+  `scale-param1` and `scale-param2`; `lscale-down` is now `scale-down`.
+  The `cscale` suboption remains as is.
+- `(!)` Several of the `vo_opengl` radius-preset aliases supported by `scale`
+  have been removed; use `scale-radius` to set if needed. For example, use
+  `--vo=opengl:scale=lanczos:scale-radius=2` instead of `scale=lanczos2`.
+  The default radius is recommended for most filters.
+- `(!)` vo_opengl no longer supports the `stereo` suboption. The anaglyph
+  effect can be reproduced with the stereo3d filter. The quadbuffer support,
+  which requires expensive specialized hardware to begin with, is removed.
+- `(!)` The `approx-gamma` suboption to vo_opengl has been removed. The
+  BT.1886 specification says that it's actually how it's supposed to be done
+  so it is now the default when `srgb` or `icc-profile` are enabled. This does
+  not include BT.1886's gamma drop.
+- `(!)` The `no-scale-sep` and `indirect` suboptions to vo_opengl have been
+  removed. These are now autodetected and enabled whenever they would have
+  benefit.
+- `(!)` The `--lua` and `--lua-opts` parameters / options are now called
+  `--script` and `--script-opts`, respectively. The `lua` subdir of the mpv
+  config dir is also now expected to be called `scripts` instead.
+- `(!)` The `--fixed-vo` option has been removed. It has been the default for
+  a long time anyway, and disabling fixed-vo is not useful.
+- vo_opengl_hq has been updated to take into account new features.
+  `fancy-downscaling` and `sigmoid-upscaling` are enabled,
+  "mitchell" is now the default for `scale-down`.
+- The `sub-visibility` OSD message is now clearer about whether subtitles
+  are hidden or just not available / selected.
+- The device IDs given to `--audio-device` for use with ao_coreaudio now use
+  UIDs, so they don't change when devices are added/removed or after reboots.
+- `--msg-level` now also accepts ',' as separator.
+- (Client API) The client API now refuses to initialize if the LC_NUMERIC
+  locale is not "C".
+- (Client API) The native type of the `msg-level` parameter is now a key-value
+  list. Setting or reading it as a string still works.
+- (Slave API) The `get_property` command is now deprecated.
+- Documentation updates.
+- PDF documentation is now disabled by default due to rst2pdf being fickle,
+  causing weird build errors.
+- Print desync messages with negative A/V sync as well. While rare, it could
+  happen with some uses of `--autosync`.
+
+Bug fixes
+---------
+
+- (Windows) Avoid resizing the video window when player is minimized, might
+  address bug #1547.
+- (NetBSD) Fix build with v4l2.
+- (Linux) Attempt to address conflicts with the pulseaudio mixer. (bug #1578)
+- Multiple cdda:// fixes. (bugs #1555, #1560)
+- VP9 timestamps no longer cause "missing PTS" warnings with new enough FFmpeg
+  builds.
+- Fix a crash when using H.264 hardware decoding on new enough libavcodecs.
+  (bug #1587)
+
+New features
+------------
+
+- vo_opengl now supports frame blending to eliminate stuttering when the video
+  framerate does not nicely match the display framerate through the
+  `smoothmotion` suboption. This is not meant to artificially increase the
+  video's FPS, so there is no "soap opera effect" or difficulties with some
+  video types (e.g. anime).
+- vo_opengl now supports sigmoidal upscaling (e.g. for fullscreen), which
+  reduces ringing induced by upscaling, enabled through the
+  `sigmoid-upscaling` suboption.
+- vo_opengl now supports ewa_lanczos (Jinc) scaling, which provides higher
+  quality with less aliasing. It supports an experimental `scale-antiringing`
+  parameter, which tries to further reduce video ringing.
+- vo_opengl now has a `linear-scaling` suboption, that makes the scalers work
+  in linear light. Implied by the `srgb`, `icc-profile` or the new
+  `sigmoid-upscaling` suboption.
+- vo_opengl has improved downscaling for higher downscale ratios when
+  `fancy-downscaling` is enabled.
+- Add `--keep-open=always` to make `--keep-open` apply to all files instead of
+  only the last.
+- mpv now filters the tags that are printed on the console to try to hide
+  useless metadata. The filter works as a whitelist, and can be configured
+  with the `--display-tags` option.
+- Add a `--sub-scale-by-window` option that, when set to 'no', prevents
+  subtitles from changing their pixel size when the window changes sizes.
+- vo_opengl now technically has GLES 2 and 3 support (but not GLES 1). GLES 3
+  support is only tested on Mesa's software emulation. GLES 2 has been tested
+  on nvidia drivers. Both GLES modes are feature deficient and inefficient due
+  to GLES limitations, so they should not be preferred over the standard
+  OpenGL mode.
+- (X11) vo_opengl now supports the `icc-profile-auto` option on X11 hosts.
+- The 'A' key now by default cycles through a list of preset aspect ratios.
+  Meant to be used to work around broken files.
+- There is now a "force" mode for `--loop`. Works like "inf", but tries to
+  open files/streams even if there was an error on the previous attempt.
+- There is now a `--log-file` option to write mpv's log messages to a specifed
+  file.
+- There is now a `--audio-file-auto` option to automatically load an external
+  audio file with certain constraints. Will only load external audio if the
+  playing file has a video stream. Set to "exact" by default. (bug #967)
+- There is now a `--network-timeout` option to specify a timeout in seconds
+  for network access. If 0 (default), uses the libavformat default. If a
+  protocol that doesn't support timeouts is used, this option is ignored.
+- (X11) The XF86 special keys are now all mappable in `input.conf`. All keys
+  documented in `XF86keysym.h` are available, but only as their numeric codes.
+- (Linux) The DVB implementation now supports DVB-S2 through S2API.
+- (Linux) The VDR format for `channels.conf` is now supported and preferred.
+  See http://linuxtv.org/vdrwiki/index.php/Syntax_of_channels.conf for the
+  syntax. Tuning to DVB-S2 channels requires the VDR-format `channels.conf`.
+- (Linux) There is now a `--dvbin-full-transponder` option for handling
+  special broadcast cases where PIDs switch, or just to work around incomplete
+  PID data.
+- (Client API) There is now an opengl_cb VO, which receives the OpenGL context
+  from the libmpv client. This allows a client to render libmpv video directly
+  to a provided OpenGL context without having to use --wid embedding.
+- (Client API) The aforementioned --wid parameter can now be set at any time,
+  but has no effect if a file is already loaded.
+- (Client API) The list of DVD titles can now be queried.
+- (Client API) There is now a `filtered-metadata` property, containing only
+  the tags allowed by `--display-tags`.
+- (Client API) There is now support for XEmbed `--wid` targets, such as a
+  `GtkSocket`'s `gtk_socket_get_id()`.
+- (Client API) There is now a `file-format` property with a symbolic name
+  for the file format. In some cases this might be a comma separated list
+  of various different extensions due to libavformat idiosyncrasies.
+- (Client API) There is now a `mouse` command for generating mouse events
+  over the video window.
+- (Client API) There is now a `partially-seekable` property that indicates
+  whether a file is only considered `seekable` because of the stream cache,
+  but would not be seekable otherwise (e.g. realtime stream, or HTTP with
+  no resume support). Small relative seeks may be fine, but larger seeks
+  will likely fail.
+- (Client API) There is now an MPV_EVENT_QUEUE_OVERFLOW event that is posted
+  whenever events have to be dropped because the queue is full. No further
+  events are posted until the MPV_EVENT_QUEUE_OVERFLOW is consumed to avoid
+  duplicated posting.
+- (Client API) There is now a helper `mpv_wait_async_requests()` function
+  that blocks until all known async requests have completed. (bug #1542)
+- (Client API) There is now a `detected-hwdec` property that returns the
+  detected hardware decoder when one is successfully opened. This probably
+  only returns a valid value after playback has started.
+- (Client API) There are now `audio_add`, `audio_remove` and `audio_reload`
+  counterparts to the equivalent `sub_` commands for handling external audio
+  files.
+
+This listing is not complete. A complete changelog can be seen by running
+`git log v0.7.0..v0.8.0` in the git repository.

TOOLS/dylib-unhell.py

@@ -19,6 +19,7 @@ def is_user_lib(objfile, libname):
            not "libSystem." in libname and \
            not "libc." in libname and \
            not "libgcc." in libname and \
+           not os.path.basename(libname) == 'Python' and \
            not os.path.basename(objfile) in libname
 
 def otool(objfile):

TOOLS/lua/README.md

@@ -4,9 +4,9 @@ mpv lua scripts
 The lua scripts in this folder can be loaded on a one-time basis by
 adding the option
 
-    --lua=/path/to/script.lua
+    --script=/path/to/script.lua
 
 to mpv's command line.
 
-Where appropriate, they may also be placed in ~/.config/mpv/lua from where
-they will be automatically loaded when mpv starts.
+Where appropriate, they may also be placed in ~/.config/mpv/scripts/ from
+where they will be automatically loaded when mpv starts.

TOOLS/lua/autocrop.lua

@@ -21,7 +21,7 @@
 -- The default delay between insertion of the cropdetect and
 -- crop filters may be overridden by adding
 --
--- --lua-opts=autocrop.detect_seconds=<number of seconds>
+-- --script-opts=autocrop.detect_seconds=<number of seconds>
 --
 -- to mpv's arguments. This may be desirable to allow cropdetect more
 -- time to collect data.

TOOLS/lua/autodeint.lua

@@ -19,7 +19,7 @@
 --
 -- The default detection time may be overridden by adding
 --
--- --lua-opts=autodeint.detect_seconds=<number of seconds>
+-- --script-opts=autodeint.detect_seconds=<number of seconds>
 --
 -- to mpv's arguments. This may be desirable to allow idet more
 -- time to collect data.

TOOLS/lua/autoload.lua

@@ -25,6 +25,9 @@ function find_and_add_entries()
         return
     end
     local files = mputils.readdir(dir, "files")
+    if files == nil then
+        return
+    end
     table.sort(files)
     if dir == "." then
         dir = ""

TOOLS/lua/observe-all.lua

@@ -1,16 +1,14 @@
 -- Test script for property change notification mechanism.
+-- Note that watching/reading some properties can be very expensive, or
+-- require the player to synchronously wait on network (when playing
+-- remote files), so you should in general only watch properties you
+-- are interested in.
 
-function format_property_val(v)
-    if type(v) == "table" then
-        return mp.format_table(v) -- undocumented function; might be removed
-    else
-        return tostring(v)
-    end
-end
+local utils = require("mp.utils")
 
 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 '" ..
-              format_property_val(val) .. "'")
+              utils.to_string(val) .. "'")
     end)
 end

TOOLS/lua/pause-when-minimize.lua

@@ -0,0 +1,22 @@
+-- This script pauses playback when minimizing the window, and resumes playback
+-- 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)
+    local pause = mp.get_property_native("pause")
+    if value == true then
+        if pause == false then
+            mp.set_property_native("pause", true)
+            did_minimize = true
+        end
+    elseif value == false then
+        if did_minimize and (pause == true) then
+            mp.set_property_native("pause", false)
+        end
+        did_minimize = false
+    end
+end)

TOOLS/osxbundle.py

@@ -3,6 +3,7 @@
 import os
 import shutil
 import sys
+import fileinput
 from optparse import OptionParser
 
 def sh(command):
@@ -35,7 +36,8 @@ def copy_binary(binary_name):
     shutil.copy(binary_name, target_binary(binary_name))
 
 def apply_plist_template(plist_file, version):
-    sh("sed -i -e 's/${VERSION}/%s/g' %s" % (version, plist_file))
+    for line in fileinput.input(plist_file, inplace=1):
+        print (line.rstrip().replace('${VERSION}', version))
 
 def main():
     version = sh("./version.sh --print").strip()

TOOLS/osxbundle/mpv.app/Contents/Info.plist

@@ -88,6 +88,7 @@
           <string>VOB</string>
           <string>WEBM</string>
           <string>WMV</string>
+          <string>MK3D</string>
           <string>asf</string>
           <string>avi</string>
           <string>cpk</string>
@@ -122,6 +123,7 @@
           <string>vob</string>
           <string>webm</string>
           <string>wmv</string>
+          <string>mk3d</string>
         </array>
         <key>CFBundleTypeIconFile</key>
         <string>document.icns</string>
@@ -208,6 +210,7 @@
           <string>mms</string>
           <string>mmst</string>
           <string>http</string>
+          <string>https</string>
           <string>httpproxy</string>
           <string>rtp</string>
           <string>rtsp</string>
@@ -513,6 +516,47 @@
           <key>public.filename-extension</key>
           <array>
             <string>mkv</string>
+          </array>
+        </dict>
+      </dict>
+      <dict>
+        <key>UTTypeConformsTo</key>
+        <array>
+          <string>public.movie</string>
+        </array>
+        <key>UTTypeDescription</key>
+        <string>Matroska stereoscopic/3D video</string>
+        <key>UTTypeIconFile</key>
+        <string>document.icns</string>
+        <key>UTTypeIdentifier</key>
+        <string>io.mpv.mk3d</string>
+        <key>UTTypeReferenceURL</key>
+        <string>http://www.matroska.org</string>
+        <key>UTTypeTagSpecification</key>
+        <dict>
+          <key>public.filename-extension</key>
+          <array>
+            <string>mk3d</string>
+          </array>
+        </dict>
+      </dict>
+      <dict>
+        <key>UTTypeConformsTo</key>
+        <array>
+          <string>public.movie</string>
+        </array>
+        <key>UTTypeDescription</key>
+        <string>WebM Video</string>
+        <key>UTTypeIconFile</key>
+        <string>document.icns</string>
+        <key>UTTypeIdentifier</key>
+        <string>io.mpv.webm</string>
+        <key>UTTypeReferenceURL</key>
+        <string>http://www.webmproject.org</string>
+        <key>UTTypeTagSpecification</key>
+        <dict>
+          <key>public.filename-extension</key>
+          <array>
             <string>webm</string>
           </array>
         </dict>

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

@@ -0,0 +1,3 @@
+screenshot-template=~/Desktop/shot%n
+quiet
+idle=once

TOOLS/stats-conv.py

@@ -1,9 +1,12 @@
 #!/usr/bin/env python3
 import matplotlib.pyplot as plot
 import sys
+import re
 
 filename = sys.argv[1]
 
+event_regex = re.compile(".*")
+
 """
 This script is meant to display stats written by mpv --dump-stats=filename.
 In general, each line in that file is an event of the form:
@@ -18,17 +21,19 @@ e.g.:
 
 Currently, the following event types are supported:
 
+    'signal' <name>             singular event
     'start' <name>              start of the named event
     '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
-    <name>                      singular event
+    'value-timed' <ts> <float> <name>
+                                a value for an event at the given timestamp
+    <name>                      singular event (same as 'signal')
 
 """
 
 class G:
     events = {}
-    sevents = []  # events, deterministically sorted
     start = None
     # http://matplotlib.org/api/markers_api.html#module-matplotlib.markers
     markers = ["o", "8", "s", "p", "*", "h", "+", "x", "D"]
@@ -46,24 +51,25 @@ class Event:
 def get_event(event, evtype):
     if event not in G.events:
         e = Event()
-        G.events[event] = e
         e.name = event
         e.vals = []
         e.type = evtype
         e.marker = "o"
-        e.numid = len(G.events)
-        G.sevents = list(G.events.values())
-        G.sevents.sort(key=lambda x: x.name)
         if e.type == "event-signal":
             e.marker = find_marker()
+        if not event_regex.match(e.name):
+            return e
+        G.events[event] = e
     return G.events[event]
 
+SCALE = 1e6 # microseconds to seconds
+
 for line in [line.split("#")[0].strip() for line in open(filename, "r")]:
     line = line.strip()
     if not line:
         continue
     ts, event = line.split(" ", 1)
-    ts = int(ts) / 1000 # milliseconds
+    ts = int(ts) / SCALE
     if G.start is None:
         G.start = ts
     ts = ts - G.start
@@ -82,28 +88,48 @@ for line in [line.split("#")[0].strip() for line in open(filename, "r")]:
         e.vals.append((ts, val))
     elif event.startswith("event-timed "):
         _, val, name = event.split(" ", 2)
-        val = int(val) / 1000 - G.start
+        val = int(val) / SCALE - G.start
         e = get_event(name, "event-signal")
         e.vals.append((val, 1))
+    elif event.startswith("value-timed "):
+        _, tsval, val, name = event.split(" ", 3)
+        tsval = int(tsval) / SCALE - G.start
+        val = float(val)
+        e = get_event(name, "value")
+        e.vals.append((tsval, val))
+    elif event.startswith("signal "):
+        name = event.split(" ", 2)[1]
+        e = get_event(name, "event-signal")
+        e.vals.append((ts, 1))
     else:
         e = get_event(event, "event-signal")
         e.vals.append((ts, 1))
 
-for e in G.sevents:
-    e.vals = [(x, y * e.numid / len(G.events)) for (x, y) in e.vals]
-
-plot.hold(True)
-mainpl = plot.subplot(2, 1, 1)
-legend = []
-for e in G.sevents:
+# deterministically sort them; make sure the legend is sorted too
+G.sevents = list(G.events.values())
+G.sevents.sort(key=lambda x: x.name)
+hasval = False
+for e, index in zip(G.sevents, range(len(G.sevents))):
+    m = len(G.sevents)
     if e.type == "value":
-        plot.subplot(2, 1, 2, sharex=mainpl)
+        hasval = True
     else:
-        plot.subplot(2, 1, 1)
-    pl, = plot.plot([x for x,y in e.vals], [y for x,y in e.vals], label=e.name)
+        e.vals = [(x, y * (m - index) / m) for (x, y) in e.vals]
+
+fig = plot.figure()
+fig.hold(True)
+ax = [None, None]
+plots = 2 if hasval else 1
+ax[0] = fig.add_subplot(plots, 1, 1)
+if hasval:
+    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]
+    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":
         plot.setp(pl, marker = e.marker, linestyle = "None")
-    legend.append(pl)
-plot.subplot(2, 1, 1)
-plot.legend(legend, [pl.get_label() for pl in legend])
+for cur in ax:
+    if cur is not None:
+        cur.legend()
 plot.show()

TOOLS/vf_dlopen/Makefile

@@ -19,7 +19,7 @@
 # 02110-1301 USA
 #
 
-FILTERS = showqscale telecine tile rectangle framestep ildetect
+FILTERS = telecine tile rectangle framestep ildetect
 COMMON = filterutils.o
 
 OBJECTS = $(patsubst %,%.o,$(FILTERS)) $(COMMON)

TOOLS/vf_dlopen/showqscale.c

@@ -1,120 +0,0 @@
-/*
- * Copyright (c) 2012 Rudolf Polzer <divVerent@xonotic.org>
- *
- * This file is part of mpv's vf_dlopen examples.
- *
- * mpv's vf_dlopen examples are free software; you can redistribute them and/or
- * modify them 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's vf_dlopen examples are distributed in the hope that they 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.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with mpv's vf_dlopen examples; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "vf_dlopen.h"
-
-/*
- * qscale visualizer
- *
- * usage: --vf=dlopen=/path/to/showqscale.so
- *
- * uses reddish colors for high QPs, and greenish colors for low QPs
- */
-
-#define PLANE_Y 0
-#define PLANE_U 1
-#define PLANE_V 2
-
-static int qs_put_image(struct vf_dlopen_context *ctx)
-{
-    unsigned int x, y, p;
-
-    assert(ctx->inpic.planes == ctx->outpic[0].planes);
-
-    for (p = 0; p < ctx->outpic[0].planes; ++p) {
-        assert(ctx->inpic.planewidth[p] == ctx->outpic[0].planewidth[p]);
-        assert(ctx->inpic.planeheight[p] == ctx->outpic[0].planeheight[p]);
-        if ((p == PLANE_U || p == PLANE_V) && ctx->inpic_qscale)
-            continue;
-#if 0
-        // copy as is
-        for (y = 0; y < ctx->outpic[0].planeheight[p]; ++y)
-            memcpy(
-                &ctx->outpic[0].plane[p][ctx->outpic[0].planestride[p] * y],
-                &inpic[ctx->outpic[0].planeofs[p] + ctx->inpic.planestride[p] * y],
-                ctx->outpic[0].planewidth[p]
-                );
-#else
-        // reduce contrast
-        for (y = 0; y < ctx->outpic[0].planeheight[p]; ++y)
-            for (x = 0; x < ctx->outpic[0].planewidth[p]; ++x)
-                ctx->outpic[0].plane[p][ctx->outpic[0].planestride[p] * y + x] =
-                    0x20 + ((ctx->inpic.plane[p][ctx->inpic.planestride[p] * y + x] * 3) >> 2);
-#endif
-    }
-
-    if (ctx->inpic_qscale) {
-        int qmin = 255;
-        int qmax = -255;
-
-        // clear U plane
-        p = PLANE_U;
-        for (y = 0; y < ctx->outpic[0].planeheight[p]; ++y)
-            memset(
-                &ctx->outpic[0].plane[p][ctx->outpic[0].planestride[p] * y],
-                0x80,
-                ctx->outpic[0].planewidth[p]
-                );
-
-        // replace V by the qp (0 = green, 12 = red)
-        p = PLANE_V;
-        for (y = 0; y < ctx->outpic[0].planeheight[p]; ++y)
-            for (x = 0; x < ctx->outpic[0].planewidth[p]; ++x) {
-                int q = ctx->inpic_qscale[
-                    (x >> (ctx->inpic_qscaleshift - ctx->inpic.planexshift[p])) +
-                    (y >> (ctx->inpic_qscaleshift - ctx->inpic.planeyshift[p])) * ctx->inpic_qscalestride];
-                if (q < qmin)
-                    qmin = q;
-                if (q > qmax)
-                    qmax = q;
-                int v = 128 + 21 * (q - 6); // range: 0 = green, 12 = red
-                if (v < 0)
-                    v = 0;
-                if (v > 255)
-                    v = 255;
-                ctx->outpic[0].plane[p][ctx->outpic[0].planestride[p] * y + x] = v;
-            }
-
-        // printf("qscale range: %d .. %d\n", qmin, qmax);
-    }
-
-    ctx->outpic[0].pts = ctx->inpic.pts;
-    return 1;
-}
-
-int vf_dlopen_getcontext(struct vf_dlopen_context *ctx, int argc, const char **argv)
-{
-    VF_DLOPEN_CHECK_VERSION(ctx);
-    (void) argc;
-    (void) argv;
-    static struct vf_dlopen_formatpair map[] = {
-        { "yuv420p", "yuv420p" },
-        { NULL, NULL }
-    };
-    ctx->format_mapping = map;
-    ctx->put_image = qs_put_image;
-    return 1;
-}

TOOLS/youtube-dl_mpv.sh

@@ -6,17 +6,17 @@ 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" \
+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
+    --cookies-file="${cookies_file}" \
+    --user-agent="${user_agent}" \
+    -- ${video_url}
 
-rm -rf "$cookies_dir"
+rm -rf "${cookies_dir}"

TOOLS/zsh.pl

@@ -7,7 +7,7 @@ use warnings;
 
 my $mpv = $ARGV[0] || 'mpv';
 
-my @opts = parse_opts("$mpv --list-options", '^ (\-\-[^\s\*]*)\*?\s*(.*)', 1);
+my @opts = parse_main_opts("$mpv --list-options", '^ (\-\-[^\s\*]*)\*?\s*(.*)');
 
 my @ao = parse_opts("$mpv --ao=help", '^  ([^\s\:]*)\s*: (.*)');
 my @vo = parse_opts("$mpv --vo=help", '^  ([^\s\:]*)\s*: (.*)');
@@ -54,7 +54,7 @@ my $profile_comp = <<'EOS';
           profiles=($profiles $current)
         fi
       done
-      if [[ $state == profile ]]; then
+      if [[ $state == show-profile ]]; then
         # For --show-profile, only one allowed
         if (( ${#profiles} > 0 )); then
           _values 'profile' $profiles && rc=0
@@ -118,7 +118,7 @@ $vf_str
     _describe -t values 'video filters' values && rc=0
   ;;
 
-  profile|profiles)
+  profile|show-profile)
 $profile_comp
   ;;
 
@@ -133,7 +133,7 @@ $profile_comp
     _tags files urls
     while _tags; do
       _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
+        "*.(#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
@@ -150,8 +150,73 @@ EOS
 
 print $tmpl;
 
+sub parse_main_opts {
+    my ($cmd, $regex) = @_;
+
+    my @list;
+    my @lines = split /\n/, `$cmd`;
+
+    foreach my $line (@lines) {
+        my ($name, $desc) = ($line =~ /^$regex/) or next;
+
+        next if ($desc eq 'removed' || $desc eq 'alias');
+
+        if ($desc =~ /^Flag/) {
+
+            push @list, $name;
+
+            $name =~ /^--(.*)/;
+            if ($1 !~ /^(\{|\}|v|list-options|really-quiet|no-.*)$/) {
+                push @list, "--no-$1";
+            }
+
+        } elsif ($desc =~ /^Print/) {
+
+            push @list, $name;
+
+        } else {
+
+            # Option takes argument
+
+            my $entry = $name;
+
+            $desc =~ s/\:/\\:/g;
+            $entry .= "=-:$desc:";
+
+            if ($desc =~ /^Choices\\: ([^(]*)/) {
+                my $choices = $1;
+                $choices =~ s/ +$//; # strip trailing space
+                $entry .= "($choices)";
+
+                # If "no" is one of the choices, it can also be
+                # negated like a flag (--no-whatever).
+                if ($choices =~ /\bno\b/) {
+                    $name =~ s/^--/--no-/;
+                    push @list, $name;
+                }
+            } elsif ($line =~ /\[file\]/) {
+                $entry .= '->files';
+            } elsif ($name =~ /^--(ao|vo|af|vf|profile|show-profile)$/) {
+                $entry .= "->$1";
+            }
+            push @list, $entry;
+        }
+    }
+
+    # Sort longest first, because zsh won't complete an option listed
+    # after one that's a prefix of it.
+    @list = sort {
+        $a =~ /([^=]*)/; my $ma = $1;
+        $b =~ /([^=]*)/; my $mb = $1;
+
+        length($mb) <=> length($ma)
+    } @list;
+
+    return @list;
+}
+
 sub parse_opts {
-    my ($cmd, $regex, $parsing_main_options) = @_;
+    my ($cmd, $regex) = @_;
 
     my @list;
     my @lines = split /\n/, `$cmd`;
@@ -163,40 +228,14 @@ sub parse_opts {
 
         my $entry = $1;
 
-        if ($parsing_main_options) {
-            $entry .= '=-';
-        }
-
         if (defined $2) {
             my $desc = $2;
             $desc =~ s/\:/\\:/g;
-
             $entry .= ':' . $desc;
         }
 
-        if ($parsing_main_options) {
-            $entry .= ':';
-
-            $entry .= '->ao' if ($1 eq '--ao');
-            $entry .= '->vo' if ($1 eq '--vo');
-            $entry .= '->af' if ($1 eq '--af');
-            $entry .= '->vf' if ($1 eq '--vf');
-            $entry .= '->profiles' if ($1 eq '--profile');
-            $entry .= '->profile' if ($1 eq '--show-profile');
-            $entry .= '->files' if ($line =~ /\[file\]/);
-        }
-
         push @list, $entry
     }
 
-    if ($parsing_main_options) {
-        @list = sort {
-            $a =~ /(.*?)\:/; my $ma = $1;
-            $b =~ /(.*?)\:/; my $mb = $1;
-
-            length($mb) <=> length($ma)
-        } @list;
-    }
-
     return @list;
 }

VERSION

@@ -0,0 +1 @@
+0.8.1

audio/audio.c

@@ -227,6 +227,14 @@ void mp_audio_copy(struct mp_audio *dst, int dst_offset,
     }
 }
 
+// Copy fields that describe characteristics of the audio frame, but which are
+// not part of the core format (format/channels/rate), and not part of the
+// data (samples).
+void mp_audio_copy_attributes(struct mp_audio *dst, struct mp_audio *src)
+{
+    // nothing yet
+}
+
 // Set data to the audio after the given number of samples (i.e. slice it).
 void mp_audio_skip_samples(struct mp_audio *data, int samples)
 {
@@ -238,28 +246,40 @@ void mp_audio_skip_samples(struct mp_audio *data, int samples)
     data->samples -= samples;
 }
 
-// Make sure the frame owns the audio data, and if not, copy the data.
-// Return negative value on failure (which means it can't be made writeable).
-// Non-refcounted frames are always considered writeable.
-int mp_audio_make_writeable(struct mp_audio *data)
+// 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)
 {
     bool ok = true;
     for (int n = 0; n < MP_NUM_CHANNELS; n++) {
         if (data->allocated[n])
             ok &= av_buffer_is_writable(data->allocated[n]);
     }
-    if (!ok) {
+    return ok;
+}
+
+static void mp_audio_steal_data(struct mp_audio *dst, struct mp_audio *src)
+{
+    talloc_set_destructor(dst, mp_audio_destructor);
+    mp_audio_destructor(dst);
+    *dst = *src;
+    talloc_set_destructor(src, NULL);
+    talloc_free(src);
+}
+
+// Make sure the frame owns the audio data, and if not, copy the data.
+// Return negative value on failure (which means it can't be made writeable).
+// Non-refcounted frames are always considered writeable.
+int mp_audio_make_writeable(struct mp_audio *data)
+{
+    if (!mp_audio_is_writeable(data)) {
         struct mp_audio *new = talloc(NULL, struct mp_audio);
         *new = *data;
         mp_audio_set_null_data(new); // use format only
         mp_audio_realloc(new, data->samples);
         new->samples = data->samples;
         mp_audio_copy(new, 0, data, 0, data->samples);
-        // "Transfer" the reference.
-        mp_audio_destructor(data);
-        *data = *new;
-        talloc_set_destructor(new, NULL);
-        talloc_free(new);
+        mp_audio_steal_data(data, new);
     }
     return 0;
 }
@@ -350,7 +370,8 @@ struct mp_audio *mp_audio_pool_get(struct mp_audio_pool *pool,
         if (alloc >= INT_MAX)
             return NULL;
         av_buffer_pool_uninit(&pool->avpool);
-        pool->avpool = av_buffer_pool_init(alloc, NULL);
+        pool->element_size = alloc;
+        pool->avpool = av_buffer_pool_init(pool->element_size, NULL);
         if (!pool->avpool)
             return NULL;
         talloc_set_destructor(pool, mp_audio_pool_destructor);
@@ -370,3 +391,31 @@ struct mp_audio *mp_audio_pool_get(struct mp_audio_pool *pool,
     }
     return new;
 }
+
+// Return a copy of the given frame.
+// Returns NULL on error.
+struct mp_audio *mp_audio_pool_new_copy(struct mp_audio_pool *pool,
+                                        struct mp_audio *frame)
+{
+    struct mp_audio *new = mp_audio_pool_get(pool, frame, frame->samples);
+    if (new) {
+        mp_audio_copy(new, 0, frame, 0, new->samples);
+        mp_audio_copy_attributes(new, frame);
+    }
+    return new;
+}
+
+// Exactly like mp_audio_make_writeable(), but get the data from the pool.
+int mp_audio_pool_make_writeable(struct mp_audio_pool *pool,
+                                 struct mp_audio *data)
+{
+    if (mp_audio_is_writeable(data))
+        return 0;
+    struct mp_audio *new = mp_audio_pool_get(pool, data, data->samples);
+    if (!new)
+        return -1;
+    mp_audio_copy(new, 0, data, 0, data->samples);
+    mp_audio_copy_attributes(new, data);
+    mp_audio_steal_data(data, new);
+    return 0;
+}

audio/audio.h

@@ -66,15 +66,22 @@ void mp_audio_fill_silence(struct mp_audio *mpa, int start, int length);
 
 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);
 
+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 mp_audio_pool;
 struct mp_audio_pool *mp_audio_pool_create(void *ta_parent);
 struct mp_audio *mp_audio_pool_get(struct mp_audio_pool *pool,
                                    const struct mp_audio *fmt, int samples);
+struct mp_audio *mp_audio_pool_new_copy(struct mp_audio_pool *pool,
+                                        struct mp_audio *frame);
+int mp_audio_pool_make_writeable(struct mp_audio_pool *pool,
+                                 struct mp_audio *frame);
 
 #endif

audio/chmap.c

@@ -85,6 +85,7 @@ static const char *const std_layout_names[][2] = {
     {"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"},
     {"octagonal",       "fl-fr-fc-bl-br-bc-sl-sr"},
     {"downmix",         "dl-dr"},
     {"auto",            ""}, // not in lavc
@@ -374,6 +375,29 @@ void mp_chmap_get_reorder(int dst[MP_NUM_CHANNELS], const struct mp_chmap *from,
         assert(to->speaker[dst[n]] == from->speaker[n]);
 }
 
+// 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);
+    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
 // order, return that, e.g. "3.0" instead of "fl-fr-fc".
 // Unassigned but valid speakers get names like "sp28".

audio/chmap.h

@@ -120,6 +120,11 @@ void mp_chmap_reorder_to_lavc(struct mp_chmap *map);
 void mp_chmap_get_reorder(int dst[MP_NUM_CHANNELS], const struct mp_chmap *from,
                           const struct mp_chmap *to);
 
+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))
 

audio/chmap_sel.c

@@ -17,6 +17,7 @@
 
 #include <stdlib.h>
 #include <assert.h>
+#include <limits.h>
 
 #include "common/common.h"
 #include "chmap_sel.h"
@@ -81,14 +82,21 @@ void mp_chmap_sel_add_alsa_def(struct mp_chmap_sel *s)
     }
 }
 
-#define ARRAY_LEN(x) (sizeof(x) / sizeof((x)[0]))
-
 // Add a channel map that should be allowed.
 void mp_chmap_sel_add_map(struct mp_chmap_sel *s, const struct mp_chmap *map)
 {
-    assert(s->num_chmaps < ARRAY_LEN(s->chmaps));
-    if (mp_chmap_is_valid(map))
-        s->chmaps[s->num_chmaps++] = *map;
+    if (!mp_chmap_is_valid(map))
+        return;
+    if (!s->chmaps)
+        s->chmaps = s->chmaps_storage;
+    if (s->num_chmaps == MP_ARRAY_SIZE(s->chmaps_storage)) {
+        if (!s->tmp)
+            return;
+        s->chmaps = talloc_memdup(s->tmp, s->chmaps, sizeof(s->chmaps_storage));
+    }
+    if (s->chmaps != s->chmaps_storage)
+        MP_TARRAY_GROW(s->tmp, s->chmaps, s->num_chmaps);
+    s->chmaps[s->num_chmaps++] = *map;
 }
 
 // Allow all waveext formats in default order.
@@ -176,18 +184,110 @@ 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;
+
     // Fallback to mono/stereo as last resort
-    if (map->num == 1) {
-        *map = (struct mp_chmap) MP_CHMAP_INIT_MONO;
-    } else if (map->num >= 2) {
-        *map = (struct mp_chmap) MP_CHMAP_INIT_STEREO;
-    }
+    *map = (struct mp_chmap) MP_CHMAP_INIT_STEREO;
+    if (test_layout(s, map))
+        return true;
+    *map = (struct mp_chmap) MP_CHMAP_INIT_MONO;
     if (test_layout(s, map))
         return true;
     *map = (struct mp_chmap) {0};
     return false;
 }
 
+#define UPMIX_IDX 0
+#define DOWNMIX_IDX 1
+#define FALLBACK_IDX 2
+
+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;
+    }
+
+    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;
+    }
+
+    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;
+}
+
+// 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)
+{
+    // 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];
+
+        if (mp_chmap_is_unknown(&e))
+            continue;
+
+        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;
+            }
+        }
+    }
+
+    for (int i = UPMIX_IDX; i < MP_ARRAY_SIZE(best); i++) {
+        if (best_diffs[i] < INT_MAX) {
+            *map = best[i];
+            return true;
+        }
+    }
+
+    return false;
+}
+
 // Set map to a default layout with num channels. Used for audio APIs that
 // return a channel count as part of format negotiation, but give no
 // information about the channel layout.

audio/chmap_sel.h

@@ -26,8 +26,12 @@ struct mp_chmap_sel {
     // should be considered opaque
     bool allow_any, allow_waveext;
     bool speakers[MP_SPEAKER_ID_COUNT];
-    struct mp_chmap chmaps[20];
+    struct mp_chmap *chmaps;
     int num_chmaps;
+
+    struct mp_chmap chmaps_storage[20];
+
+    void *tmp; // set to any talloc context to allow more chmaps entries
 };
 
 void mp_chmap_sel_add_any(struct mp_chmap_sel *s);
@@ -37,6 +41,7 @@ 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);
+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);
 

audio/decode/ad_lavc.c

@@ -136,7 +136,7 @@ static int init(struct dec_audio *da, const char *decoder)
     if (sh->lav_headers)
         mp_copy_lav_codec_headers(lavc_context, sh->lav_headers);
 
-    mp_set_avcodec_threads(lavc_context, opts->threads);
+    mp_set_avcodec_threads(da->log, lavc_context, opts->threads);
 
     /* open it */
     if (avcodec_open2(lavc_context, lavc_codec, NULL) < 0) {

audio/decode/dec_audio.c

@@ -153,23 +153,48 @@ void audio_uninit(struct dec_audio *d_audio)
     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)
 {
-    while (!da->waiting) {
-        int ret = da->ad_driver->decode_packet(da, &da->waiting);
-        if (ret < 0)
-            return ret;
+    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);
     }
-    talloc_steal(da, da->waiting);
-    da->decode_format = *da->waiting;
-    return mp_audio_config_valid(da->waiting) ? AD_OK : AD_ERR;
+    return true;
 }
 
 /* Try to get at least minsamples decoded+filtered samples in outbuf
@@ -186,41 +211,30 @@ int audio_decode(struct dec_audio *da, struct mp_audio_buffer *outbuf,
 
     MP_STATS(da, "start audio");
 
-    int res = 0;
-    while (res >= 0 && minsamples >= 0) {
-        int buffered = mp_audio_buffer_samples(outbuf);
-        if (minsamples < buffered)
-            break;
-
+    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;
-        if (!mpa)
-            res = da->ad_driver->decode_packet(da, &mpa);
-
-        if (res != AD_EOF) {
-            if (res < 0)
-                break;
-            if (!mpa )
-                continue;
-        }
-
-        if (mpa) {
-            da->pts_offset += mpa->samples;
-            da->decode_format = *mpa;
-            mp_audio_set_null_data(&da->decode_format);
-            // On format change, make sure to drain the filter chain.
-            if (!mp_audio_config_equals(&afs->input, mpa)) {
-                res = AD_NEW_FMT;
-                da->waiting = talloc_steal(da, mpa);
-                mpa = NULL;
-            }
-        }
-
-        if (mpa)
-            da->waiting = NULL;
-
-        if (af_filter(afs, mpa, outbuf) < 0)
+        da->waiting = NULL;
+        if (af_filter_frame(afs, mpa) < 0)
             return AD_ERR;
     }
 
@@ -233,7 +247,7 @@ 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_control_all(d_audio->afilter, AF_CONTROL_RESET, NULL);
+    af_seek_reset(d_audio->afilter);
     d_audio->pts = MP_NOPTS_VALUE;
     d_audio->pts_offset = 0;
     if (d_audio->waiting) {

audio/filter/af.c

@@ -70,9 +70,7 @@ static const struct af_info *const filter_list[] = {
     &af_info_pan,
     &af_info_surround,
     &af_info_sub,
-#if HAVE_SYS_MMAN_H
     &af_info_export,
-#endif
     &af_info_drc,
     &af_info_extrastereo,
     &af_info_lavcac3enc,
@@ -124,6 +122,19 @@ const struct m_obj_list af_obj_list = {
     },
 };
 
+static void af_forget_frames(struct af_instance *af)
+{
+    for (int n = 0; n < af->num_out_queued; n++)
+        talloc_free(af->out_queued[n]);
+    af->num_out_queued = 0;
+}
+
+static void af_chain_forget_frames(struct af_stream *s)
+{
+    for (struct af_instance *cur = s->first; cur; cur = cur->next)
+        af_forget_frames(cur);
+}
+
 static void af_copy_unset_fields(struct mp_audio *dst, struct mp_audio *src)
 {
     if (dst->format == AF_FORMAT_UNKNOWN)
@@ -164,8 +175,9 @@ static int output_control(struct af_instance* af, int cmd, void* arg)
     return AF_UNKNOWN;
 }
 
-static int dummy_filter(struct af_instance* af, struct mp_audio* data, int f)
+static int dummy_filter(struct af_instance *af, struct mp_audio *frame)
 {
+    af_add_output_frame(af, frame);
     return 0;
 }
 
@@ -197,10 +209,10 @@ static struct af_instance *af_create(struct af_stream *s, char *name,
     struct af_instance *af = talloc_zero(NULL, struct af_instance);
     *af = (struct af_instance) {
         .info = info,
-        .mul = 1,
         .data = talloc_zero(af, struct mp_audio),
         .log = mp_log_new(af, s->log, name),
         .replaygain_data = s->replaygain_data,
+        .out_pool = mp_audio_pool_create(af),
     };
     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)
@@ -285,6 +297,7 @@ static void af_remove(struct af_stream *s, struct af_instance *af)
 
     if (af->uninit)
         af->uninit(af);
+    af_forget_frames(af);
     talloc_free(af);
 }
 
@@ -499,6 +512,8 @@ static int af_fix_rate(struct af_stream *s, struct af_instance **p_af,
 static int af_reinit(struct af_stream *s)
 {
     remove_auto_inserted_filters(s);
+    af_chain_forget_frames(s);
+    s->first->fmt_in = s->first->fmt_out = s->input;
     // 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;
@@ -517,6 +532,7 @@ static int af_reinit(struct af_stream *s)
         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
@@ -524,6 +540,7 @@ static int af_reinit(struct af_stream *s)
         case AF_OK:
             if (!mp_audio_config_valid(af->data))
                 goto error;
+            af->fmt_out = *af->data;
             af = af->next;
             break;
         case AF_FALSE: { // Configuration filter is needed
@@ -584,36 +601,40 @@ void af_uninit(struct af_stream *s)
 {
     while (s->first->next && s->first->next != s->last)
         af_remove(s, s->first->next);
+    af_chain_forget_frames(s);
     s->initialized = 0;
 }
 
 struct af_stream *af_new(struct mpv_global *global)
 {
     struct af_stream *s = talloc_zero(NULL, struct af_stream);
+    s->log = mp_log_new(s, global->log, "!af");
+
     static const struct af_info in = { .name = "in" };
     s->first = talloc(s, struct af_instance);
     *s->first = (struct af_instance) {
         .info = &in,
+        .log = s->log,
         .control = input_control,
-        .filter = dummy_filter,
+        .filter_frame = dummy_filter,
         .priv = s,
         .data = &s->input,
-        .mul = 1.0,
     };
+
     static const struct af_info out = { .name = "out" };
     s->last = talloc(s, struct af_instance);
     *s->last = (struct af_instance) {
         .info = &out,
+        .log = s->log,
         .control = output_control,
-        .filter = dummy_filter,
+        .filter_frame = dummy_filter,
         .priv = s,
         .data = &s->filter_output,
-        .mul = 1.0,
     };
+
     s->first->next = s->last;
     s->last->prev = s->first;
     s->opts = global->opts;
-    s->log = mp_log_new(s, global->log, "!af");
     return s;
 }
 
@@ -715,65 +736,6 @@ int af_remove_by_label(struct af_stream *s, char *label)
     return 1;
 }
 
-/* Feed "data" to the chain, and write results to output. "data" needs to be
- * a refcounted frame, although refcounting is not used yet.
- * data==NULL means EOF.
- */
-int af_filter(struct af_stream *s, struct mp_audio *data,
-              struct mp_audio_buffer *output)
-{
-    struct af_instance *af = s->first;
-    assert(s->initialized > 0);
-    int flags = 0;
-    int r = 0;
-    struct mp_audio tmp;
-    char dummy[MP_NUM_CHANNELS];
-    if (data) {
-        assert(mp_audio_config_equals(af->data, data));
-        r = mp_audio_make_writeable(data);
-    } else {
-        data = &tmp;
-        *data = *(af->data);
-        mp_audio_set_null_data(data);
-        flags = AF_FILTER_FLAG_EOF;
-        for (int n = 0; n < MP_NUM_CHANNELS; n++)
-            data->planes[n] = &dummy[n];
-    }
-    if (r < 0)
-        goto done;
-    struct mp_audio frame = *data;
-    for (int n = 0; n < MP_NUM_CHANNELS; n++)
-        frame.allocated[n] = NULL;
-    // Iterate through all filters
-    while (af) {
-        r = af->filter(af, &frame, flags);
-        if (r < 0)
-            goto done;
-        assert(mp_audio_config_equals(af->data, &frame));
-        af = af->next;
-    }
-    mp_audio_buffer_append(output, &frame);
-
-done:
-    if (data != &tmp)
-        talloc_free(data);
-    return r;
-}
-
-// Calculate average ratio of filter output samples to input samples.
-// e.g: num_output_samples = mul * num_input_samples
-double af_calc_filter_multiplier(struct af_stream *s)
-{
-    struct af_instance *af = s->first;
-    double mul = 1;
-    do {
-        mul *= af->mul;
-        af = af->next;
-    } while (af);
-
-    return mul;
-}
-
 /* Calculate the total delay [seconds of output] caused by the filters */
 double af_calc_delay(struct af_stream *s)
 {
@@ -781,6 +743,8 @@ double af_calc_delay(struct af_stream *s)
     double delay = 0.0;
     while (af) {
         delay += af->delay;
+        for (int n = 0; n < af->num_out_queued; n++)
+            delay += af->out_queued[n]->samples / (double)af->data->rate;
         af = af->next;
     }
     return delay;
@@ -807,3 +771,108 @@ void af_control_all(struct af_stream *s, int cmd, void *arg)
     for (struct af_instance *af = s->first; af; af = af->next)
         af->control(af, cmd, arg);
 }
+
+// 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)
+{
+    if (frame) {
+        assert(mp_audio_config_equals(&af->fmt_out, frame));
+        MP_TARRAY_APPEND(af, af->out_queued, af->num_out_queued, frame);
+    }
+}
+
+static bool af_has_output_frame(struct af_instance *af)
+{
+    if (!af->num_out_queued && af->filter_out) {
+        if (af->filter_out(af) < 0)
+            MP_ERR(af, "Error filtering frame.\n");
+    }
+    return af->num_out_queued > 0;
+}
+
+static struct mp_audio *af_dequeue_output_frame(struct af_instance *af)
+{
+    struct mp_audio *res = NULL;
+    if (af_has_output_frame(af)) {
+        res = af->out_queued[0];
+        MP_TARRAY_REMOVE_AT(af->out_queued, af->num_out_queued, 0);
+    }
+    return res;
+}
+
+static int af_do_filter(struct af_instance *af, struct mp_audio *frame)
+{
+    if (frame)
+        assert(mp_audio_config_equals(&af->fmt_in, frame));
+    int r = af->filter_frame(af, frame);
+    if (r < 0)
+        MP_ERR(af, "Error filtering frame.\n");
+    return r;
+}
+
+// Input a frame into the filter chain. Ownership of frame is transferred.
+// Return >= 0 on success, < 0 on failure (even if output frames were produced)
+int af_filter_frame(struct af_stream *s, struct mp_audio *frame)
+{
+    assert(frame);
+    if (s->initialized < 1) {
+        talloc_free(frame);
+        return -1;
+    }
+    return af_do_filter(s->first, frame);
+}
+
+// Output the next queued frame (if any) from the full filter chain.
+// The frame can be retrieved with af_read_output_frame().
+//  eof: if set, assume there's no more input i.e. af_filter_frame() will
+//       not be called (until reset) - flush all internally delayed frames
+//  returns: -1: error, 0: no output, 1: output available
+int af_output_frame(struct af_stream *s, bool eof)
+{
+    if (s->last->num_out_queued)
+        return 1;
+    if (s->initialized < 1)
+        return -1;
+    while (1) {
+        struct af_instance *last = NULL;
+        for (struct af_instance * cur = s->first; cur; cur = cur->next) {
+            // 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) {
+                int r = af_do_filter(cur, NULL);
+                if (r < 0)
+                    return r;
+            }
+            if (af_has_output_frame(cur))
+                last = cur;
+        }
+        if (!last)
+            return 0;
+        if (!last->next)
+            return 1;
+        int r = af_do_filter(last->next, af_dequeue_output_frame(last));
+        if (r < 0)
+            return r;
+    }
+}
+
+struct mp_audio *af_read_output_frame(struct af_stream *s)
+{
+    if (!s->last->num_out_queued)
+        af_output_frame(s, false);
+    return af_dequeue_output_frame(s->last);
+}
+
+// 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)
+{
+    return mp_audio_pool_make_writeable(af->out_pool, frame);
+}
+
+void af_seek_reset(struct af_stream *s)
+{
+    af_control_all(s, AF_CONTROL_RESET, NULL);
+    af_chain_forget_frames(s);
+}

audio/filter/af.h

@@ -62,21 +62,29 @@ struct af_instance {
     struct replaygain_data *replaygain_data;
     int (*control)(struct af_instance *af, int cmd, void *arg);
     void (*uninit)(struct af_instance *af);
-    /* flags is a bit mask of AF_FILTER_FLAG_* values
-     * returns 0 on success, negative value on error
+    /* Feed a frame. The frame is NULL if EOF was reached, and the filter
+     * should drain all remaining buffered data.
+     * Use af_add_output_frame() to output data. The optional filter_out
+     * callback can be set to produce output frames gradually.
      */
-    int (*filter)(struct af_instance *af, struct mp_audio *data, int flags);
+    int (*filter_frame)(struct af_instance *af, struct mp_audio *frame);
+    int (*filter_out)(struct af_instance *af);
     void *priv;
     struct mp_audio *data; // configuration and buffer for outgoing data stream
+
     struct af_instance *next;
     struct af_instance *prev;
     double delay; /* Delay caused by the filter, in seconds of audio consumed
                    * without corresponding output */
-    double mul; /* length multiplier: how much does this instance change
-                 * the number of samples passed though. (Ratio of input
-                 * and output, e.g. mul=4 => 1 sample becomes 4 samples) .*/
     bool auto_inserted; // inserted by af.c, such as conversion filters
     char *label;
+
+    struct mp_audio fmt_in, fmt_out;
+
+    struct mp_audio **out_queued;
+    int num_out_queued;
+
+    struct mp_audio_pool *out_pool;
 };
 
 // Current audio stream
@@ -136,13 +144,16 @@ void af_uninit(struct af_stream *s);
 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 mp_audio_buffer;
-int af_filter(struct af_stream *s, struct mp_audio *data,
-              struct mp_audio_buffer *output);
 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);
+void af_seek_reset(struct af_stream *s);
+
+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);
+int af_make_writeable(struct af_instance *af, struct mp_audio *frame);
 
-double af_calc_filter_multiplier(struct af_stream *s);
 double af_calc_delay(struct af_stream *s);
 
 int af_test_output(struct af_instance *af, struct mp_audio *out);

audio/filter/af_bs2b.c

@@ -37,26 +37,49 @@ struct af_bs2b {
     t_bs2bdp filter;    ///< instance of a library filter
 };
 
-#define FILTER(name, type) \
-static int filter_##name(struct af_instance *af, struct mp_audio *data, int f) \
+#define DEF_FILTER(fmt, name) \
+static int filter_##name(struct af_instance *af, struct mp_audio *data) \
 { \
-    /* filter is called for all pairs of samples available in the buffer */ \
+    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, \
-        (type*)(data->planes[0]), data->samples); \
-\
+        (data->planes[0]), data->samples); \
+    af_add_output_frame(af, data); \
     return 0; \
 }
 
-FILTER(f, float)
-FILTER(s32, int32_t)
-FILTER(u32, uint32_t)
-FILTER(s24, bs2b_int24_t)
-FILTER(u24, bs2b_uint24_t)
-FILTER(s16, int16_t)
-FILTER(u16, uint16_t)
-FILTER(s8, int8_t)
-FILTER(u8, uint8_t)
+#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)
@@ -76,38 +99,10 @@ static int control(struct af_instance *af, int cmd, void *arg)
 
         /* check for formats supported by libbs2b
            and assign corresponding handlers */
-        switch (format) {
-            case AF_FORMAT_FLOAT:
-                af->filter = filter_f;
-                break;
-            case AF_FORMAT_S32:
-                af->filter = filter_s32;
-                break;
-            case AF_FORMAT_U32:
-                af->filter = filter_u32;
-                break;
-            case AF_FORMAT_S24:
-                af->filter = filter_s24;
-                break;
-            case AF_FORMAT_U24:
-                af->filter = filter_u24;
-                break;
-            case AF_FORMAT_S16:
-                af->filter = filter_s16;
-                break;
-            case AF_FORMAT_U16:
-                af->filter = filter_u16;
-                break;
-            case AF_FORMAT_S8:
-                af->filter = filter_s8;
-                break;
-            case AF_FORMAT_U8:
-                af->filter = filter_u8;
-                break;
-            default:
-                af->filter = filter_f;
-                mp_audio_set_format(af->data, AF_FORMAT_FLOAT);
-                break;
+        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

audio/filter/af_center.c

@@ -58,9 +58,14 @@ static int control(struct af_instance* af, int cmd, void* arg)
   return AF_UNKNOWN;
 }
 
-// Filter data through filter
-static int filter(struct af_instance* af, struct mp_audio* data, int flags)
+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
@@ -75,13 +80,14 @@ static int filter(struct af_instance* af, struct mp_audio* data, int flags)
     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=filter;
+  af->filter_frame = filter_frame;
   return AF_OK;
 }
 

audio/filter/af_channels.c

@@ -181,15 +181,20 @@ static int control(struct af_instance* af, int cmd, void* arg)
   return AF_UNKNOWN;
 }
 
-// Filter data through filter
-static int filter(struct af_instance* af, struct mp_audio* data, int flags)
+static int filter_frame(struct af_instance *af, struct mp_audio *c)
 {
-  struct mp_audio*       c = data;                      // Current working data
-  struct mp_audio*       l = af->data;                  // Local data
   af_channels_t* s = af->priv;
   int            i;
 
-  mp_audio_realloc_min(af->data, data->samples);
+  if (!c)
+    return 0;
+
+  struct mp_audio *l = mp_audio_pool_get(af->out_pool, &af->fmt_out, c->samples);
+  if (!l) {
+    talloc_free(c);
+    return -1;
+  }
+  mp_audio_copy_attributes(l, c);
 
   // Reset unused channels
   memset(l->planes[0],0,mp_audio_psize(c) / c->nch * l->nch);
@@ -199,17 +204,15 @@ static int filter(struct af_instance* af, struct mp_audio* data, int flags)
       copy(af, c->planes[0],l->planes[0],c->nch,s->route[i][FR],
            l->nch,s->route[i][TO],mp_audio_psize(c),c->bps);
 
-  // Set output data
-  c->planes[0] = l->planes[0];
-  mp_audio_set_channels(c, &l->channels);
-
+  talloc_free(c);
+  af_add_output_frame(af, l);
   return 0;
 }
 
 // Allocate memory and set function pointers
 static int af_open(struct af_instance* af){
     af->control=control;
-    af->filter=filter;
+    af->filter_frame = filter_frame;
     af_channels_t *s = af->priv;
 
     // If router scan commandline for routing pairs

audio/filter/af_convert24.c

@@ -71,13 +71,19 @@ static int control(struct af_instance *af, int cmd, void *arg)
 #define SHIFT(x) (((x)+1)*8)
 #endif
 
-static int filter(struct af_instance *af, struct mp_audio *data, int flags)
+static int filter(struct af_instance *af, struct mp_audio *data)
 {
-    mp_audio_realloc_min(af->data, data->samples);
+    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);
 
-    struct mp_audio *out = af->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);
@@ -86,7 +92,6 @@ static int filter(struct af_instance *af, struct mp_audio *data, int flags)
             ptr[1] = val >> SHIFT(1);
             ptr[2] = val >> SHIFT(2);
         }
-        mp_audio_set_format(data, af_fmt_change_bits(data->format, 24));
     } else {
         for (int s = 0; s < len; s++) {
             uint8_t *ptr = (uint8_t *)data->planes[0] + s * 3;
@@ -95,17 +100,17 @@ static int filter(struct af_instance *af, struct mp_audio *data, int flags)
                          | ptr[2] << SHIFT(2);
             *((uint32_t *)out->planes[0] + s) = val;
         }
-        mp_audio_set_format(data, af_fmt_change_bits(data->format, 32));
     }
 
-    data->planes[0] = out->planes[0];
+    talloc_free(data);
+    af_add_output_frame(af, out);
     return 0;
 }
 
 static int af_open(struct af_instance *af)
 {
     af->control = control;
-    af->filter = filter;
+    af->filter_frame = filter;
     return AF_OK;
 }
 

audio/filter/af_convertsignendian.c

@@ -71,8 +71,15 @@ static void si2us(void *data, int len, int bps)
     } while (i += bps);
 }
 
-static int filter(struct af_instance *af, struct mp_audio *data, int flags)
+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;
@@ -81,13 +88,14 @@ static int filter(struct af_instance *af, struct mp_audio *data, int flags)
         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 = filter;
+    af->filter_frame = filter;
     return AF_OK;
 }
 

audio/filter/af_delay.c

@@ -96,15 +96,19 @@ static void uninit(struct af_instance* af)
       free(((af_delay_t*)(af->priv))->q[i]);
 }
 
-// Filter data through filter
-static int filter(struct af_instance* af, struct mp_audio* data, int flags)
+static int filter_frame(struct af_instance *af, struct mp_audio *c)
 {
-  struct mp_audio*      c   = data;      // Current working data
+  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:{
@@ -152,6 +156,7 @@ static int filter(struct af_instance* af, struct mp_audio* data, int flags)
     }
   }
   s->ri = ri;
+  af_add_output_frame(af, c);
   return 0;
 }
 
@@ -159,7 +164,7 @@ static int filter(struct af_instance* af, struct mp_audio* data, int flags)
 static int af_open(struct af_instance* af){
     af->control=control;
     af->uninit=uninit;
-    af->filter=filter;
+    af->filter_frame = filter_frame;
     af_delay_t *s = af->priv;
     int n = 1;
     int i = 0;

audio/filter/af_drc.c

@@ -272,10 +272,18 @@ static void method2_float(af_drc_t *s, struct mp_audio *c)
   s->idx = (s->idx + 1) % NSAMPLES;
 }
 
-static int filter(struct af_instance* af, struct mp_audio* data, int flags)
+static int filter(struct af_instance *af, struct mp_audio *data)
 {
   af_drc_t *s = af->priv;
 
+  if (!data)
+    return 0;
+
+  if (af_make_writeable(af, data) < 0) {
+    talloc_free(data);
+    return -1;
+  }
+
   if(af->data->format == (AF_FORMAT_S16))
   {
     if (s->method == 2)
@@ -290,6 +298,7 @@ static int filter(struct af_instance* af, struct mp_audio* data, int flags)
     else
         method1_float(s, data);
   }
+  af_add_output_frame(af, data);
   return 0;
 }
 
@@ -297,7 +306,7 @@ static int filter(struct af_instance* af, struct mp_audio* data, int flags)
 static int af_open(struct af_instance* af){
   int i = 0;
   af->control=control;
-  af->filter=filter;
+  af->filter_frame = filter;
   af_drc_t *priv = af->priv;
 
   priv->mul = MUL_INIT;

audio/filter/af_dummy.c

@@ -41,15 +41,16 @@ static int control(struct af_instance* af, int cmd, void* arg)
 }
 
 // Filter data through filter
-static int filter(struct af_instance* af, struct mp_audio* data, int flags)
+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=filter;
+  af->filter_frame=filter;
   return AF_OK;
 }
 

audio/filter/af_equalizer.c

@@ -141,14 +141,20 @@ static int control(struct af_instance* af, int cmd, void* arg)
   return AF_UNKNOWN;
 }
 
-// Filter data through filter
-static int filter(struct af_instance* af, struct mp_audio* data, int flags)
+static int filter(struct af_instance* af, struct mp_audio* data)
 {
   struct mp_audio*       c      = data;                         // Current working data
+  if (!c)
+    return 0;
   af_equalizer_t*  s    = (af_equalizer_t*)af->priv;    // Setup
   uint32_t         ci   = af->data->nch;                // Index for channels
   uint32_t         nch  = af->data->nch;                // Number of channels
 
+  if (af_make_writeable(af, data) < 0) {
+    talloc_free(data);
+    return -1;
+  }
+
   while(ci--){
     float*      g   = s->g[ci];      // Gain factor
     float*      in  = ((float*)c->planes[0])+ci;
@@ -177,13 +183,14 @@ static int filter(struct af_instance* af, struct mp_audio* data, int flags)
       out+=nch;
     }
   }
+  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=filter;
+  af->filter_frame = filter;
   af_equalizer_t *priv = af->priv;
   for(int i=0;i<AF_NCH;i++){
       for(int j=0;j<KM;j++){

audio/filter/af_export.c

@@ -34,7 +34,6 @@
 #include "config.h"
 
 #include <sys/types.h>
-#include <sys/mman.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -163,8 +162,10 @@ static void uninit( struct af_instance* af )
    af audio filter instance
    data audio data
 */
-static int filter( struct af_instance* af, struct mp_audio* data, int flags)
+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
@@ -200,6 +201,7 @@ static int filter( struct af_instance* af, struct mp_audio* data, int flags)
            &(s->count), sizeof(s->count));
   }
 
+  af_add_output_frame(af, data);
   return 0;
 }
 
@@ -211,7 +213,7 @@ static int af_open( struct af_instance* af )
 {
   af->control = control;
   af->uninit  = uninit;
-  af->filter  = filter;
+  af->filter_frame = filter;
   af_export_t *priv = af->priv;
 
   if (!priv->filename || !priv->filename[0]) {

audio/filter/af_extrastereo.c

@@ -35,9 +35,6 @@ typedef struct af_extrastereo_s
     float mul;
 }af_extrastereo_t;
 
-static int play_s16(struct af_instance* af, struct mp_audio* data, int f);
-static int play_float(struct af_instance* af, struct mp_audio* data, int f);
-
 // Initialization and runtime control
 static int control(struct af_instance* af, int cmd, void* arg)
 {
@@ -49,14 +46,8 @@ static int control(struct af_instance* af, int cmd, void* arg)
     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)
-    {
-        af->filter = play_float;
-    }// else
-    {
+    if (af->data->format != AF_FORMAT_FLOAT)
         mp_audio_set_format(af->data, AF_FORMAT_S16);
-        af->filter = play_s16;
-    }
 
     return af_test_output(af,(struct mp_audio*)arg);
   }
@@ -65,9 +56,8 @@ static int control(struct af_instance* af, int cmd, void* arg)
 }
 
 // Filter data through filter
-static int play_s16(struct af_instance* af, struct mp_audio* data, int f)
+static void play_s16(af_extrastereo_t *s, struct mp_audio* data)
 {
-  af_extrastereo_t *s = af->priv;
   register int i = 0;
   int16_t *a = (int16_t*)data->planes[0];       // Audio data
   int len = data->samples*data->nch;            // Number of samples
@@ -83,13 +73,10 @@ static int play_s16(struct af_instance* af, struct mp_audio* data, int f)
     a[i] = MPCLAMP(l, SHRT_MIN, SHRT_MAX);
     a[i + 1] = MPCLAMP(r, SHRT_MIN, SHRT_MAX);
   }
-
-  return 0;
 }
 
-static int play_float(struct af_instance* af, struct mp_audio* data, int f)
+static void play_float(af_extrastereo_t *s, struct mp_audio* data)
 {
-  af_extrastereo_t *s = af->priv;
   register int i = 0;
   float *a = (float*)data->planes[0];   // Audio data
   int len = data->samples * data->nch;  // Number of samples
@@ -105,14 +92,29 @@ static int play_float(struct af_instance* af, struct mp_audio* data, int f)
     a[i] = af_softclip(l);
     a[i + 1] = af_softclip(r);
   }
+}
 
-  return 0;
+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=play_s16;
+  af->filter_frame = filter_frame;
 
   return AF_OK;
 }

audio/filter/af_forcespeed.c

@@ -44,9 +44,11 @@ static int control(struct af_instance *af, int cmd, void *arg)
     return AF_UNKNOWN;
 }
 
-static int filter(struct af_instance *af, struct mp_audio *data, int flags)
+static int filter(struct af_instance *af, struct mp_audio *data)
 {
-    mp_audio_copy_config(data, af->data);
+    if (data)
+        mp_audio_copy_config(data, af->data);
+    af_add_output_frame(af, data);
     return 0;
 }
 
@@ -54,7 +56,7 @@ static int af_open(struct af_instance *af)
 {
     struct priv *priv = af->priv;
     af->control = control;
-    af->filter = filter;
+    af->filter_frame = filter;
     priv->speed = 1.0;
     return AF_OK;
 }

audio/filter/af_format.c

@@ -95,16 +95,18 @@ static int control(struct af_instance *af, int cmd, void *arg)
     return AF_UNKNOWN;
 }
 
-static int filter(struct af_instance *af, struct mp_audio *data, int flags)
+static int filter(struct af_instance *af, struct mp_audio *data)
 {
-    mp_audio_copy_config(data, af->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)
 {
     af->control = control;
-    af->filter = filter;
+    af->filter_frame = filter;
 
     force_in_params(af, af->data);
     force_out_params(af, af->data);

audio/filter/af_hrtf.c

@@ -280,8 +280,13 @@ static inline void update_ch(af_hrtf_t *s, short *in, const int k)
     }
 
     /* We need to update the bass compensation delay line, too. */
-    s->ba_l[k] = in[0] + in[4] + in[2];
-    s->ba_r[k] = in[4] + in[1] + in[3];
+    // TODO: should this use lf/cf/rf etc. instead?
+    s->ba_l[k] = in[0];
+    s->ba_r[k] = in[1];
+    if (s->decode_mode == HRTF_MIX_51) {
+        s->ba_l[k] += in[4] + in[2];
+        s->ba_r[k] += in[4] + in[3];
+    }
 }
 
 static void clear_coeff(af_hrtf_t *s, float *c)
@@ -370,17 +375,26 @@ frequencies).
 2. A bass compensation is introduced to ensure that 0-200 Hz are not
 damped (without any real 3D acoustical image, however).
 */
-static int filter(struct af_instance *af, struct mp_audio *data, int flags)
+static int filter(struct af_instance *af, struct mp_audio *data)
 {
     af_hrtf_t *s = af->priv;
+
+    if (!data)
+        return 0;
+    struct mp_audio *outframe =
+        mp_audio_pool_get(af->out_pool, &af->fmt_out, data->samples);
+    if (!outframe) {
+        talloc_free(data);
+        return -1;
+    }
+    mp_audio_copy_attributes(outframe, data);
+
     short *in = data->planes[0]; // Input audio data
-    short *out = NULL; // Output audio data
+    short *out = outframe->planes[0]; // Output audio data
     short *end = in + data->samples * data->nch; // Loop end
     float common, left, right, diff, left_b, right_b;
     const int dblen = s->dlbuflen, hlen = s->hrflen, blen = s->basslen;
 
-    mp_audio_realloc_min(af->data, data->samples);
-
     if(s->print_flag) {
         s->print_flag = 0;
         switch (s->decode_mode) {
@@ -407,8 +421,6 @@ static int filter(struct af_instance *af, struct mp_audio *data, int flags)
                  "channel\n");
     }
 
-    out = af->data->planes[0];
-
     /* MPlayer's 5 channel layout (notation for the variable):
      *
      * 0: L (LF), 1: R (RF), 2: Ls (LR), 3: Rs (RR), 4: C (CF), matrix
@@ -546,10 +558,8 @@ static int filter(struct af_instance *af, struct mp_audio *data, int flags)
             s->cyc_pos += dblen;
     }
 
-    /* Set output data */
-    data->planes[0] = af->data->planes[0];
-    mp_audio_set_num_channels(data, 2);
-
+    talloc_free(data);
+    af_add_output_frame(af, outframe);
     return 0;
 }
 
@@ -583,7 +593,7 @@ static int af_open(struct af_instance* af)
 
     af->control = control;
     af->uninit = uninit;
-    af->filter = filter;
+    af->filter_frame = filter;
 
     s = af->priv;
 

audio/filter/af_karaoke.c

@@ -41,10 +41,15 @@ static int control(struct af_instance* af, int cmd, void* arg)
         return AF_UNKNOWN;
 }
 
-// Filter data through filter
-static int play(struct af_instance* af, struct mp_audio* data, int flags)
+static int filter_frame(struct af_instance *af, struct mp_audio *c)
 {
-        struct mp_audio*        c       = data;          // Current working data
+        if (!c)
+                return 0;
+        if (af_make_writeable(af, c) < 0) {
+                talloc_free(c);
+                return 0;
+        }
+
         float*          a       = c->planes[0];  // Audio data
         int                     nch     = c->nch;        // Number of channels
         int                     len     = c->samples*nch;        // Number of samples in current audio block
@@ -62,13 +67,14 @@ static int play(struct af_instance* af, struct mp_audio* data, int flags)
                 a[i+1]=a[i];
         }
 
+        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->filter      = play;
+        af->filter_frame = filter_frame;
         return AF_OK;
 }
 

audio/filter/af_ladspa.c

@@ -565,7 +565,10 @@ static void uninit(struct af_instance *af) {
  * \return      Either AF_ERROR or AF_OK
  */
 
-static int filter(struct af_instance *af, struct mp_audio *data, int flags) {
+static int filter_frame(struct af_instance *af, struct mp_audio *data)
+{
+    if (!data)
+        return 0;
     af_ladspa_t *setup = af->priv;
     const LADSPA_Descriptor *pdes = setup->plugin_descriptor;
     float *audio = (float*)data->planes[0];
@@ -574,8 +577,14 @@ static int filter(struct af_instance *af, struct mp_audio *data, int flags) {
     int rate = data->rate;
     int i, p;
 
-    if (setup->status !=AF_OK)
+    if (setup->status !=AF_OK) {
+        talloc_free(data);
         return -1;
+    }
+    if (af_make_writeable(af, data) < 0) {
+        talloc_free(data);
+        return -1;
+    }
 
     /* See if it's the first call. If so, setup inbufs/outbufs, instantiate
      * plugin, connect ports and activate plugin
@@ -721,6 +730,7 @@ static int filter(struct af_instance *af, struct mp_audio *data, int flags) {
 
     /* done */
 
+    af_add_output_frame(af, data);
     return 0;
 }
 
@@ -737,7 +747,7 @@ static int af_open(struct af_instance *af) {
 
     af->control=control;
     af->uninit=uninit;
-    af->filter=filter;
+    af->filter_frame = filter_frame;
 
     af_ladspa_t *setup = af->priv;
 

audio/filter/af_lavcac3enc.c

@@ -53,7 +53,8 @@ typedef struct af_ac3enc_s {
     struct AVCodecContext *lavc_actx;
     AVPacket pkt;
     int bit_rate;
-    struct mp_audio_buffer *pending;
+    struct mp_audio *input;     // frame passed to libavcodec
+    struct mp_audio *pending;   // unconsumed input data
     int in_samples;     // samples of input per AC3 frame
     int out_samples;    // upper bound on encoded output per AC3 frame
     int in_sampleformat;
@@ -100,12 +101,16 @@ static int control(struct af_instance *af, int cmd, void *arg)
         } else {
             s->out_samples = AC3_MAX_CODED_FRAME_SIZE / af->data->sstride;
         }
-        af->mul = s->out_samples / (double)s->in_samples;
 
-        mp_audio_buffer_reinit(s->pending, in);
+        mp_audio_copy_config(s->input, in);
+        mp_audio_realloc(s->input, s->in_samples);
+        s->input->samples = 0;
 
-        MP_DBG(af, "af_lavcac3enc reinit: %d, %d, %f, %d.\n",
-               in->nch, in->rate, af->mul, s->in_samples);
+        talloc_free(s->pending);
+        s->pending = NULL;
+
+        MP_DBG(af, "af_lavcac3enc reinit: %d, %d, %d.\n",
+               in->nch, in->rate, s->in_samples);
 
         int bit_rate = s->bit_rate ? s->bit_rate : default_bit_rate[in->nch];
 
@@ -148,111 +153,110 @@ static void uninit(struct af_instance* af)
             avcodec_close(s->lavc_actx);
             av_free(s->lavc_actx);
         }
+        talloc_free(s->pending);
     }
 }
 
+static int filter_frame(struct af_instance *af, struct mp_audio *audio)
+{
+    af_ac3enc_t *s = af->priv;
+
+    // filter_output must have been called until no output was produced.
+    if (s->pending && s->pending->samples)
+        MP_ERR(af, "broken data flow\n");
+
+    talloc_free(s->pending);
+    s->pending = audio;
+    return 0;
+}
+
 static void swap_16(uint16_t *ptr, size_t size)
 {
     for (size_t n = 0; n < size; n++)
         ptr[n] = av_bswap16(ptr[n]);
 }
 
-// Filter data through filter
-static int filter(struct af_instance* af, struct mp_audio* audio, int flags)
+// Copy data from input frame to encode frame (because libavcodec wants a full
+// AC3 frame for encoding, while filter input frames can be smaller or larger).
+// Return true if the
+static bool fill_buffer(af_ac3enc_t *s)
+{
+    if (s->pending) {
+        int copy = MPMIN(s->in_samples - s->input->samples, s->pending->samples);
+        s->input->samples += copy;
+        mp_audio_copy(s->input, s->input->samples - copy, s->pending, 0, copy);
+        mp_audio_skip_samples(s->pending, copy);
+    }
+    return s->input->samples >= s->in_samples;
+}
+
+static int filter_out(struct af_instance *af)
 {
-    struct mp_audio *out = af->data;
     af_ac3enc_t *s = af->priv;
-    int num_frames = (audio->samples + mp_audio_buffer_samples(s->pending))
-                     / s->in_samples;
+    if (!fill_buffer(s))
+        return 0; // need more input
 
-    int max_out_samples = s->out_samples * num_frames;
-    mp_audio_realloc_min(out, max_out_samples);
-    out->samples = 0;
+    AVFrame *frame = av_frame_alloc();
+    if (!frame) {
+        MP_FATAL(af, "Could not allocate memory \n");
+        return -1;
+    }
+    frame->nb_samples = s->in_samples;
+    frame->format = s->lavc_actx->sample_fmt;
+    frame->channel_layout = s->lavc_actx->channel_layout;
+    assert(s->input->num_planes <= AV_NUM_DATA_POINTERS);
+    frame->extended_data = frame->data;
+    for (int n = 0; n < s->input->num_planes; n++)
+        frame->data[n] = s->input->planes[n];
+    frame->linesize[0] = s->input->samples * s->input->sstride;
 
-    while (audio->samples > 0) {
-        int ret;
-
-        int consumed_pending = 0;
-        struct mp_audio in_frame;
-        int pending = mp_audio_buffer_samples(s->pending);
-        if (pending == 0 && audio->samples >= s->in_samples) {
-            in_frame = *audio;
-            mp_audio_skip_samples(audio, s->in_samples);
-        } else {
-            if (pending > 0 && pending < s->in_samples) {
-                struct mp_audio tmp = *audio;
-                tmp.samples = MPMIN(tmp.samples, s->in_samples);
-                mp_audio_buffer_append(s->pending, &tmp);
-                mp_audio_skip_samples(audio, tmp.samples);
-            }
-            mp_audio_buffer_peek(s->pending, &in_frame);
-            if (in_frame.samples < s->in_samples)
-                break;
-            consumed_pending = s->in_samples;
-        }
-        in_frame.samples = s->in_samples;
-
-        AVFrame *frame = av_frame_alloc();
-        if (!frame) {
-            MP_FATAL(af, "Could not allocate memory \n");
-            return -1;
-        }
-        frame->nb_samples = s->in_samples;
-        frame->format = s->lavc_actx->sample_fmt;
-        frame->channel_layout = s->lavc_actx->channel_layout;
-        assert(in_frame.num_planes <= AV_NUM_DATA_POINTERS);
-        frame->extended_data = frame->data;
-        for (int n = 0; n < in_frame.num_planes; n++)
-            frame->data[n] = in_frame.planes[n];
-        frame->linesize[0] = s->in_samples * audio->sstride;
-
-        int ok;
-        ret = avcodec_encode_audio2(s->lavc_actx, &s->pkt, frame, &ok);
-        av_frame_free(&frame);
-        if (ret < 0 || !ok) {
-            MP_FATAL(af, "Encode failed.\n");
-            return -1;
-        }
-
-        mp_audio_buffer_skip(s->pending, consumed_pending);
-
-        MP_DBG(af, "avcodec_encode_audio got %d, pending %d.\n",
-               s->pkt.size, mp_audio_buffer_samples(s->pending));
-
-        int frame_size = s->pkt.size;
-        int header_len = 0;
-        char hdr[8];
-
-        if (s->cfg_add_iec61937_header && s->pkt.size > 5) {
-            int bsmod = s->pkt.data[5] & 0x7;
-            int len = frame_size;
-
-            frame_size = AC3_FRAME_SIZE * 2 * 2;
-            header_len = 8;
-
-            AV_WL16(hdr,     0xF872);   // iec 61937 syncword 1
-            AV_WL16(hdr + 2, 0x4E1F);   // iec 61937 syncword 2
-            hdr[5] = bsmod;             // bsmod
-            hdr[4] = 0x01;              // data-type ac3
-            AV_WL16(hdr + 6, len << 3); // number of bits in payload
-        }
-
-        size_t max_size = (max_out_samples - out->samples) * out->sstride;
-        if (frame_size > max_size)
-            abort();
-
-        char *buf = (char *)out->planes[0] + out->samples * out->sstride;
-        memcpy(buf, hdr, header_len);
-        memcpy(buf + header_len, s->pkt.data, s->pkt.size);
-        memset(buf + header_len + s->pkt.size, 0,
-               frame_size - (header_len + s->pkt.size));
-        swap_16((uint16_t *)(buf + header_len), s->pkt.size / 2);
-        out->samples += frame_size / out->sstride;
+    int ok;
+    int lavc_ret = avcodec_encode_audio2(s->lavc_actx, &s->pkt, frame, &ok);
+    av_frame_free(&frame);
+    s->input->samples = 0;
+    if (lavc_ret < 0 || !ok) {
+        MP_FATAL(af, "Encode failed.\n");
+        return -1;
     }
 
-    mp_audio_buffer_append(s->pending, audio);
+    MP_DBG(af, "avcodec_encode_audio got %d, pending %d.\n",
+            s->pkt.size, s->pending->samples);
 
-    *audio = *out;
+    struct mp_audio *out =
+        mp_audio_pool_get(af->out_pool, af->data, s->out_samples);
+    if (!out)
+        return -1;
+    mp_audio_copy_attributes(out, s->pending);
+
+    int frame_size = s->pkt.size;
+    int header_len = 0;
+    char hdr[8];
+
+    if (s->cfg_add_iec61937_header && s->pkt.size > 5) {
+        int bsmod = s->pkt.data[5] & 0x7;
+        int len = frame_size;
+
+        frame_size = AC3_FRAME_SIZE * 2 * 2;
+        header_len = 8;
+
+        AV_WL16(hdr,     0xF872);   // iec 61937 syncword 1
+        AV_WL16(hdr + 2, 0x4E1F);   // iec 61937 syncword 2
+        hdr[5] = bsmod;             // bsmod
+        hdr[4] = 0x01;              // data-type ac3
+        AV_WL16(hdr + 6, len << 3); // number of bits in payload
+    }
+
+    if (frame_size > out->samples * out->sstride)
+        abort();
+
+    char *buf = (char *)out->planes[0];
+    memcpy(buf, hdr, header_len);
+    memcpy(buf + header_len, s->pkt.data, s->pkt.size);
+    memset(buf + header_len + s->pkt.size, 0,
+            frame_size - (header_len + s->pkt.size));
+    swap_16((uint16_t *)(buf + header_len), s->pkt.size / 2);
+    out->samples = frame_size / out->sstride;
+    af_add_output_frame(af, out);
     return 0;
 }
 
@@ -261,7 +265,8 @@ static int af_open(struct af_instance* af){
     af_ac3enc_t *s = af->priv;
     af->control=control;
     af->uninit=uninit;
-    af->filter=filter;
+    af->filter_frame = filter_frame;
+    af->filter_out = filter_out;
 
     s->lavc_acodec = avcodec_find_encoder_by_name("ac3");
     if (!s->lavc_acodec) {
@@ -292,7 +297,7 @@ static int af_open(struct af_instance* af){
 
     av_init_packet(&s->pkt);
 
-    s->pending = mp_audio_buffer_create(af);
+    s->input = talloc_zero(s, struct mp_audio);
 
     if (s->cfg_bit_rate) {
         int i;

audio/filter/af_lavfi.c

@@ -201,83 +201,92 @@ static int control(struct af_instance *af, int cmd, void *arg)
 
         p->timebase_out = l_out->time_base;
 
-        // Blatantly incorrect; we don't know what the filters do.
-        af->mul = out->rate / (double)in->rate;
-
         return mp_audio_config_equals(in, &orig_in) ? AF_OK : AF_FALSE;
     }
     }
     return AF_UNKNOWN;
 }
 
-static int filter(struct af_instance *af, struct mp_audio *data, int flags)
+static int filter_frame(struct af_instance *af, struct mp_audio *data)
 {
     struct priv *p = af->priv;
-    struct mp_audio *r = af->data;
-    bool eof = data->samples == 0 && (flags & AF_FILTER_FLAG_EOF);
     AVFilterLink *l_in = p->in->outputs[0];
 
-    AVFrame *frame = av_frame_alloc();
-    frame->nb_samples = data->samples;
-    frame->format = l_in->format;
+    AVFrame *frame = NULL;
+    if (data) {
+        frame = av_frame_alloc();
+        if (!frame)
+            goto error;
 
-    // Timebase is 1/sample_rate
-    frame->pts = p->samples_in;
+        frame->nb_samples = data->samples;
+        frame->format = l_in->format;
 
-    frame->channel_layout = l_in->channel_layout;
-    frame->sample_rate = l_in->sample_rate;
+        // Timebase is 1/sample_rate
+        frame->pts = p->samples_in;
+
+        frame->channel_layout = l_in->channel_layout;
+        frame->sample_rate = l_in->sample_rate;
 #if LIBAVFILTER_VERSION_MICRO >= 100
-    // FFmpeg being a stupid POS
-    frame->channels = l_in->channels;
+        // FFmpeg being a stupid POS
+        frame->channels = l_in->channels;
 #endif
 
-    frame->extended_data = frame->data;
-    for (int n = 0; n < data->num_planes; n++)
-        frame->data[n] = data->planes[n];
-    frame->linesize[0] = frame->nb_samples * data->sstride;
+        frame->extended_data = frame->data;
+        for (int n = 0; n < data->num_planes; n++)
+            frame->data[n] = data->planes[n];
+        frame->linesize[0] = frame->nb_samples * data->sstride;
 
-    if (av_buffersrc_add_frame(p->in, eof ? NULL : frame) < 0) {
-        av_frame_free(&frame);
-        return -1;
+        p->samples_in += data->samples;
     }
+
+    if (av_buffersrc_add_frame(p->in, frame) < 0)
+        goto error;
+
     av_frame_free(&frame);
+    talloc_free(data);
+    return 0;
+error:
+    av_frame_free(&frame);
+    talloc_free(data);
+    return -1;
+}
 
-    int64_t out_pts = AV_NOPTS_VALUE;
-    r->samples = 0;
-    for (;;) {
-        frame = av_frame_alloc();
-        if (av_buffersink_get_frame(p->out, frame) < 0) {
-            // Not an error situation - no more output buffers in queue.
-            av_frame_free(&frame);
-            break;
-        }
+static int filter_out(struct af_instance *af)
+{
+    struct priv *p = af->priv;
 
-        mp_audio_realloc_min(r, r->samples + frame->nb_samples);
-        for (int n = 0; n < r->num_planes; n++) {
-            memcpy((char *)r->planes[n] + r->samples * r->sstride,
-                   frame->extended_data[n], frame->nb_samples * r->sstride);
-        }
-        r->samples += frame->nb_samples;
-
-        if (out_pts == AV_NOPTS_VALUE)
-            out_pts = frame->pts;
+    AVFrame *frame = av_frame_alloc();
+    if (!frame)
+        goto error;
 
+    int err = av_buffersink_get_frame(p->out, frame);
+    if (err == AVERROR(EAGAIN) || err == AVERROR_EOF) {
+        // Not an error situation - no more output buffers in queue.
         av_frame_free(&frame);
+        return 0;
     }
 
-    p->samples_in += data->samples;
+    struct mp_audio *out = mp_audio_from_avframe(frame);
+    if (!out)
+        goto error;
 
-    if (out_pts != AV_NOPTS_VALUE) {
-        double in_time = p->samples_in / (double)data->rate;
-        double out_time = out_pts * av_q2d(p->timebase_out);
+    mp_audio_copy_config(out, af->data);
+
+    if (frame->pts != AV_NOPTS_VALUE) {
+        double in_time = p->samples_in / (double)af->fmt_in.rate;
+        double out_time = frame->pts * av_q2d(p->timebase_out);
         // Need pts past the last output sample.
-        out_time += r->samples / (double)r->rate;
+        out_time += out->samples / (double)out->rate;
 
         af->delay = in_time - out_time;
     }
 
-    *data = *r;
+    af_add_output_frame(af, out);
+    av_frame_free(&frame);
     return 0;
+error:
+    av_frame_free(&frame);
+    return -1;
 }
 
 static void uninit(struct af_instance *af)
@@ -289,7 +298,8 @@ static int af_open(struct af_instance *af)
 {
     af->control = control;
     af->uninit = uninit;
-    af->filter = filter;
+    af->filter_frame = filter_frame;
+    af->filter_out = filter_out;
     // Removing this requires fixing AVFrame.data vs. AVFrame.extended_data
     assert(MP_NUM_CHANNELS <= AV_NUM_DATA_POINTERS);
     return AF_OK;

audio/filter/af_lavrresample.c

@@ -82,7 +82,7 @@ struct af_resample {
     // At least libswresample keeps a pointer around for this:
     int reorder_in[MP_NUM_CHANNELS];
     int reorder_out[MP_NUM_CHANNELS];
-    uint8_t *reorder_buffer;
+    struct mp_audio_pool *reorder_buffer;
 };
 
 #if HAVE_LIBAVRESAMPLE
@@ -248,8 +248,6 @@ static int control(struct af_instance *af, int cmd, void *arg)
         if (af_to_avformat(out->format) == AV_SAMPLE_FMT_NONE)
             mp_audio_set_format(out, in->format);
 
-        af->mul     = out->rate / (double)in->rate;
-
         int r = ((in->format == orig_in.format) &&
                 mp_chmap_equals(&in->channels, &orig_in.channels))
                 ? AF_OK : AF_FALSE;
@@ -311,47 +309,69 @@ static void reorder_planes(struct mp_audio *mpa, int *reorder)
     }
 }
 
-static int filter(struct af_instance *af, struct mp_audio *data, int flags)
+static int resample_frame(struct AVAudioResampleContext *r,
+                          struct mp_audio *out, struct mp_audio *in)
+{
+    return avresample_convert(r,
+        out ? (uint8_t **)out->planes : NULL,
+        out ? mp_audio_get_allocated_size(out) : 0,
+        out ? out->samples : 0,
+        in ? (uint8_t **)in->planes : NULL,
+        in ? mp_audio_get_allocated_size(in) : 0,
+        in ? in->samples : 0);
+}
+
+static int filter(struct af_instance *af, struct mp_audio *in)
 {
     struct af_resample *s = af->priv;
-    struct mp_audio *in   = data;
-    struct mp_audio *out  = af->data;
 
-    out->samples = avresample_available(s->avrctx) +
-        av_rescale_rnd(get_delay(s) + in->samples,
+    int samples = avresample_available(s->avrctx) +
+        av_rescale_rnd(get_delay(s) + (in ? in->samples : 0),
                        s->ctx.out_rate, s->ctx.in_rate, AV_ROUND_UP);
+    struct mp_audio *out = mp_audio_pool_get(af->out_pool, af->data, samples);
+    if (!out)
+        goto error;
+    if (in)
+        mp_audio_copy_attributes(out, in);
 
     mp_audio_realloc_min(out, out->samples);
 
     af->delay = get_delay(s) / (double)s->ctx.in_rate;
 
     if (out->samples) {
-        out->samples = avresample_convert(s->avrctx,
-            (uint8_t **) out->planes, out->samples * out->sstride, out->samples,
-            (uint8_t **) in->planes,  in->samples  * in->sstride,  in->samples);
+        out->samples = resample_frame(s->avrctx, out, in);
         if (out->samples < 0)
-            return -1; // error
+            goto error;
     }
 
-    *data = *out;
-
     if (needs_reorder(s->reorder_out, out->nch)) {
         if (af_fmt_is_planar(out->format)) {
-            reorder_planes(data, s->reorder_out);
+            reorder_planes(out, s->reorder_out);
         } else if (out->samples) {
-            int out_size = out->samples * out->sstride;
-            if (talloc_get_size(s->reorder_buffer) < out_size)
-                s->reorder_buffer = talloc_realloc_size(s, s->reorder_buffer, out_size);
-            data->planes[0] = s->reorder_buffer;
-            int out_samples = avresample_convert(s->avrctx_out,
-                    (uint8_t **) data->planes, out_size, out->samples,
-                    (uint8_t **) out->planes, out_size, out->samples);
-            if (out_samples < 0)
-                MP_ERR(af, "Reordering failed.\n");
+            struct mp_audio *new = mp_audio_pool_get(s->reorder_buffer, out,
+                                                     out->samples);
+            if (!new)
+                goto error;
+            mp_audio_copy_attributes(new, out);
+            int out_samples = resample_frame(s->avrctx_out, new, out);
+            talloc_free(out);
+            out = new;
+            if (out_samples != new->samples)
+                goto error;
         }
     }
 
+    talloc_free(in);
+    if (out->samples) {
+        af_add_output_frame(af, out);
+    } else {
+        talloc_free(out);
+    }
     return 0;
+error:
+    talloc_free(in);
+    talloc_free(out);
+    return -1;
 }
 
 static int af_open(struct af_instance *af)
@@ -360,13 +380,14 @@ static int af_open(struct af_instance *af)
 
     af->control = control;
     af->uninit  = uninit;
-    af->filter  = filter;
+    af->filter_frame = filter;
 
     if (s->opts.cutoff <= 0.0)
         s->opts.cutoff = af_resample_default_cutoff(s->opts.filter_size);
 
     s->avrctx = avresample_alloc_context();
     s->avrctx_out = avresample_alloc_context();
+    s->reorder_buffer = mp_audio_pool_create(s);
 
     if (s->avrctx && s->avrctx_out) {
         return AF_OK;

audio/filter/af_pan.c

@@ -107,11 +107,17 @@ static int control(struct af_instance* af, int cmd, void* arg)
   return AF_UNKNOWN;
 }
 
-// Filter data through filter
-static int filter(struct af_instance* af, struct mp_audio* data, int flags)
+static int filter_frame(struct af_instance *af, struct mp_audio *c)
 {
-  struct mp_audio*    c    = data;              // Current working data
-  struct mp_audio*      l    = af->data;        // Local data
+  if (!c)
+    return 0;
+  struct mp_audio *l = mp_audio_pool_get(af->out_pool, &af->fmt_out, c->samples);
+  if (!l) {
+    talloc_free(c);
+    return -1;
+  }
+  mp_audio_copy_attributes(l, c);
+
   af_pan_t*     s    = af->priv;        // Setup for this instance
   float*        in   = c->planes[0];    // Input audio data
   float*        out  = NULL;            // Output audio data
@@ -120,8 +126,6 @@ static int filter(struct af_instance* af, struct mp_audio* data, int flags)
   int           ncho = l->nch;          // Number of output channels
   register int  j,k;
 
-  mp_audio_realloc_min(af->data, data->samples);
-
   out = l->planes[0];
   // Execute panning
   // FIXME: Too slow
@@ -137,17 +141,15 @@ static int filter(struct af_instance* af, struct mp_audio* data, int flags)
     in+= nchi;
   }
 
-  // Set output data
-  c->planes[0] = l->planes[0];
-  set_channels(c, l->nch);
-
+  talloc_free(c);
+  af_add_output_frame(af, l);
   return 0;
 }
 
 // Allocate memory and set function pointers
 static int af_open(struct af_instance* af){
     af->control=control;
-    af->filter=filter;
+    af->filter_frame = filter_frame;
     af_pan_t *s = af->priv;
     int   n = 0;
     int   j,k;

audio/filter/af_scaletempo.c

@@ -84,7 +84,7 @@ typedef struct af_scaletempo_s
 static int fill_queue(struct af_instance *af, struct mp_audio *data, int offset)
 {
     af_scaletempo_t *s = af->priv;
-    int bytes_in = mp_audio_psize(data) - offset;
+    int bytes_in = (data ? mp_audio_psize(data) : 0) - offset;
     int offset_unchanged = offset;
 
     if (s->bytes_to_slide > 0) {
@@ -210,21 +210,28 @@ static void output_overlap_s16(af_scaletempo_t *s, void *buf_out,
     }
 }
 
-// Filter data through filter
-static int filter(struct af_instance *af, struct mp_audio *data, int flags)
+static int filter(struct af_instance *af, struct mp_audio *data)
 {
     af_scaletempo_t *s = af->priv;
 
     if (s->scale == 1.0) {
         af->delay = 0;
+        af_add_output_frame(af, data);
         return 0;
     }
 
-    mp_audio_realloc_min(af->data,
-        ((int)(data->samples / s->frames_stride_scaled) + 1) * s->frames_stride);
+    int in_samples = data ? data->samples : 0;
+    struct mp_audio *out = mp_audio_pool_get(af->out_pool, af->data,
+        ((int)(in_samples / s->frames_stride_scaled) + 1) * s->frames_stride);
+    if (!out) {
+        talloc_free(data);
+        return -1;
+    }
+    if (data)
+        mp_audio_copy_attributes(out, data);
 
     int offset_in = fill_queue(af, data, 0);
-    int8_t *pout = af->data->planes[0];
+    int8_t *pout = out->planes[0];
     while (s->bytes_queued >= s->bytes_queue) {
         int ti;
         float tf;
@@ -257,10 +264,15 @@ static int filter(struct af_instance *af, struct mp_audio *data, int flags)
     // output corresponding to some length of input can be decided and written
     // after receiving only a part of that input.
     af->delay = (s->bytes_queued - s->bytes_to_slide) / s->scale
-                / af->data->sstride / af->data->rate;
+                / out->sstride / out->rate;
 
-    data->planes[0] = af->data->planes[0];
-    data->samples   = (pout - (int8_t *)af->data->planes[0]) / af->data->sstride;
+    out->samples = (pout - (int8_t *)out->planes[0]) / out->sstride;
+    talloc_free(data);
+    if (out->samples) {
+        af_add_output_frame(af, out);
+    } else {
+        talloc_free(out);
+    }
     return 0;
 }
 
@@ -285,7 +297,6 @@ static int control(struct af_instance *af, int cmd, void *arg)
             if (s->speed_tempo && s->speed_pitch)
                 return AF_DETACH;
             af->delay = 0;
-            af->mul = 1;
             return af_test_output(af, data);
         }
 
@@ -300,7 +311,6 @@ static int control(struct af_instance *af, int cmd, void *arg)
         s->bytes_stride         = s->frames_stride * bps * nch;
         s->frames_stride_scaled = s->scale * s->frames_stride;
         s->frames_stride_error  = 0;
-        af->mul = 1.0 / s->scale;
         af->delay = 0;
 
         int frames_overlap = s->frames_stride * s->percent_overlap;
@@ -456,7 +466,7 @@ static int af_open(struct af_instance *af)
 
     af->control   = control;
     af->uninit    = uninit;
-    af->filter    = filter;
+    af->filter_frame = filter;
 
     s->speed_tempo = !!(s->speed_opt & SCALE_TEMPO);
     s->speed_pitch = !!(s->speed_opt & SCALE_PITCH);

audio/filter/af_sinesuppress.c

@@ -41,9 +41,6 @@ typedef struct af_sinesuppress_s
     double pos;
 }af_sinesuppress_t;
 
-static int play_s16(struct af_instance* af, struct mp_audio* data, int f);
-//static struct mp_audio* play_float(struct af_instance* af, struct mp_audio* data);
-
 // Initialization and runtime control
 static int control(struct af_instance* af, int cmd, void* arg)
 {
@@ -54,18 +51,7 @@ static int control(struct af_instance* af, int cmd, void* arg)
 
     mp_audio_copy_config(af->data, (struct mp_audio*)arg);
     mp_audio_set_num_channels(af->data, 1);
-#if 0
-    if (((struct mp_audio*)arg)->format == AF_FORMAT_FLOAT)
-    {
-        af->data->format = AF_FORMAT_FLOAT;
-        af->data->bps = 4;
-        af->play = play_float;
-    }// else
-#endif
-    {
-        mp_audio_set_format(af->data, AF_FORMAT_S16);
-        af->filter = play_s16;
-    }
+    mp_audio_set_format(af->data, AF_FORMAT_S16);
 
     return af_test_output(af,(struct mp_audio*)arg);
   }
@@ -73,9 +59,15 @@ static int control(struct af_instance* af, int cmd, void* arg)
   return AF_UNKNOWN;
 }
 
-// Filter data through filter
-static int play_s16(struct af_instance* af, struct mp_audio* data, int f)
+static int play_s16(struct af_instance *af, struct mp_audio *data)
 {
+  if (!data)
+    return 0;
+  if (af_make_writeable(af, data) < 0) {
+    talloc_free(data);
+    return -1;
+  }
+
   af_sinesuppress_t *s = af->priv;
   register int i = 0;
   int16_t *a = (int16_t*)data->planes[0];       // Audio data
@@ -101,37 +93,14 @@ static int play_s16(struct af_instance* af, struct mp_audio* data, int f)
 
    MP_VERBOSE(af, "f:%8.2f: amp:%8.2f\n", s->freq, sqrt(s->real*s->real + s->imag*s->imag) / s->ref);
 
+  af_add_output_frame(af, data);
   return 0;
 }
 
-#if 0
-static struct mp_audio* play_float(struct af_instance* af, struct mp_audio* data)
-{
-  af_sinesuppress_t *s = af->setup;
-  register int i = 0;
-  float *a = (float*)data->audio;       // Audio data
-  int len = data->len/4;                // 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);
-  }
-
-  return data;
-}
-#endif
-
 // Allocate memory and set function pointers
 static int af_open(struct af_instance* af){
   af->control=control;
-  af->filter=play_s16;
+  af->filter_frame = play_s16;
   return AF_OK;
 }
 

audio/filter/af_sub.c

@@ -98,9 +98,15 @@ static int control(struct af_instance* af, int cmd, void* arg)
 }
 #endif
 
-// Filter data through filter
-static int filter(struct af_instance* af, struct mp_audio* data, int flags)
+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_sub_t*     s   = af->priv; // Setup for this instance
   float*        a   = c->planes[0];      // Audio data
@@ -117,13 +123,14 @@ static int filter(struct af_instance* af, struct mp_audio* data, int flags)
     IIR(x , s->w[1], s->q[1], a[i+ch]);
   }
 
+  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=filter;
+  af->filter_frame = filter_frame;
   return AF_OK;
 }
 

audio/filter/af_surround.c

@@ -141,21 +141,27 @@ static const float steering_matrix[][12] = {
 // Experimental moving average dominance
 //static int amp_L = 0, amp_R = 0, amp_C = 0, amp_S = 0;
 
-// Filter data through filter
-static int filter(struct af_instance* af, struct mp_audio* data, int flags){
+static int filter_frame(struct af_instance *af, struct mp_audio *data)
+{
+  if (!data)
+    return 0;
+  struct mp_audio *outframe =
+    mp_audio_pool_get(af->out_pool, &af->fmt_out, data->samples);
+  if (!outframe) {
+    talloc_free(data);
+    return -1;
+  }
+  mp_audio_copy_attributes(outframe, data);
+
   af_surround_t* s   = (af_surround_t*)af->priv;
   const float*   m   = steering_matrix[0];
   float*         in  = data->planes[0];         // Input audio data
-  float*         out = NULL;            // Output audio data
+  float*         out = outframe->planes[0];     // Output audio data
   float*         end = in + data->samples * data->nch;
   int            i   = s->i;    // Filter queue index
   int            ri  = s->ri;   // Read index for delay queue
   int            wi  = s->wi;   // Write index for delay queue
 
-  mp_audio_realloc_min(af->data, data->samples);
-
-  out = af->data->planes[0];
-
   while(in < end){
     /* Dominance:
        abs(in[0])  abs(in[1]);
@@ -215,16 +221,14 @@ static int filter(struct af_instance* af, struct mp_audio* data, int flags){
   // Save indexes
   s->i  = i; s->ri = ri; s->wi = wi;
 
-  // Set output data
-  data->planes[0] = af->data->planes[0];
-  mp_audio_set_channels_old(data, af->data->nch);
-
+  talloc_free(data);
+  af_add_output_frame(af, outframe);
   return 0;
 }
 
 static int af_open(struct af_instance* af){
   af->control=control;
-  af->filter=filter;
+  af->filter_frame = filter_frame;
   return AF_OK;
 }
 

audio/filter/af_sweep.c

@@ -48,9 +48,15 @@ static int control(struct af_instance* af, int cmd, void* arg)
   return AF_UNKNOWN;
 }
 
-// Filter data through filter
-static int filter(struct af_instance* af, struct mp_audio* data, int f)
+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 0;
+  }
+
   af_sweept *s = af->priv;
   int i, j;
   int16_t *in = (int16_t*)data->planes[0];
@@ -64,12 +70,13 @@ static int filter(struct af_instance* af, struct mp_audio* data, int f)
       if(2*s->x*s->delta >= 3.141592) s->x=0;
   }
 
+  af_add_output_frame(af, data);
   return 0;
 }
 
 static int af_open(struct af_instance* af){
   af->control=control;
-  af->filter=filter;
+  af->filter_frame = filter_frame;
   return AF_OK;
 }
 

audio/filter/af_volume.c

@@ -76,8 +76,12 @@ static int control(struct af_instance *af, int cmd, void *arg)
             gain += s->rgain_preamp;
             af_from_dB(1, &gain, &s->rgain, 20.0, -200.0, 60.0);
 
-            if (!s->rgain_clip) // clipping prevention
+            MP_VERBOSE(af, "Applying replay-gain: %f\n", s->rgain);
+
+            if (!s->rgain_clip) { // clipping prevention
                 s->rgain = MPMIN(s->rgain, 1.0 / peak);
+                MP_VERBOSE(af, "...with clipping prevention: %f\n", s->rgain);
+            }
         }
         if (s->detach && fabs(s->level * s->rgain - 1.0) < 0.00001)
             return AF_DETACH;
@@ -93,25 +97,30 @@ static int control(struct af_instance *af, int cmd, void *arg)
     return AF_UNKNOWN;
 }
 
-static void filter_plane(struct af_instance *af, void *ptr, int num_samples)
+static void filter_plane(struct af_instance *af, struct mp_audio *data, int p)
 {
     struct priv *s = af->priv;
 
     float level = s->level * s->rgain;
+    int num_samples = data->samples * data->spf;
 
     if (af_fmt_from_planar(af->data->format) == AF_FORMAT_S16) {
-        int16_t *a = ptr;
         int vol = 256.0 * level;
         if (vol != 256) {
+            if (af_make_writeable(af, data) < 0)
+                return; // oom
+            int16_t *a = data->planes[p];
             for (int i = 0; i < num_samples; i++) {
                 int x = (a[i] * vol) >> 8;
                 a[i] = MPCLAMP(x, SHRT_MIN, SHRT_MAX);
             }
         }
     } else if (af_fmt_from_planar(af->data->format) == AF_FORMAT_FLOAT) {
-        float *a = ptr;
         float vol = level;
         if (vol != 1.0) {
+            if (af_make_writeable(af, data) < 0)
+                return; // oom
+            float *a = data->planes[p];
             for (int i = 0; i < num_samples; i++) {
                 float x = a[i] * vol;
                 a[i] = s->soft ? af_softclip(x) : MPCLAMP(x, -1.0, 1.0);
@@ -120,11 +129,13 @@ static void filter_plane(struct af_instance *af, void *ptr, int num_samples)
     }
 }
 
-static int filter(struct af_instance *af, struct mp_audio *data, int f)
+static int filter(struct af_instance *af, struct mp_audio *data)
 {
-    for (int n = 0; n < data->num_planes; n++)
-        filter_plane(af, data->planes[n], data->samples * data->spf);
-
+    if (data) {
+        for (int n = 0; n < data->num_planes; n++)
+            filter_plane(af, data, n);
+        af_add_output_frame(af, data);
+    }
     return 0;
 }
 
@@ -132,7 +143,7 @@ static int af_open(struct af_instance *af)
 {
     struct priv *s = af->priv;
     af->control = control;
-    af->filter = filter;
+    af->filter_frame = filter;
     af_from_dB(1, &s->cfg_volume, &s->level, 20.0, -200.0, 60.0);
     return AF_OK;
 }

audio/format.c

@@ -45,6 +45,11 @@ int af_fmt2bits(int format)
     return af_fmt2bps(format) * 8;
 }
 
+bool af_fmt_is_float(int format)
+{
+    return !!(format & AF_FORMAT_F);
+}
+
 static int bits_to_mask(int bits)
 {
     switch (bits) {

audio/format.h

@@ -109,6 +109,7 @@ const char *af_fmt_to_str(int format);
 
 int af_fmt2bps(int format);
 int af_fmt2bits(int format);
+bool af_fmt_is_float(int format);
 int af_fmt_change_bits(int format, int bits);
 
 int af_fmt_to_planar(int format);

audio/mixer.c

@@ -36,7 +36,7 @@ struct mixer {
     struct ao *ao;
     struct af_stream *af;
     // Static, dependent on ao/softvol settings
-    bool softvol;                       // use AO (true) or af_volume (false)
+    bool softvol;                       // use AO (false) or af_volume (true)
     bool ao_softvol;                    // AO has private or per-app volume
     bool emulate_mute;                  // if true, emulate mute with volume=0
     // Last known values (possibly out of sync with reality)
@@ -72,7 +72,7 @@ bool mixer_audio_initialized(struct mixer *mixer)
 float mixer_getneutralvolume(struct mixer *mixer)
 {
     // gain == 1
-    return 1.0 / mixer->opts->softvol_max * 100.0 * 100.0;
+    return mixer->softvol ? 1.0 / mixer->opts->softvol_max * 100.0 * 100.0 : 100;
 }
 
 static void checkvolume(struct mixer *mixer)

audio/out/ao.c

@@ -50,7 +50,6 @@ extern const struct ao_driver audio_out_dsound;
 extern const struct ao_driver audio_out_wasapi;
 extern const struct ao_driver audio_out_pcm;
 extern const struct ao_driver audio_out_lavc;
-extern const struct ao_driver audio_out_portaudio;
 extern const struct ao_driver audio_out_sdl;
 
 static const struct ao_driver * const audio_out_drivers[] = {
@@ -72,9 +71,6 @@ static const struct ao_driver * const audio_out_drivers[] = {
 #endif
 #if HAVE_OSS_AUDIO
     &audio_out_oss,
-#endif
-#if HAVE_PORTAUDIO
-    &audio_out_portaudio,
 #endif
     // wrappers:
 #if HAVE_JACK
@@ -89,11 +85,10 @@ static const struct ao_driver * const audio_out_drivers[] = {
 #if HAVE_SNDIO
     &audio_out_sndio,
 #endif
+    &audio_out_null,
 #if HAVE_COREAUDIO
     &audio_out_coreaudio_exclusive,
 #endif
-    &audio_out_null,
-    // should not be auto-selected:
     &audio_out_pcm,
 #if HAVE_ENCODING
     &audio_out_lavc,
@@ -129,30 +124,6 @@ const struct m_obj_list ao_obj_list = {
     .allow_trailer = true,
 };
 
-// Return true if the ao with the given name matches the opt (--audio-device
-// contents). If opt is empty, matching always succeeds. If out_device is not
-// NULL, it will be set to the implied audio device (or NULL).
-static bool match_ao_driver(const char *ao_name, char *opt, char **out_device)
-{
-    bstr ao_nameb = bstr0(ao_name);
-    bstr optb = bstr0(opt);
-
-    char *dummy;
-    if (!out_device)
-        out_device = &dummy;
-    *out_device = NULL;
-
-    if (!optb.len || bstr_equals0(optb, "auto"))
-        return true;
-    if (!bstr_startswith(optb, ao_nameb))
-        return false;
-    if (optb.len > ao_nameb.len && optb.start[ao_nameb.len] != '/')
-        return false;
-    char *split = strchr(opt, '/');
-    *out_device = split ? split + 1 : NULL;
-    return true;
-}
-
 static struct ao *ao_alloc(bool probing, struct mpv_global *global,
                            struct input_ctx *input_ctx, char *name, char **args)
 {
@@ -172,6 +143,7 @@ static struct ao *ao_alloc(bool probing, struct mpv_global *global,
         .input_ctx = input_ctx,
         .log = mp_log_new(ao, log, name),
         .def_buffer = opts->audio_buffer,
+        .client_name = talloc_strdup(ao, opts->audio_client_name),
     };
     struct m_config *config = m_config_from_obj_desc(ao, ao->log, &desc);
     if (m_config_apply_defaults(config, name, opts->ao_defs) < 0)
@@ -185,13 +157,12 @@ error:
     return NULL;
 }
 
-static struct ao *ao_alloc_pb(bool probing, struct mpv_global *global,
-                              struct input_ctx *input_ctx,
-                              struct encode_lavc_context *encode_lavc_ctx,
-                              int samplerate, int format, struct mp_chmap channels,
-                              char *name, char **args)
+static struct ao *ao_init(bool probing, struct mpv_global *global,
+                          struct input_ctx *input_ctx,
+                          struct encode_lavc_context *encode_lavc_ctx,
+                          int samplerate, int format, struct mp_chmap channels,
+                          char *dev, char *name, char **args)
 {
-    struct MPOpts *opts = global->opts;
     struct ao *ao = ao_alloc(probing, global, input_ctx, name, args);
     if (!ao)
         return NULL;
@@ -199,32 +170,32 @@ static struct ao *ao_alloc_pb(bool probing, struct mpv_global *global,
     ao->channels = channels;
     ao->format = format;
     ao->encode_lavc_ctx = encode_lavc_ctx;
-    if (ao->driver->encode != !!ao->encode_lavc_ctx) {
-        talloc_free(ao);
-        return NULL;
-    }
+    if (ao->driver->encode != !!ao->encode_lavc_ctx)
+        goto fail;
 
-    match_ao_driver(ao->driver->name, opts->audio_device, &ao->device);
-    ao->device = talloc_strdup(ao, ao->device);
-
-    ao->client_name = talloc_strdup(ao, opts->audio_client_name);
-
-    return ao;
-}
-
-static int ao_init(struct ao *ao)
-{
     MP_VERBOSE(ao, "requested format: %d Hz, %s channels, %s\n",
                ao->samplerate, mp_chmap_to_str(&ao->channels),
                af_fmt_to_str(ao->format));
 
+    ao->device = talloc_strdup(ao, dev);
+
     ao->api = ao->driver->play ? &ao_api_push : &ao_api_pull;
     ao->api_priv = talloc_zero_size(ao, ao->api->priv_size);
     assert(!ao->api->priv_defaults && !ao->api->options);
 
     int r = ao->driver->init(ao);
-    if (r < 0)
-        return r;
+    if (r < 0) {
+        // Silly exception for coreaudio spdif redirection
+        if (ao->redirect) {
+            char redirect[80], rdevice[80];
+            snprintf(redirect, sizeof(redirect), "%s", ao->redirect);
+            snprintf(rdevice, sizeof(rdevice), "%s", ao->device ? ao->device : "");
+            talloc_free(ao);
+            return ao_init(probing, global, input_ctx, encode_lavc_ctx,
+                           samplerate, format, channels, rdevice, redirect, args);
+        }
+        goto fail;
+    }
 
     ao->sstride = af_fmt2bps(ao->format);
     ao->num_planes = 1;
@@ -242,79 +213,92 @@ static int ao_init(struct ao *ao)
     ao->buffer = MPMAX(ao->device_buffer, ao->def_buffer * ao->samplerate);
     MP_VERBOSE(ao, "using soft-buffer of %d samples.\n", ao->buffer);
 
-    return ao->api->init(ao);
-}
+    if (ao->api->init(ao) < 0)
+        goto fail;
+    return ao;
 
-static struct ao *ao_create(bool probing, struct mpv_global *global,
-                            struct input_ctx *input_ctx,
-                            struct encode_lavc_context *encode_lavc_ctx,
-                            int samplerate, int format, struct mp_chmap channels,
-                            char *name, char **args)
-{
-    struct ao *ao = ao_alloc_pb(probing, global, input_ctx, encode_lavc_ctx,
-                                samplerate, format, channels, name, args);
-    if (ao && ao_init(ao) >= 0)
-        return ao;
-    // Silly exception for coreaudio spdif redirection
-    if (ao && ao->redirect) {
-        char redirect[80], device[80];
-        snprintf(redirect, sizeof(redirect), "%s", ao->redirect);
-        snprintf(device, sizeof(device), "%s", ao->device ? ao->device : "");
-        talloc_free(ao);
-        ao = ao_alloc_pb(probing, global, input_ctx, encode_lavc_ctx,
-                         samplerate, format, channels, redirect, args);
-        if (ao) {
-            ao->device = talloc_strdup(ao, device);
-            if (ao_init(ao) >= 0)
-                return ao;
-        }
-    }
+fail:
     talloc_free(ao);
     return NULL;
 }
 
+static void split_ao_device(void *tmp, char *opt, char **out_ao, char **out_dev)
+{
+    *out_ao = NULL;
+    *out_dev = NULL;
+    if (!opt)
+        return;
+    if (!opt[0] || strcmp(opt, "auto") == 0)
+        return;
+    // Split on "/". If there's no "/", leave out_device NULL.
+    bstr b_dev, b_ao;
+    if (bstr_split_tok(bstr0(opt), "/", &b_ao, &b_dev))
+        *out_dev = bstrto0(tmp, b_dev);
+    *out_ao = bstrto0(tmp, b_ao);
+}
+
 struct ao *ao_init_best(struct mpv_global *global,
                         struct input_ctx *input_ctx,
                         struct encode_lavc_context *encode_lavc_ctx,
                         int samplerate, int format, struct mp_chmap channels)
 {
     struct MPOpts *opts = global->opts;
-    struct mp_log *log = mp_log_new(NULL, global->log, "ao");
+    void *tmp = talloc_new(NULL);
+    struct mp_log *log = mp_log_new(tmp, global->log, "ao");
     struct ao *ao = NULL;
     struct m_obj_settings *ao_list = opts->audio_driver_list;
+
+    bool forced_dev = false;
+    char *pref_ao, *pref_dev;
+    split_ao_device(tmp, opts->audio_device, &pref_ao, &pref_dev);
+    if (!(ao_list && ao_list[0].name) && pref_ao) {
+        // Reuse the autoselection code
+        ao_list = talloc_zero_array(tmp, struct m_obj_settings, 2);
+        ao_list[0].name = pref_ao;
+        forced_dev = true;
+    }
+
     if (ao_list && ao_list[0].name) {
         for (int n = 0; ao_list[n].name; n++) {
             if (strlen(ao_list[n].name) == 0)
                 goto autoprobe;
             mp_verbose(log, "Trying preferred audio driver '%s'\n",
                        ao_list[n].name);
-            ao = ao_create(false, global, input_ctx, encode_lavc_ctx,
-                           samplerate, format, channels,
-                           ao_list[n].name, ao_list[n].attribs);
+            char *dev = NULL;
+            if (pref_ao && strcmp(ao_list[n].name, pref_ao) == 0)
+                dev = pref_dev;
+            if (dev)
+                mp_verbose(log, "Using preferred device '%s'\n", dev);
+            ao = ao_init(false, global, input_ctx, encode_lavc_ctx,
+                         samplerate, format, channels, dev,
+                         ao_list[n].name, ao_list[n].attribs);
             if (ao)
                 goto done;
-            mp_warn(log, "Failed to initialize audio driver '%s'\n",
-                    ao_list[n].name);
+            mp_err(log, "Failed to initialize audio driver '%s'\n",
+                   ao_list[n].name);
+            if (forced_dev) {
+                mp_err(log, "This audio driver/device was forced with the "
+                            "--audio-device option.\n"
+                            "Try unsetting it.\n");
+            }
         }
         goto done;
     }
+
 autoprobe: ;
     // now try the rest...
-    bool matched_dev = false;
     for (int i = 0; audio_out_drivers[i]; i++) {
-        char *name = (char *)audio_out_drivers[i]->name;
-        if (!match_ao_driver(name, opts->audio_device, NULL))
-            continue;
-        matched_dev = true;
-        ao = ao_create(true, global, input_ctx, encode_lavc_ctx,
-                       samplerate, format, channels, name, NULL);
+        const struct ao_driver *driver = audio_out_drivers[i];
+        if (driver == &audio_out_null)
+            break;
+        ao = ao_init(true, global, input_ctx, encode_lavc_ctx, samplerate,
+                     format, channels, NULL, (char *)driver->name, NULL);
         if (ao)
             goto done;
     }
-    if (!matched_dev)
-        mp_err(log, "--audio-device option refers to missing output driver.\n");
+
 done:
-    talloc_free(log);
+    talloc_free(tmp);
     return ao;
 }
 
@@ -415,6 +399,12 @@ void ao_request_reload(struct ao *ao)
 bool ao_chmap_sel_adjust(struct ao *ao, const struct mp_chmap_sel *s,
                          struct mp_chmap *map)
 {
+    if (mp_msg_test(ao->log, MSGL_DEBUG)) {
+        for (int i = 0; i < s->num_chmaps; i++) {
+            struct mp_chmap c = s->chmaps[i];
+            MP_DBG(ao, "chmap_sel #%d: %s\n", i, mp_chmap_to_str(&c));
+        }
+    }
     return mp_chmap_sel_adjust(s, map);
 }
 
@@ -449,6 +439,11 @@ bool ao_untimed(struct ao *ao)
     return ao->untimed;
 }
 
+const char *ao_get_detected_device(struct ao *ao)
+{
+    return ao->detected_device;
+}
+
 struct ao_device_list *ao_get_device_list(struct mpv_global *global)
 {
     struct ao_device_list *list = talloc_zero(NULL, struct ao_device_list);

audio/out/ao.h

@@ -79,6 +79,7 @@ void ao_uninit(struct ao *ao);
 void ao_get_format(struct ao *ao, struct mp_audio *format);
 const char *ao_get_name(struct ao *ao);
 const char *ao_get_description(struct ao *ao);
+const char *ao_get_detected_device(struct ao *ao);
 bool ao_untimed(struct ao *ao);
 int ao_play(struct ao *ao, void **data, int samples, int flags);
 int ao_control(struct ao *ao, enum aocontrol cmd, void *arg);

audio/out/ao_alsa.c

@@ -58,7 +58,6 @@ struct priv {
     int buffersize; // in frames
     int outburst; // in frames
 
-    int cfg_block;
     char *cfg_device;
     char *cfg_mixer_device;
     char *cfg_mixer_name;
@@ -279,7 +278,7 @@ static int find_alsa_channel(int mp_channel)
 static bool query_chmaps(struct ao *ao, struct mp_chmap *chmap)
 {
     struct priv *p = ao->priv;
-    struct mp_chmap_sel chmap_sel = {0};
+    struct mp_chmap_sel chmap_sel = {.tmp = p};
 
     snd_pcm_chmap_query_t **maps = snd_pcm_query_chmaps(p->alsa);
     if (!maps)
@@ -321,47 +320,6 @@ static bool query_chmaps(struct ao *ao, struct mp_chmap *chmap)
 
 #endif /* else HAVE_CHMAP_API */
 
-// Lists device names and their implied channel map.
-// The second item must be resolvable with mp_chmap_from_str().
-// Source: http://www.alsa-project.org/main/index.php/DeviceNames
-// (Speaker names are slightly different from mpv's.)
-static const char *const device_channel_layouts[][2] = {
-    {"default",         "fc"},
-    {"default",         "fl-fr"},
-    {"rear",            "bl-br"},
-    {"center_lfe",      "fc-lfe"},
-    {"side",            "sl-sr"},
-    {"surround40",      "fl-fr-bl-br"},
-    {"surround50",      "fl-fr-bl-br-fc"},
-    {"surround41",      "fl-fr-bl-br-lfe"},
-    {"surround51",      "fl-fr-bl-br-fc-lfe"},
-    {"surround71",      "fl-fr-bl-br-fc-lfe-sl-sr"},
-};
-
-#define NUM_ALSA_CHMAPS MP_ARRAY_SIZE(device_channel_layouts)
-
-static const char *select_chmap(struct ao *ao, struct mp_chmap *chmap)
-{
-    struct mp_chmap_sel sel = {0};
-    struct mp_chmap maps[NUM_ALSA_CHMAPS];
-    for (int n = 0; n < NUM_ALSA_CHMAPS; n++) {
-        mp_chmap_from_str(&maps[n], bstr0(device_channel_layouts[n][1]));
-        mp_chmap_sel_add_map(&sel, &maps[n]);
-    };
-
-    if (!ao_chmap_sel_adjust(ao, &sel, chmap))
-        return "default";
-
-    for (int n = 0; n < NUM_ALSA_CHMAPS; n++) {
-        if (mp_chmap_equals(chmap, &maps[n]))
-            return device_channel_layouts[n][0];
-    }
-
-    MP_ERR(ao, "channel layout %s (%d ch) not supported.\n",
-           mp_chmap_to_str(chmap), chmap->num);
-    return "default";
-}
-
 static int map_iec958_srate(int srate)
 {
     switch (srate) {
@@ -405,7 +363,7 @@ static char *append_params(void *ta_parent, const char *device, const char *p)
     abort();
 }
 
-static int try_open_device(struct ao *ao, const char *device, int open_mode)
+static int try_open_device(struct ao *ao, const char *device)
 {
     struct priv *p = ao->priv;
 
@@ -418,13 +376,13 @@ static int try_open_device(struct ao *ao, const char *device, int open_mode)
                         map_iec958_srate(ao->samplerate));
         const char *ac3_device = append_params(tmp, device, params);
         int err = snd_pcm_open
-                    (&p->alsa, ac3_device, SND_PCM_STREAM_PLAYBACK, open_mode);
+                    (&p->alsa, ac3_device, SND_PCM_STREAM_PLAYBACK, 0);
         talloc_free(tmp);
         if (!err)
             return 0;
     }
 
-    return snd_pcm_open(&p->alsa, device, SND_PCM_STREAM_PLAYBACK, open_mode);
+    return snd_pcm_open(&p->alsa, device, SND_PCM_STREAM_PLAYBACK, 0);
 }
 
 static void uninit(struct ao *ao)
@@ -441,7 +399,10 @@ static void uninit(struct ao *ao)
 alsa_error: ;
 }
 
-static int init(struct ao *ao)
+#define INIT_OK 0
+#define INIT_ERROR -1
+#define INIT_BRAINDEATH -2
+static int init_device(struct ao *ao)
 {
     struct priv *p = ao->priv;
     int err;
@@ -449,17 +410,11 @@ static int init(struct ao *ao)
     if (!p->cfg_ni)
         ao->format = af_fmt_from_planar(ao->format);
 
-    struct mp_chmap implied_chmap = ao->channels;
-    const char *device;
+    const char *device = "default";
     if (AF_FORMAT_IS_IEC61937(ao->format)) {
         device = "iec958";
         MP_VERBOSE(ao, "playing AC3/iec61937/iec958, %i channels\n",
                    ao->channels.num);
-    } else {
-        device = select_chmap(ao, &implied_chmap);
-        // Not-default likely means a hw device - enable software conversions.
-        if (strcmp(device, "default") != 0)
-            device = talloc_asprintf(ao, "plug:%s", device);
     }
     if (ao->device)
         device = ao->device;
@@ -469,22 +424,11 @@ static int init(struct ao *ao)
     MP_VERBOSE(ao, "using device: %s\n", device);
     MP_VERBOSE(ao, "using ALSA version: %s\n", snd_asoundlib_version());
 
-    err = try_open_device(ao, device, p->cfg_block ? 0 : SND_PCM_NONBLOCK);
-    if (err < 0) {
-        if (err != -EBUSY && !p->cfg_block) {
-            MP_WARN(ao, "Open in nonblock-mode "
-                    "failed, trying to open in block-mode.\n");
-            err = try_open_device(ao, device, 0);
-        }
-        CHECK_ALSA_ERROR("Playback open error");
-    }
+    err = try_open_device(ao, device);
+    CHECK_ALSA_ERROR("Playback open error");
 
     err = snd_pcm_nonblock(p->alsa, 0);
-    if (err < 0) {
-        MP_ERR(ao, "Error setting block-mode: %s.\n", snd_strerror(err));
-    } else {
-        MP_VERBOSE(ao, "pcm opened in blocking mode\n");
-    }
+    CHECK_ALSA_WARN("Unable to set blocking mode");
 
     snd_pcm_hw_params_t *alsa_hwparams;
     snd_pcm_sw_params_t *alsa_swparams;
@@ -534,11 +478,14 @@ static int init(struct ao *ao)
     CHECK_ALSA_ERROR("Unable to set access type");
 
     struct mp_chmap dev_chmap = ao->channels;
-    if (query_chmaps(ao, &dev_chmap)) {
+    if (AF_FORMAT_IS_IEC61937(ao->format)) {
+        dev_chmap.num = 0; // disable chmap API
+    } else if (query_chmaps(ao, &dev_chmap)) {
         ao->channels = dev_chmap;
     } else {
+        // Assume only stereo and mono are supported.
+        mp_chmap_from_channels(&ao->channels, MPMIN(2, dev_chmap.num));
         dev_chmap.num = 0;
-        ao->channels = implied_chmap;
     }
 
     int num_channels = ao->channels.num;
@@ -593,16 +540,23 @@ static int init(struct ao *ao)
         for (int c = 0; c < dev_chmap.num; c++)
             alsa_chmap->pos[c] = find_alsa_channel(dev_chmap.speaker[c]);
 
+        // mpv and ALSA use different conventions for mono
+        if (dev_chmap.num == 1 && dev_chmap.speaker[0] == MP_SP(FC))
+            alsa_chmap->pos[0] = SND_CHMAP_MONO;
+
         char tmp[128];
         if (snd_pcm_chmap_print(alsa_chmap, sizeof(tmp), tmp) > 0)
             MP_VERBOSE(ao, "trying to set ALSA channel map: %s\n", tmp);
 
         err = snd_pcm_set_chmap(p->alsa, alsa_chmap);
         if (err == -ENXIO) {
-            MP_WARN(ao, "Device does not support requested channel map\n");
+            MP_WARN(ao, "Device does not support requested channel map (%s)\n",
+                    mp_chmap_to_str(&dev_chmap));
         } else {
             CHECK_ALSA_WARN("Channel map setup failed");
         }
+
+        free(alsa_chmap);
     }
 
     snd_pcm_chmap_t *alsa_chmap = snd_pcm_get_chmap(p->alsa);
@@ -617,7 +571,9 @@ static int init(struct ao *ao)
 
         MP_VERBOSE(ao, "which we understand as: %s\n", mp_chmap_to_str(&chmap));
 
-        if (mp_chmap_is_valid(&chmap)) {
+        if (AF_FORMAT_IS_IEC61937(ao->format)) {
+            MP_VERBOSE(ao, "using spdif passthrough; ignoring the channel map.\n");
+        } else if (mp_chmap_is_valid(&chmap)) {
             if (mp_chmap_equals(&chmap, &ao->channels)) {
                 MP_VERBOSE(ao, "which is what we requested.\n");
             } else if (chmap.num == ao->channels.num) {
@@ -627,9 +583,41 @@ static int init(struct ao *ao)
                 MP_WARN(ao, "ALSA channel map conflicts with channel count!\n");
             }
         } else {
+            // Is it one that contains NA channels?
+            struct mp_chmap chmap2 = {0};
+            for (int c = 0; c < alsa_chmap->channels; c++) {
+                int alsa_ch = alsa_chmap->pos[c];
+                if (alsa_ch != SND_CHMAP_NA)
+                    chmap2.speaker[chmap2.num++] = find_mp_channel(alsa_ch);
+            }
+
+            if (mp_chmap_is_valid(&chmap2)) {
+                // Sometimes, ALSA will advertise certain chmaps, but it's not
+                // possible to set them. This can happen with dmix: as of
+                // alsa 1.0.28, dmix can do stereo only, but advertises the
+                // surround chmaps of the underlying device. In this case,
+                // requesting e.g. 5.1 will fail, but it will still allow
+                // setting 6 channels. Then it will return something like
+                // "FL FR NA NA NA NA" as channel map. This means we would
+                // have to pad stereo output to 6 channels with silence, which
+                // is way too complicated in the general case. You can't change
+                // the number of channels to 2 either, because the hw params
+                // are already set! So just fuck it and reopen the device with
+                // the chmap "cleaned out" of NA entries.
+                err = snd_pcm_close(p->alsa);
+                p->alsa = NULL;
+                CHECK_ALSA_ERROR("pcm close error");
+                ao->channels = chmap2;
+                return INIT_BRAINDEATH;
+            }
+
             MP_WARN(ao, "Got unknown channel map from ALSA.\n");
         }
 
+        // mpv and ALSA use different conventions for mono
+        if (ao->channels.num == 1)
+            ao->channels.speaker[0] = MP_SP(FC);
+
         free(alsa_chmap);
     }
 #endif
@@ -678,11 +666,19 @@ static int init(struct ao *ao)
 
     p->can_pause = snd_pcm_hw_params_can_pause(alsa_hwparams);
 
-    return 0;
+    return INIT_OK;
 
 alsa_error:
     uninit(ao);
-    return -1;
+    return INIT_ERROR;
+}
+
+static int init(struct ao *ao)
+{
+    int r = init_device(ao);
+    if (r == INIT_BRAINDEATH)
+        r = init_device(ao); // retry with normalized channel layout
+    return r == INIT_OK ? 0 : -1;
 }
 
 static void drain(struct ao *ao)
@@ -756,7 +752,7 @@ static void audio_pause(struct ao *ao)
 alsa_error: ;
 }
 
-static void audio_resume(struct ao *ao)
+static void resume_device(struct ao *ao)
 {
     struct priv *p = ao->priv;
     int err;
@@ -767,6 +763,14 @@ static void audio_resume(struct ao *ao)
         while ((err = snd_pcm_resume(p->alsa)) == -EAGAIN)
             sleep(1);
     }
+}
+
+static void audio_resume(struct ao *ao)
+{
+    struct priv *p = ao->priv;
+    int err;
+
+    resume_device(ao);
 
     if (p->can_pause) {
         if (snd_pcm_state(p->alsa) == SND_PCM_STATE_PAUSED) {
@@ -818,10 +822,15 @@ static int play(struct ao *ao, void **data, int samples, int flags)
 
         if (res == -EINTR || res == -EAGAIN) { /* retry */
             res = 0;
-        } else if (res == -ESTRPIPE) {  /* suspend */
-            audio_resume(ao);
+        } else if (res == -ENODEV) {
+            MP_WARN(ao, "Device lost, trying to recover...\n");
+            ao_request_reload(ao);
         } else if (res < 0) {
-            MP_ERR(ao, "Write error: %s\n", snd_strerror(res));
+            if (res == -ESTRPIPE) {  /* suspend */
+                resume_device(ao);
+            } else {
+                MP_ERR(ao, "Write error: %s\n", snd_strerror(res));
+            }
             res = snd_pcm_prepare(p->alsa);
             int err = res;
             CHECK_ALSA_ERROR("pcm prepare error");
@@ -913,7 +922,6 @@ const struct ao_driver audio_out_alsa = {
     .list_devs = list_devs,
     .priv_size = sizeof(struct priv),
     .priv_defaults = &(const struct priv) {
-        .cfg_block = 1,
         .cfg_mixer_device = "default",
         .cfg_mixer_name = "Master",
         .cfg_mixer_index = 0,
@@ -922,7 +930,6 @@ const struct ao_driver audio_out_alsa = {
     .options = (const struct m_option[]) {
         OPT_STRING("device", cfg_device, 0),
         OPT_FLAG("resample", cfg_resample, 0),
-        OPT_FLAG("block", cfg_block, 0),
         OPT_STRING("mixer-device", cfg_mixer_device, 0),
         OPT_STRING("mixer-name", cfg_mixer_name, 0),
         OPT_INTRANGE("mixer-index", cfg_mixer_index, 0, 0, 99),

audio/out/ao_coreaudio.c

@@ -156,6 +156,11 @@ static int init(struct ao *ao)
     OSStatus err = ca_select_device(ao, ao->device, &p->device);
     CHECK_CA_ERROR("failed to select device");
 
+    char *uid;
+    err = CA_GET_STR(p->device, kAudioDevicePropertyDeviceUID, &uid);
+    CHECK_CA_ERROR("failed to get device UID");
+    ao->detected_device = talloc_steal(ao, uid);
+
     if (!init_chmap(ao))
         goto coreaudio_error;
 
@@ -173,32 +178,83 @@ coreaudio_error:
     return CONTROL_ERROR;
 }
 
-static bool init_chmap(struct ao *ao)
+static AudioChannelLayout* ca_query_layout(struct ao *ao, void *talloc_ctx)
 {
     struct priv *p = ao->priv;
     OSStatus err;
-    AudioChannelLayout *layouts;
-    size_t n_layouts;
+    uint32_t psize;
+    AudioChannelLayout *r = NULL;
 
-    err = CA_GET_ARY_O(p->device,
-                       kAudioDevicePropertyPreferredChannelLayout,
-                       &layouts, &n_layouts);
-    CHECK_CA_ERROR("could not get audio device prefered layouts");
+    AudioObjectPropertyAddress p_addr = (AudioObjectPropertyAddress) {
+        .mSelector = kAudioDevicePropertyPreferredChannelLayout,
+        .mScope    = kAudioDevicePropertyScopeOutput,
+        .mElement  = kAudioObjectPropertyElementWildcard,
+    };
 
-    struct mp_chmap_sel chmap_sel = {0};
-    for (int i = 0; i < n_layouts; i++) {
-        struct mp_chmap chmap = {0};
-        if (ca_layout_to_mp_chmap(ao, &layouts[i], &chmap))
-            mp_chmap_sel_add_map(&chmap_sel, &chmap);
+    err = AudioObjectGetPropertyDataSize(p->device, &p_addr, 0, NULL, &psize);
+    CHECK_CA_ERROR("could not get device preferred layout (size)");
+
+    r = talloc_size(talloc_ctx, psize);
+
+    err = AudioObjectGetPropertyData(p->device, &p_addr, 0, NULL, &psize, r);
+    CHECK_CA_ERROR("could not get device preferred layout (get)");
+
+coreaudio_error:
+    return r;
+}
+
+static AudioChannelLayout* ca_query_stereo_layout(struct ao *ao, void *talloc_ctx)
+{
+    struct priv *p = ao->priv;
+    OSStatus err;
+    const int nch = 2;
+    uint32_t channels[nch];
+    AudioChannelLayout *r = NULL;
+
+    AudioObjectPropertyAddress p_addr = (AudioObjectPropertyAddress) {
+        .mSelector = kAudioDevicePropertyPreferredChannelsForStereo,
+        .mScope    = kAudioDevicePropertyScopeOutput,
+        .mElement  = kAudioObjectPropertyElementWildcard,
+    };
+
+    uint32_t psize = sizeof(channels);
+    err = AudioObjectGetPropertyData(p->device, &p_addr, 0, NULL, &psize, channels);
+    CHECK_CA_ERROR("could not get device preferred stereo layout");
+
+    psize = sizeof(AudioChannelLayout) + nch * sizeof(AudioChannelDescription);
+    r = talloc_zero_size(talloc_ctx, psize);
+    r->mChannelLayoutTag = kAudioChannelLayoutTag_UseChannelDescriptions;
+    r->mNumberChannelDescriptions = nch;
+
+    AudioChannelDescription desc = {0};
+    desc.mChannelFlags = kAudioChannelFlags_AllOff;
+
+    for(int i = 0; i < nch; i++) {
+        desc.mChannelLabel = channels[i];
+        r->mChannelDescriptions[i] = desc;
     }
 
-    talloc_free(layouts);
+coreaudio_error:
+    return r;
+}
 
-    if (ao->channels.num < 3) {
-        struct mp_chmap chmap;
-        mp_chmap_from_channels(&chmap, ao->channels.num);
+static bool init_chmap(struct ao *ao)
+{
+    struct priv *p = ao->priv;
+    void *ta_ctx = talloc_new(NULL);
+
+    struct mp_chmap_sel chmap_sel = {.tmp = p};
+    struct mp_chmap chmap = {0};
+
+    AudioChannelLayout *ml = ca_query_layout(ao, ta_ctx);
+    if (ml && ca_layout_to_mp_chmap(ao, ml, &chmap))
         mp_chmap_sel_add_map(&chmap_sel, &chmap);
-    }
+
+    AudioChannelLayout *sl = ca_query_stereo_layout(ao, ta_ctx);
+    if (sl && ca_layout_to_mp_chmap(ao, sl, &chmap))
+        mp_chmap_sel_add_map(&chmap_sel, &chmap);
+
+    talloc_free(ta_ctx);
 
     if (!ao_chmap_sel_adjust(ao, &chmap_sel, &ao->channels)) {
         MP_ERR(ao, "could not select a suitable channel map among the "
@@ -336,7 +392,7 @@ static const int speaker_map[][2] = {
     { kAudioChannelLabel_HeadphonesLeft,       MP_SPEAKER_ID_DL   },
     { kAudioChannelLabel_HeadphonesRight,      MP_SPEAKER_ID_DR   },
 
-    { kAudioChannelLabel_Unknown,              -1 },
+    { kAudioChannelLabel_Unknown,              MP_SPEAKER_ID_UNKNOWN0 },
 };
 
 static int ca_label_to_mp_speaker_id(AudioChannelLabel label)
@@ -347,86 +403,110 @@ static int ca_label_to_mp_speaker_id(AudioChannelLabel label)
     return -1;
 }
 
-static void ca_log_layout(struct ao *ao, AudioChannelLayout *layout)
+static void ca_log_layout(struct ao *ao, int l, AudioChannelLayout *layout)
 {
-    if (!mp_msg_test(ao->log, MSGL_V))
+    if (!mp_msg_test(ao->log, l))
         return;
 
     AudioChannelDescription *descs = layout->mChannelDescriptions;
 
-    MP_VERBOSE(ao, "layout: tag: <%d>, bitmap: <%d>, "
-                   "descriptions <%d>\n",
-                   layout->mChannelLayoutTag,
-                   layout->mChannelBitmap,
-                   layout->mNumberChannelDescriptions);
+    mp_msg(ao->log, l, "layout: tag: <%u>, bitmap: <%u>, "
+                       "descriptions <%u>\n",
+                       (unsigned) layout->mChannelLayoutTag,
+                       (unsigned) layout->mChannelBitmap,
+                       (unsigned) layout->mNumberChannelDescriptions);
 
     for (int i = 0; i < layout->mNumberChannelDescriptions; i++) {
         AudioChannelDescription d = descs[i];
-        MP_VERBOSE(ao, " - description %d: label <%d, %d>, flags: <%u>, "
-                       "coords: <%f, %f, %f>\n", i,
-                       d.mChannelLabel,
-                       ca_label_to_mp_speaker_id(d.mChannelLabel),
-                       d.mChannelFlags,
-                       d.mCoordinates[0],
-                       d.mCoordinates[1],
-                       d.mCoordinates[2]);
+        mp_msg(ao->log, l, " - description %d: label <%u, %u>, "
+            " flags: <%u>, coords: <%f, %f, %f>\n", i,
+            (unsigned) d.mChannelLabel,
+            (unsigned) ca_label_to_mp_speaker_id(d.mChannelLabel),
+            (unsigned) d.mChannelFlags,
+            d.mCoordinates[0],
+            d.mCoordinates[1],
+            d.mCoordinates[2]);
     }
 }
 
+static AudioChannelLayout *ca_layout_to_custom_layout(
+    struct ao *ao, void *talloc_ctx, AudioChannelLayout *l)
+{
+    AudioChannelLayoutTag tag = l->mChannelLayoutTag;
+    AudioChannelLayout *r;
+    OSStatus err;
+
+    if (tag == kAudioChannelLayoutTag_UseChannelBitmap) {
+        uint32_t psize;
+        err = AudioFormatGetPropertyInfo(
+            kAudioFormatProperty_ChannelLayoutForBitmap,
+            sizeof(uint32_t), &l->mChannelBitmap, &psize);
+        CHECK_CA_ERROR("failed to convert channel bitmap to descriptions (info)");
+        r = talloc_size(NULL, psize);
+        err = AudioFormatGetProperty(
+            kAudioFormatProperty_ChannelLayoutForBitmap,
+            sizeof(uint32_t), &l->mChannelBitmap, &psize, r);
+        CHECK_CA_ERROR("failed to convert channel bitmap to descriptions (get)");
+    } else if (tag != kAudioChannelLayoutTag_UseChannelDescriptions) {
+        uint32_t psize;
+        err = AudioFormatGetPropertyInfo(
+            kAudioFormatProperty_ChannelLayoutForTag,
+            sizeof(AudioChannelLayoutTag), &l->mChannelLayoutTag, &psize);
+        r = talloc_size(NULL, psize);
+        CHECK_CA_ERROR("failed to convert channel tag to descriptions (info)");
+        err = AudioFormatGetProperty(
+            kAudioFormatProperty_ChannelLayoutForTag,
+            sizeof(AudioChannelLayoutTag), &l->mChannelLayoutTag, &psize, r);
+        CHECK_CA_ERROR("failed to convert channel tag to descriptions (get)");
+    } else {
+        r = l;
+    }
+
+    return r;
+coreaudio_error:
+    return NULL;
+}
+
 bool ca_layout_to_mp_chmap(struct ao *ao, AudioChannelLayout *layout,
                            struct mp_chmap *chmap)
 {
-    AudioChannelLayoutTag tag  = layout->mChannelLayoutTag;
-    uint32_t layout_size       = sizeof(layout);
-    OSStatus err;
+    void *talloc_ctx = talloc_new(NULL);
 
-    if (tag == kAudioChannelLayoutTag_UseChannelBitmap) {
-        err = AudioFormatGetProperty(kAudioFormatProperty_ChannelLayoutForBitmap,
-                                     sizeof(uint32_t),
-                                     &layout->mChannelBitmap,
-                                     &layout_size,
-                                     layout);
-        CHECK_CA_ERROR("failed to convert channel bitmap to descriptions");
-    } else if (tag != kAudioChannelLayoutTag_UseChannelDescriptions) {
-        err = AudioFormatGetProperty(kAudioFormatProperty_ChannelLayoutForTag,
-                                     sizeof(AudioChannelLayoutTag),
-                                     &layout->mChannelLayoutTag,
-                                     &layout_size,
-                                     layout);
-        CHECK_CA_ERROR("failed to convert channel tag to descriptions");
+    MP_DBG(ao, "input channel layout:\n");
+    ca_log_layout(ao, MSGL_DEBUG, layout);
+
+    AudioChannelLayout *l = ca_layout_to_custom_layout(ao, talloc_ctx, layout);
+    if (!l)
+        goto coreaudio_error;
+
+    MP_VERBOSE(ao, "converted input channel layout:\n");
+    ca_log_layout(ao, MSGL_V, l);
+
+    if (l->mNumberChannelDescriptions > MP_NUM_CHANNELS) {
+        MP_VERBOSE(ao, "layout has too many descriptions (%u, max: %d)\n",
+                   (unsigned) l->mNumberChannelDescriptions, MP_NUM_CHANNELS);
+        return false;
     }
 
-    ca_log_layout(ao, layout);
-
-    // If the channel layout uses channel descriptions, from my
-    // experiments there are there three possibile cases:
-    // * The description has a label kAudioChannelLabel_Unknown:
-    //   Can't do anything about this (looks like non surround
-    //   layouts are like this).
-    // * The description uses positional information: this in
-    //   theory could be used but one would have to map spatial
-    //   positions to labels which is not really feasible.
-    // * The description has a well known label which can be mapped
-    //   to the waveextensible definition: this is the kind of
-    //   descriptions we process here.
-
-    for (int n = 0; n < layout->mNumberChannelDescriptions; n++) {
-        AudioChannelLabel label = layout->mChannelDescriptions[n].mChannelLabel;
+    for (int n = 0; n < l->mNumberChannelDescriptions; n++) {
+        AudioChannelLabel label = l->mChannelDescriptions[n].mChannelLabel;
         uint8_t speaker = ca_label_to_mp_speaker_id(label);
-        if (label == kAudioChannelLabel_Unknown)
-            continue;
         if (speaker < 0) {
-            MP_VERBOSE(ao, "channel label=%d unusable to build channel "
-                           "bitmap, skipping layout\n", label);
+            MP_VERBOSE(ao, "channel label=%u unusable to build channel "
+                           "bitmap, skipping layout\n", (unsigned) label);
+            goto coreaudio_error;
         } else {
             chmap->speaker[n] = speaker;
             chmap->num = n + 1;
         }
     }
 
+    talloc_free(talloc_ctx);
     return chmap->num > 0;
 coreaudio_error:
-    ca_log_layout(ao, layout);
+    MP_VERBOSE(ao, "converted input channel layout (failed):\n");
+    ca_log_layout(ao, MSGL_V, layout);
+    talloc_free(talloc_ctx);
     return false;
 }
 

audio/out/ao_coreaudio_properties.c

@@ -62,7 +62,7 @@ OSStatus ca_get_ary(AudioObjectID id, ca_scope scope, ca_sel selector,
     err = AudioObjectGetPropertyDataSize(id, &p_addr, 0, NULL, &p_size);
     CHECK_CA_ERROR_SILENT_L(coreaudio_error);
 
-    *data = talloc_size(NULL, p_size);
+    *data = talloc_zero_size(NULL, p_size);
     *elements = p_size / element_size;
 
     err = ca_get(id, scope, selector, p_size, *data);
@@ -83,12 +83,7 @@ OSStatus ca_get_str(AudioObjectID id, ca_scope scope, ca_sel selector,
         ca_get(id, scope, selector, sizeof(CFStringRef), (void **)&string);
     CHECK_CA_ERROR_SILENT_L(coreaudio_error);
 
-    CFIndex size =
-        CFStringGetMaximumSizeForEncoding(
-            CFStringGetLength(string), CA_CFSTR_ENCODING) + 1;
-
-    *data = talloc_size(NULL, size);
-    CFStringGetCString(string, *data, size, CA_CFSTR_ENCODING);
+    *data = cfstr_get_cstr(string);
     CFRelease(string);
 coreaudio_error:
     return err;

audio/out/ao_coreaudio_utils.c

@@ -28,6 +28,21 @@
 #include "osdep/endian.h"
 #include "audio/format.h"
 
+CFStringRef cfstr_from_cstr(char *str)
+{
+    return CFStringCreateWithCString(NULL, str, CA_CFSTR_ENCODING);
+}
+
+char *cfstr_get_cstr(CFStringRef cfstr)
+{
+    CFIndex size =
+        CFStringGetMaximumSizeForEncoding(
+            CFStringGetLength(cfstr), CA_CFSTR_ENCODING) + 1;
+    char *buffer = talloc_zero_size(NULL, size);
+    CFStringGetCString(cfstr, buffer, size, CA_CFSTR_ENCODING);
+    return buffer;
+}
+
 static bool ca_is_output_device(struct ao *ao, AudioDeviceID dev)
 {
     size_t n_buffers;
@@ -49,13 +64,17 @@ void ca_get_device_list(struct ao *ao, struct ao_device_list *list)
     for (int i = 0; i < n_devs; i++) {
         if (!ca_is_output_device(ao, devs[i]))
             continue;
-        char name[32];
+        void *ta_ctx = talloc_new(NULL);
+        char *name;
         char *desc;
-        sprintf(name, "%d", devs[i]);
+        err = CA_GET_STR(devs[i], kAudioDevicePropertyDeviceUID, &name);
+        talloc_steal(ta_ctx, name);
         err = CA_GET_STR(devs[i], kAudioObjectPropertyName, &desc);
+        talloc_steal(ta_ctx, desc);
         if (err != noErr)
             desc = "Unknown";
         ao_device_list_add(list, ao, &(struct ao_device_desc){name, desc});
+        talloc_free(ta_ctx);
     }
     talloc_free(devs);
 coreaudio_error:
@@ -65,20 +84,32 @@ coreaudio_error:
 OSStatus ca_select_device(struct ao *ao, char* name, AudioDeviceID *device)
 {
     OSStatus err = noErr;
-    int selection = name ? strtol(name, (char **)NULL, 10) : -1;
-    if (errno == EINVAL || errno == ERANGE) {
-        selection = -1;
-        MP_WARN(ao, "device identifier '%s' is invalid\n", name);
-    }
-    *device = 0;
-    if (selection < 0) {
+    *device = kAudioObjectUnknown;
+
+    if (name) {
+        CFStringRef uid = cfstr_from_cstr(name);
+        AudioValueTranslation v = (AudioValueTranslation) {
+            .mInputData = &uid,
+            .mInputDataSize = sizeof(CFStringRef),
+            .mOutputData = device,
+            .mOutputDataSize = sizeof(*device),
+        };
+        uint32_t size = sizeof(AudioValueTranslation);
+        AudioObjectPropertyAddress p_addr = (AudioObjectPropertyAddress) {
+            .mSelector = kAudioHardwarePropertyDeviceForUID,
+            .mScope    = kAudioObjectPropertyScopeGlobal,
+            .mElement  = kAudioObjectPropertyElementMaster,
+        };
+        err = AudioObjectGetPropertyData(
+            kAudioObjectSystemObject, &p_addr, 0, 0, &size, &v);
+        CFRelease(uid);
+        CHECK_CA_ERROR("unable to query for device UID");
+    } else {
         // device not set by user, get the default one
         err = CA_GET(kAudioObjectSystemObject,
                      kAudioHardwarePropertyDefaultOutputDevice,
                      device);
         CHECK_CA_ERROR("could not get default audio device");
-    } else {
-        *device = selection;
     }
 
     if (mp_msg_test(ao->log, MSGL_V)) {

audio/out/ao_coreaudio_utils.h

@@ -28,6 +28,9 @@
 
 #define CA_CFSTR_ENCODING kCFStringEncodingASCII
 
+CFStringRef cfstr_from_cstr(char *str);
+char *cfstr_get_cstr(CFStringRef cfstr);
+
 char *fourcc_repr(void *talloc_ctx, uint32_t code);
 bool check_ca_st(struct ao *ao, int level, OSStatus code, const char *message);