logo

overlay

My own overlay for experimentations, use with caution, no support is provided git clone https://hacktivis.me/git/overlay.git

mpv-0.33.1-sndio_pr9298.patch (11999B)

    

  1. From d41e8d39dd1de81aa5f56bb1aa4d9fffc1a2ef3d Mon Sep 17 00:00:00 2001
  2. From: rim <rozhuk.im@gmail.com>
  3. Date: Mon, 18 Oct 2021 23:55:49 +0200
  4. Subject: [PATCH] ao_sndio: add this audio output again
  6. Changes:
  7. - rewrite to use new internal MPV API;
  8. - code refactoring;
  9. - fix buffers size calculations;
  10. - buffer set to auto;
  11. - reset() - clean/reinit device only after errors;
  12. ---
  13.  DOCS/man/ao.rst      |   6 +
  14.  audio/out/ao.c       |   4 +
  15.  audio/out/ao_sndio.c | 311 +++++++++++++++++++++++++++++++++++++++++++
  16.  wscript              |   6 +
  17.  wscript_build.py     |   1 +
  18.  5 files changed, 328 insertions(+)
  19.  create mode 100644 audio/out/ao_sndio.c
  21. diff --git a/DOCS/man/ao.rst b/DOCS/man/ao.rst
  22. index cc42ec23a6..1f9bf915b3 100644
  23. --- a/DOCS/man/ao.rst
  24. +++ b/DOCS/man/ao.rst
  25. @@ -216,5 +216,11 @@ Available audio output drivers are:
  26.          ``no-waveheader`` option - with ``waveheader`` it's broken, because
  27.          it will write a WAVE header every time the file is opened.
  28.  
  29. +``sndio``
  30. +    Audio output to the OpenBSD sndio sound system
  31. +
  32. +    (Note: only supports mono, stereo, 4.0, 5.1 and 7.1 channel
  33. +    layouts.)
  34. +
  35.  ``wasapi``
  36.      Audio output to the Windows Audio Session API.
  37. diff --git a/audio/out/ao.c b/audio/out/ao.c
  38. index 52a38b63be..00893c0eb3 100644
  39. --- a/audio/out/ao.c
  40. +++ b/audio/out/ao.c
  41. @@ -40,6 +40,7 @@ extern const struct ao_driver audio_out_audiounit;
  42.  extern const struct ao_driver audio_out_coreaudio;
  43.  extern const struct ao_driver audio_out_coreaudio_exclusive;
  44.  extern const struct ao_driver audio_out_rsound;
  45. +extern const struct ao_driver audio_out_sndio;
  46.  extern const struct ao_driver audio_out_pulse;
  47.  extern const struct ao_driver audio_out_jack;
  48.  extern const struct ao_driver audio_out_openal;
  49. @@ -83,6 +84,9 @@ static const struct ao_driver * const audio_out_drivers[] = {
  50.  #endif
  51.  #if HAVE_SDL2_AUDIO
  52.      &audio_out_sdl,
  53. +#endif
  54. +#if HAVE_SNDIO
  55. +    &audio_out_sndio,
  56.  #endif
  57.      &audio_out_null,
  58.  #if HAVE_COREAUDIO
  59. diff --git a/audio/out/ao_sndio.c b/audio/out/ao_sndio.c
  60. new file mode 100644
  61. index 0000000000..ec2fb3bcb6
  62. --- /dev/null
  63. +++ b/audio/out/ao_sndio.c
  64. @@ -0,0 +1,311 @@
  65. +/*
  66. + * Copyright (c) 2008 Alexandre Ratchov <alex@caoua.org>
  67. + * Copyright (c) 2013 Christian Neukirchen <chneukirchen@gmail.com>
  68. + * Copyright (c) 2020 Rozhuk Ivan <rozhuk.im@gmail.com>
  69. + * 
  70. + * Permission to use, copy, modify, and distribute this software for any
  71. + * purpose with or without fee is hereby granted, provided that the above
  72. + * copyright notice and this permission notice appear in all copies.
  73. + *
  74. + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  75. + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  76. + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  77. + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  78. + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  79. + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  80. + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  81. + */
  82. +
  83. +#include "config.h"
  84. +
  85. +#include <sys/types.h>
  86. +#include <poll.h>
  87. +#include <errno.h>
  88. +#include <sndio.h>
  89. +
  90. +#include "options/m_option.h"
  91. +#include "common/msg.h"
  92. +
  93. +#include "audio/format.h"
  94. +#include "ao.h"
  95. +#include "internal.h"
  96. +
  97. +struct priv {
  98. +    struct sio_hdl *hdl;
  99. +    struct sio_par par;
  100. +    int delay;
  101. +    bool playing;
  102. +    int vol;
  103. +    int havevol;
  104. +    struct pollfd *pfd;
  105. +};
  106. +
  107. +
  108. +static const struct mp_chmap sndio_layouts[] = {
  109. +    {0},                                        /* empty */
  110. +    {1, {MP_SPEAKER_ID_FL}},                    /* mono */
  111. +    MP_CHMAP2(FL, FR),                          /* stereo */
  112. +    {0},                                        /* 2.1 */
  113. +    MP_CHMAP4(FL, FR, BL, BR),                  /* 4.0 */
  114. +    {0},                                        /* 5.0 */
  115. +    MP_CHMAP6(FL, FR, BL, BR, FC, LFE),         /* 5.1 */
  116. +    {0},                                        /* 6.1 */
  117. +    MP_CHMAP8(FL, FR, BL, BR, FC, LFE, SL, SR), /* 7.1 */
  118. +    /* Above is the fixed channel assignment for sndio, since we need to
  119. +     * fill all channels and cannot insert silence, not all layouts are
  120. +     * supported.
  121. +     * NOTE: MP_SPEAKER_ID_NA could be used to add padding channels. */
  122. +};
  123. +
  124. +static void uninit(struct ao *ao);
  125. +
  126. +
  127. +/* Make libsndio call movecb(). */
  128. +static void process_events(struct ao *ao)
  129. +{
  130. +    struct priv *p = ao->priv;
  131. +
  132. +    int n = sio_pollfd(p->hdl, p->pfd, POLLOUT);
  133. +    while (poll(p->pfd, n, 0) < 0 && errno == EINTR);
  134. +
  135. +    sio_revents(p->hdl, p->pfd);
  136. +}
  137. +
  138. +/* Call-back invoked to notify of the hardware position. */
  139. +static void movecb(void *addr, int delta)
  140. +{
  141. +    struct ao *ao = addr;
  142. +    struct priv *p = ao->priv;
  143. +
  144. +    p->delay -= delta;
  145. +}
  146. +
  147. +/* Call-back invoked to notify about volume changes. */
  148. +static void volcb(void *addr, unsigned newvol)
  149. +{
  150. +    struct ao *ao = addr;
  151. +    struct priv *p = ao->priv;
  152. +
  153. +    p->vol = newvol;
  154. +}
  155. +
  156. +static int init(struct ao *ao)
  157. +{
  158. +    struct priv *p = ao->priv;
  159. +    struct mp_chmap_sel sel = {0};
  160. +    size_t i;
  161. +    struct af_to_par {
  162. +        int format, bits, sig;
  163. +    };
  164. +    static const struct af_to_par af_to_par[] = {
  165. +        {AF_FORMAT_U8,   8, 0},
  166. +        {AF_FORMAT_S16, 16, 1},
  167. +        {AF_FORMAT_S32, 32, 1},
  168. +    };
  169. +    const struct af_to_par *ap;
  170. +    const char *device = ((ao->device) ? ao->device : SIO_DEVANY);
  171. +
  172. +    /* Opening device. */
  173. +    MP_VERBOSE(ao, "Using '%s' audio device.\n", device);
  174. +    p->hdl = sio_open(device, SIO_PLAY, 0);
  175. +    if (p->hdl == NULL) {
  176. +        MP_ERR(ao, "Can't open audio device %s.\n", device);
  177. +        goto err_out;
  178. +    }
  179. +
  180. +    sio_initpar(&p->par);
  181. +
  182. +    /* Selecting sound format. */
  183. +    ao->format = af_fmt_from_planar(ao->format);
  184. +
  185. +    p->par.bits = 16;
  186. +    p->par.sig = 1;
  187. +    p->par.le = SIO_LE_NATIVE;
  188. +    for (i = 0; i < MP_ARRAY_SIZE(af_to_par); i++) {
  189. +        ap = &af_to_par[i];
  190. +        if (ap->format == ao->format) {
  191. +            p->par.bits = ap->bits;
  192. +            p->par.sig = ap->sig;
  193. +            break;
  194. +        }
  195. +    }
  196. +
  197. +    p->par.rate = ao->samplerate;
  198. +
  199. +    /* Channels count. */
  200. +    for (i = 0; i < MP_ARRAY_SIZE(sndio_layouts); i++) {
  201. +        mp_chmap_sel_add_map(&sel, &sndio_layouts[i]);
  202. +    }
  203. +    if (!ao_chmap_sel_adjust(ao, &sel, &ao->channels))
  204. +        goto err_out;
  205. +
  206. +    p->par.pchan = ao->channels.num;
  207. +#ifdef __FreeBSD__
  208. +    /* OSS wrapper have bad defaults, overwrite it. */
  209. +    p->par.appbufsz = ((p->par.rate * 25) / 1000); /* 25 ms. */
  210. +#endif
  211. +    if (!sio_setpar(p->hdl, &p->par)) {
  212. +        MP_ERR(ao, "couldn't set params\n");
  213. +        goto err_out;
  214. +    }
  215. +
  216. +    /* Get current sound params. */
  217. +    if (!sio_getpar(p->hdl, &p->par)) {
  218. +        MP_ERR(ao, "couldn't get params\n");
  219. +        goto err_out;
  220. +    }
  221. +    if (p->par.bps > 1 && p->par.le != SIO_LE_NATIVE) {
  222. +        MP_ERR(ao, "swapped endian output not supported\n");
  223. +        goto err_out;
  224. +    }
  225. +
  226. +    /* Update sound params. */
  227. +    if (p->par.bits == 8 && p->par.bps == 1 && !p->par.sig) {
  228. +        ao->format = AF_FORMAT_U8;
  229. +    } else if (p->par.bits == 16 && p->par.bps == 2 && p->par.sig) {
  230. +        ao->format = AF_FORMAT_S16;
  231. +    } else if ((p->par.bits == 32 || p->par.msb) && p->par.bps == 4 && p->par.sig) {
  232. +        ao->format = AF_FORMAT_S32;
  233. +    } else {
  234. +        MP_ERR(ao, "couldn't set format\n");
  235. +        goto err_out;
  236. +    }
  237. +
  238. +    p->havevol = sio_onvol(p->hdl, volcb, ao);
  239. +    sio_onmove(p->hdl, movecb, ao);
  240. +
  241. +    p->pfd = talloc_array_ptrtype(p, p->pfd, sio_nfds(p->hdl));
  242. +    if (!p->pfd)
  243. +        goto err_out;
  244. +
  245. +    ao->device_buffer = p->par.bufsz;
  246. +    MP_VERBOSE(ao, "bufsz = %i, appbufsz = %i, round = %i\n",
  247. +        p->par.bufsz, p->par.appbufsz, p->par.round);
  248. +
  249. +    p->delay = 0;
  250. +    p->playing = false;
  251. +    if (!sio_start(p->hdl)) {
  252. +        MP_ERR(ao, "start: sio_start() fail.\n");
  253. +        goto err_out;
  254. +    }
  255. +
  256. +    return 0;
  257. +
  258. +err_out:
  259. +    uninit(ao);
  260. +    return -1;
  261. +}
  262. +
  263. +static void uninit(struct ao *ao)
  264. +{
  265. +    struct priv *p = ao->priv;
  266. +
  267. +    if (p->hdl) {
  268. +        sio_close(p->hdl);
  269. +        p->hdl = NULL;
  270. +    }
  271. +    p->pfd = NULL;
  272. +    p->playing = false;
  273. +}
  274. +
  275. +static int control(struct ao *ao, enum aocontrol cmd, void *arg)
  276. +{
  277. +    struct priv *p = ao->priv;
  278. +    ao_control_vol_t *vol = arg;
  279. +
  280. +    switch (cmd) {
  281. +    case AOCONTROL_GET_VOLUME:
  282. +        if (!p->havevol)
  283. +            return CONTROL_FALSE;
  284. +        vol->left = vol->right = p->vol * 100 / SIO_MAXVOL;
  285. +        break;
  286. +    case AOCONTROL_SET_VOLUME:
  287. +        if (!p->havevol)
  288. +            return CONTROL_FALSE;
  289. +        sio_setvol(p->hdl, vol->left * SIO_MAXVOL / 100);
  290. +        break;
  291. +    default:
  292. +        return CONTROL_UNKNOWN;
  293. +    }
  294. +    return CONTROL_OK;
  295. +}
  296. +
  297. +static void reset(struct ao *ao)
  298. +{
  299. +    struct priv *p = ao->priv;
  300. +
  301. +    if (p->playing) {
  302. +        p->playing = false;
  303. +
  304. +        if (!sio_stop(p->hdl)) {
  305. +            MP_ERR(ao, "reset: couldn't sio_stop()\n");
  306. +        }
  307. +        p->delay = 0;
  308. +        if (!sio_start(p->hdl)) {
  309. +            MP_ERR(ao, "reset: sio_start() fail.\n");
  310. +        }
  311. +    }
  312. +}
  313. +
  314. +static void start(struct ao *ao)
  315. +{
  316. +    struct priv *p = ao->priv;
  317. +
  318. +    p->playing = true;
  319. +    process_events(ao);
  320. +}
  321. +
  322. +static bool audio_write(struct ao *ao, void **data, int samples)
  323. +{
  324. +    struct priv *p = ao->priv;
  325. +    const size_t size = (samples * ao->sstride);
  326. +    size_t rc;
  327. +
  328. +    rc = sio_write(p->hdl, data[0], size);
  329. +    if (rc != size) {
  330. +        MP_WARN(ao, "audio_write: unexpected partial write: required: %zu, written: %zu.\n",
  331. +            size, rc);
  332. +        reset(ao);
  333. +        p->playing = false;
  334. +        return false;
  335. +    }
  336. +    p->delay += samples;
  337. +
  338. +    return true;
  339. +}
  340. +
  341. +static void get_state(struct ao *ao, struct mp_pcm_state *state)
  342. +{
  343. +    struct priv *p = ao->priv;
  344. +
  345. +    process_events(ao);
  346. +
  347. +    /* how many samples we can play without blocking */
  348. +    state->free_samples = ao->device_buffer - p->delay;
  349. +    /* how many samples are already in the buffer to be played */
  350. +    state->queued_samples = p->delay;
  351. +    /* delay in seconds between first and last sample in buffer */
  352. +    state->delay = p->delay / (double)p->par.rate;
  353. +
  354. +    /* reset on unexpected EOF / underrun */
  355. +    if (state->queued_samples && state->queued_samples &&
  356. +        state->queued_samples < state->free_samples &&
  357. +        p->playing)
  358. +    {
  359. +        reset(ao);
  360. +    }
  361. +    state->playing = p->playing;
  362. +}
  363. +
  364. +const struct ao_driver audio_out_sndio = {
  365. +    .name      = "sndio",
  366. +    .description = "sndio audio output",
  367. +    .init      = init,
  368. +    .uninit    = uninit,
  369. +    .control   = control,
  370. +    .reset     = reset,
  371. +    .start     = start,
  372. +    .write     = audio_write,
  373. +    .get_state = get_state,
  374. +    .priv_size = sizeof(struct priv),
  375. +};
  376. diff --git a/wscript b/wscript
  377. index b81f1202ec..e9af544b0c 100644
  378. --- a/wscript
  379. +++ b/wscript
  380. @@ -421,6 +421,12 @@ audio_output_features = [
  381.          'desc': 'SDL2 audio output',
  382.          'deps': 'sdl2',
  383.          'func': check_true,
  384. +    }, {
  385. +        'name': '--sndio',
  386. +        'desc': 'sndio audio input/output',
  387. +        'func': check_statement('sndio.h',
  388. +            'struct sio_par par; sio_initpar(&par); const char *s = SIO_DEVANY', lib='sndio'),
  389. +        'default': 'disable'
  390.      }, {
  391.          'name': '--pulse',
  392.          'desc': 'PulseAudio audio output',
  393. diff --git a/wscript_build.py b/wscript_build.py
  394. index 14c254e1ec..7943f850b0 100644
  395. --- a/wscript_build.py
  396. +++ b/wscript_build.py
  397. @@ -247,6 +247,7 @@ def build(ctx):
  398.          ( "audio/out/ao_pcm.c" ),
  399.          ( "audio/out/ao_pulse.c",                "pulse" ),
  400.          ( "audio/out/ao_sdl.c",                  "sdl2-audio" ),
  401. +        ( "audio/out/ao_sndio.c",                "sndio" ),
  402.          ( "audio/out/ao_wasapi.c",               "wasapi" ),
  403.          ( "audio/out/ao_wasapi_changenotify.c",  "wasapi" ),
  404.          ( "audio/out/ao_wasapi_utils.c",         "wasapi" ),
  405. -- 
  406. 2.32.0