Github messages for voidlinux
 help / color / mirror / Atom feed
From: robbie01 <robbie01@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] mpv: add sndio patch
Date: Thu, 23 Dec 2021 02:03:46 +0100	[thread overview]
Message-ID: <20211223010346.LoaLN-kvyWPXHlpi7hqek19SoXvY-K7TdXGqdM7TzNk@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-34671@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 1077 bytes --]

There is an updated pull request by robbie01 against master on the void-packages repository

https://github.com/robbie01/void-packages mpv-sndio
https://github.com/void-linux/void-packages/pull/34671

mpv: add sndio patch
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

lifted from the following without modification:
- http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/multimedia/mpv/patches/patch-audio_out_ao_c?rev=1.3&content-type=text/x-cvsweb-markup
- http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/multimedia/mpv/patches/patch-audio_out_ao_sndio_c?rev=1.4&content-type=text/x-cvsweb-markup
- http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/multimedia/mpv/patches/patch-wscript?rev=1.5&content-type=text/x-cvsweb-markup
- http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/multimedia/mpv/patches/patch-wscript_build_py?rev=1.3&content-type=text/x-cvsweb-markup

thanks brad

A patch file from https://github.com/void-linux/void-packages/pull/34671.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mpv-sndio-34671.patch --]
[-- Type: text/x-diff, Size: 13466 bytes --]

From 46c42f57abeca29fac51af7b212c9a75fa51e751 Mon Sep 17 00:00:00 2001
From: robbie <robbie@sohio.net>
Date: Wed, 22 Dec 2021 16:51:39 -0500
Subject: [PATCH] mpv: add sndio patch

---
 srcpkgs/mpv/patches/sndio.patch | 349 ++++++++++++++++++++++++++++++++
 srcpkgs/mpv/template            |   8 +-
 2 files changed, 353 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/mpv/patches/sndio.patch

diff --git a/srcpkgs/mpv/patches/sndio.patch b/srcpkgs/mpv/patches/sndio.patch
new file mode 100644
index 000000000000..c9e88c46613f
--- /dev/null
+++ b/srcpkgs/mpv/patches/sndio.patch
@@ -0,0 +1,349 @@
+diff -Naurp0 a/audio/out/ao.c b/audio/out/ao.c
+--- a/audio/out/ao.c	2021-11-01 14:44:39.000000000 +0000
++++ b/audio/out/ao.c	2021-12-22 21:13:37.492909229 +0000
+@@ -43,0 +44 @@ extern const struct ao_driver audio_out_
++extern const struct ao_driver audio_out_sndio;
+@@ -89,0 +91,3 @@ static const struct ao_driver * const au
++#endif
++#if HAVE_SNDIO
++    &audio_out_sndio,
+diff -Naurp0 a/audio/out/ao_sndio.c b/audio/out/ao_sndio.c
+--- a/audio/out/ao_sndio.c	1970-01-01 00:00:00.000000000 +0000
++++ b/audio/out/ao_sndio.c	2021-12-22 21:13:58.024908183 +0000
+@@ -0,0 +1,322 @@
++/*
++ * Copyright (c) 2008 Alexandre Ratchov <alex@caoua.org>
++ * Copyright (c) 2013 Christian Neukirchen <chneukirchen@gmail.com>
++ * Copyright (c) 2020 Rozhuk Ivan <rozhuk.im@gmail.com>
++ * 
++ * Permission to use, copy, modify, and distribute this software for any
++ * purpose with or without fee is hereby granted, provided that the above
++ * copyright notice and this permission notice appear in all copies.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ */
++
++#include "config.h"
++
++#include <sys/types.h>
++#include <poll.h>
++#include <errno.h>
++#include <sndio.h>
++
++#include "options/m_option.h"
++#include "common/msg.h"
++
++#include "audio/format.h"
++#include "ao.h"
++#include "internal.h"
++
++struct priv {
++    struct sio_hdl *hdl;
++    struct sio_par par;
++    int delay;
++    bool playing;
++    int vol;
++    int havevol;
++    struct pollfd *pfd;
++};
++
++
++static const struct mp_chmap sndio_layouts[] = {
++    {0},                                        /* empty */
++    {1, {MP_SPEAKER_ID_FL}},                    /* mono */
++    MP_CHMAP2(FL, FR),                          /* stereo */
++    {0},                                        /* 2.1 */
++    MP_CHMAP4(FL, FR, BL, BR),                  /* 4.0 */
++    {0},                                        /* 5.0 */
++    MP_CHMAP6(FL, FR, BL, BR, FC, LFE),         /* 5.1 */
++    {0},                                        /* 6.1 */
++    MP_CHMAP8(FL, FR, BL, BR, FC, LFE, SL, SR), /* 7.1 */
++    /* Above is the fixed channel assignment for sndio, since we need to
++     * fill all channels and cannot insert silence, not all layouts are
++     * supported.
++     * NOTE: MP_SPEAKER_ID_NA could be used to add padding channels. */
++};
++
++static void uninit(struct ao *ao);
++
++
++/* Make libsndio call movecb(). */
++static void process_events(struct ao *ao)
++{
++    struct priv *p = ao->priv;
++
++    int n = sio_pollfd(p->hdl, p->pfd, POLLOUT);
++    while (poll(p->pfd, n, 0) < 0 && errno == EINTR);
++
++    sio_revents(p->hdl, p->pfd);
++}
++
++/* Call-back invoked to notify of the hardware position. */
++static void movecb(void *addr, int delta)
++{
++    struct ao *ao = addr;
++    struct priv *p = ao->priv;
++
++    p->delay -= delta;
++}
++
++/* Call-back invoked to notify about volume changes. */
++static void volcb(void *addr, unsigned newvol)
++{
++    struct ao *ao = addr;
++    struct priv *p = ao->priv;
++
++    p->vol = newvol;
++}
++
++static int init(struct ao *ao)
++{
++    struct priv *p = ao->priv;
++    struct mp_chmap_sel sel = {0};
++    size_t i;
++    struct af_to_par {
++        int format, bits, sig;
++    };
++    static const struct af_to_par af_to_par[] = {
++        {AF_FORMAT_U8,   8, 0},
++        {AF_FORMAT_S16, 16, 1},
++        {AF_FORMAT_S32, 32, 1},
++    };
++    const struct af_to_par *ap;
++    const char *device = ((ao->device) ? ao->device : SIO_DEVANY);
++
++    /* Opening device. */
++    MP_VERBOSE(ao, "Using '%s' audio device.\n", device);
++    p->hdl = sio_open(device, SIO_PLAY, 0);
++    if (p->hdl == NULL) {
++        MP_ERR(ao, "Can't open audio device %s.\n", device);
++        goto err_out;
++    }
++
++    sio_initpar(&p->par);
++
++    /* Selecting sound format. */
++    ao->format = af_fmt_from_planar(ao->format);
++
++    p->par.bits = 16;
++    p->par.sig = 1;
++    p->par.le = SIO_LE_NATIVE;
++    for (i = 0; i < MP_ARRAY_SIZE(af_to_par); i++) {
++        ap = &af_to_par[i];
++        if (ap->format == ao->format) {
++            p->par.bits = ap->bits;
++            p->par.sig = ap->sig;
++            break;
++        }
++    }
++
++    p->par.rate = ao->samplerate;
++
++    /* Channels count. */
++    for (i = 0; i < MP_ARRAY_SIZE(sndio_layouts); i++) {
++        mp_chmap_sel_add_map(&sel, &sndio_layouts[i]);
++    }
++    if (!ao_chmap_sel_adjust(ao, &sel, &ao->channels))
++        goto err_out;
++
++    p->par.pchan = ao->channels.num;
++#ifdef __FreeBSD__
++    /* OSS wrapper have bad defaults, overwrite it. */
++    p->par.appbufsz = ((p->par.rate * 25) / 1000); /* 25 ms. */
++#else
++    p->par.appbufsz = p->par.rate * 250 / 1000;    /* 250ms buffer */
++#endif
++    p->par.round = p->par.rate * 10 / 1000;    /*  10ms block size */
++
++    if (!sio_setpar(p->hdl, &p->par)) {
++        MP_ERR(ao, "couldn't set params\n");
++        goto err_out;
++    }
++
++    /* Get current sound params. */
++    if (!sio_getpar(p->hdl, &p->par)) {
++        MP_ERR(ao, "couldn't get params\n");
++        goto err_out;
++    }
++    if (p->par.bps > 1 && p->par.le != SIO_LE_NATIVE) {
++        MP_ERR(ao, "swapped endian output not supported\n");
++        goto err_out;
++    }
++
++    /* Update sound params. */
++    if (p->par.bits == 8 && p->par.bps == 1 && !p->par.sig) {
++        ao->format = AF_FORMAT_U8;
++    } else if (p->par.bits == 16 && p->par.bps == 2 && p->par.sig) {
++        ao->format = AF_FORMAT_S16;
++    } else if ((p->par.bits == 32 || p->par.msb) && p->par.bps == 4 && p->par.sig) {
++        ao->format = AF_FORMAT_S32;
++    } else {
++        MP_ERR(ao, "couldn't set format\n");
++        goto err_out;
++    }
++
++    p->havevol = sio_onvol(p->hdl, volcb, ao);
++    sio_onmove(p->hdl, movecb, ao);
++
++    p->pfd = talloc_array_ptrtype(p, p->pfd, sio_nfds(p->hdl));
++    if (!p->pfd)
++        goto err_out;
++
++    ao->device_buffer = p->par.bufsz;
++    MP_VERBOSE(ao, "bufsz = %i, appbufsz = %i, round = %i\n",
++        p->par.bufsz, p->par.appbufsz, p->par.round);
++
++    p->delay = 0;
++    p->playing = false;
++    if (!sio_start(p->hdl)) {
++        MP_ERR(ao, "start: sio_start() fail.\n");
++        goto err_out;
++    }
++
++    return 0;
++
++err_out:
++    uninit(ao);
++    return -1;
++}
++
++static void uninit(struct ao *ao)
++{
++    struct priv *p = ao->priv;
++
++    if (p->hdl) {
++        sio_close(p->hdl);
++        p->hdl = NULL;
++    }
++    p->pfd = NULL;
++    p->playing = false;
++}
++
++static int control(struct ao *ao, enum aocontrol cmd, void *arg)
++{
++    struct priv *p = ao->priv;
++    ao_control_vol_t *vol = arg;
++
++    switch (cmd) {
++    case AOCONTROL_GET_VOLUME:
++        if (!p->havevol)
++            return CONTROL_FALSE;
++        vol->left = vol->right = p->vol * 100 / SIO_MAXVOL;
++        break;
++    case AOCONTROL_SET_VOLUME:
++        if (!p->havevol)
++            return CONTROL_FALSE;
++        sio_setvol(p->hdl, vol->left * SIO_MAXVOL / 100);
++        break;
++    default:
++        return CONTROL_UNKNOWN;
++    }
++    return CONTROL_OK;
++}
++
++static void reset(struct ao *ao)
++{
++    struct priv *p = ao->priv;
++
++    if (p->playing) {
++        p->playing = false;
++
++        if (!sio_stop(p->hdl)) {
++            MP_ERR(ao, "reset: couldn't sio_stop()\n");
++        }
++        p->delay = 0;
++        if (!sio_start(p->hdl)) {
++            MP_ERR(ao, "reset: sio_start() fail.\n");
++        }
++    }
++}
++
++static void start(struct ao *ao)
++{
++    struct priv *p = ao->priv;
++
++    p->playing = true;
++    process_events(ao);
++}
++
++static bool audio_write(struct ao *ao, void **data, int samples)
++{
++    struct priv *p = ao->priv;
++    const size_t size = (samples * ao->sstride);
++    size_t rc;
++
++    rc = sio_write(p->hdl, data[0], size);
++    if (rc != size) {
++        MP_WARN(ao, "audio_write: unexpected partial write: required: %zu, written: %zu.\n",
++            size, rc);
++        reset(ao);
++        p->playing = false;
++        return false;
++    }
++    p->delay += samples;
++
++    return true;
++}
++
++static void get_state(struct ao *ao, struct mp_pcm_state *state)
++{
++    struct priv *p = ao->priv;
++
++    process_events(ao);
++
++    /* how many samples we can play without blocking */
++    state->free_samples = ao->device_buffer - p->delay;
++    state->free_samples = state->free_samples / p->par.round * p->par.round;
++    /* how many samples are already in the buffer to be played */
++    state->queued_samples = p->delay;
++    /* delay in seconds between first and last sample in buffer */
++    state->delay = p->delay / (double)p->par.rate;
++
++    /* report unexpected EOF / underrun */
++    if (state->queued_samples && state->queued_samples &&
++        state->queued_samples < state->free_samples &&
++        p->playing || sio_eof(p->hdl))
++    {
++        MP_VERBOSE(ao, "get_state: EOF/underrun detected.\n");
++        MP_VERBOSE(ao, "get_state: free: %d, queued: %d, delay: %lf\n", \
++                state->free_samples, state->queued_samples, state->delay);
++        p->playing = false;
++        state->playing = p->playing;
++        ao_wakeup_playthread(ao);
++    } else {
++        state->playing = p->playing;
++    }
++}
++
++const struct ao_driver audio_out_sndio = {
++    .name      = "sndio",
++    .description = "sndio audio output",
++    .init      = init,
++    .uninit    = uninit,
++    .control   = control,
++    .reset     = reset,
++    .start     = start,
++    .write     = audio_write,
++    .get_state = get_state,
++    .priv_size = sizeof(struct priv),
++};
+diff -Naurp0 a/wscript b/wscript
+--- a/wscript	2021-11-01 14:44:39.000000000 +0000
++++ b/wscript	2021-12-22 21:14:10.003907572 +0000
+@@ -437,0 +438,5 @@ audio_output_features = [
++        'name': '--sndio',
++        'desc': 'sndio audio input/output',
++        'func': check_pkg_config('sndio'),
++        'default': 'disable'
++    }, {
+diff -Naurp0 a/wscript_build.py b/wscript_build.py
+--- a/wscript_build.py	2021-11-01 14:44:39.000000000 +0000
++++ b/wscript_build.py	2021-12-22 21:14:23.163906902 +0000
+@@ -250,0 +251 @@ def build(ctx):
++        ( "audio/out/ao_sndio.c",                "sndio" ),
diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template
index e7fe729f33d4..1a41698ff409 100644
--- a/srcpkgs/mpv/template
+++ b/srcpkgs/mpv/template
@@ -1,13 +1,13 @@
 # Template file for 'mpv'
 pkgname=mpv
 version=0.34.0
-revision=1
+revision=2
 build_style=waf3
 configure_args="--confdir=/etc/mpv --docdir=/usr/share/examples/mpv
  --enable-cdda --enable-dvbin --enable-dvdnav --enable-libarchive
  --enable-libmpv-shared --enable-cplugins $(vopt_enable alsa) $(vopt_enable caca)
  $(vopt_enable jack) $(vopt_enable lcms lcms2) $(vopt_enable lua)
- $(vopt_enable openal) $(vopt_enable pulseaudio pulse) $(vopt_enable sdl2)
+ $(vopt_enable openal) $(vopt_enable pulseaudio pulse) $(vopt_enable sdl2) $(vopt_enable sndio)
  $(vopt_enable vapoursynth) $(vopt_enable vdpau) $(vopt_enable vulkan)
  $(vopt_enable vulkan shaderc) $(vopt_enable wayland) $(vopt_enable x11)"
 hostmakedepends="pkg-config python3-docutils perl $(vopt_if wayland wayland-devel)"
@@ -17,7 +17,7 @@ makedepends="MesaLib-devel ffmpeg-devel harfbuzz-devel libXv-devel
  libarchive-devel $(vopt_if alsa alsa-lib-devel) $(vopt_if caca libcaca-devel)
  $(vopt_if jack jack-devel) $(vopt_if lcms lcms2-devel)
  $(vopt_if lua lua52-devel) $(vopt_if openal libopenal-devel)
- $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if sdl2 SDL2-devel)
+ $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if sndio sndio-devel)
  $(vopt_if vapoursynth vapoursynth-devel) $(vopt_if vdpau libvdpau-devel)
  $(vopt_if vulkan "Vulkan-Headers vulkan-loader shaderc libplacebo-devel")
  $(vopt_if wayland "wayland-devel wayland-protocols libxkbcommon-devel")
@@ -35,7 +35,7 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-build_options="alsa caca jack lcms lua openal pulseaudio sdl2 vapoursynth vdpau
+build_options="alsa caca jack lcms lua openal pulseaudio sdl2 sndio vapoursynth vdpau
  vulkan wayland x11"
 build_options_default="alsa jack lcms lua pulseaudio vdpau vulkan wayland x11"
 desc_option_caca="Enable support for libcaca video output"

  parent reply	other threads:[~2021-12-23  1:03 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-22 21:59 [PR PATCH] add combined sndio patch for mpv from OpenBSD ports robbie01
2021-12-22 22:09 ` [PR PATCH] [Updated] mpv: add sndio patch robbie01
2021-12-23  1:03 ` robbie01 [this message]
2021-12-23  1:04 ` robbie01
2021-12-23 14:21 ` ericonr
2021-12-23 22:22 ` robbie01
2021-12-23 22:28 ` robbie01
2022-01-24 10:16 ` robbie01
2022-01-24 10:16 ` [PR PATCH] [Closed]: " robbie01

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211223010346.LoaLN-kvyWPXHlpi7hqek19SoXvY-K7TdXGqdM7TzNk@z \
    --to=robbie01@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).