 @@ -1,18 +1,18 @@
-$NetBSD: patch-audio_out_ao__netbsd.c,v 1.4 2020/04/08 12:17:02 nia Exp $
+$NetBSD: patch-audio_out_ao__netbsd.c,v 1.5 2020/04/09 20:53:39 nia Exp $
 NetBSD audio support.
---- audio/out/ao_netbsd.c.orig	2020-04-08 12:06:20.470592603 +0000
+--- audio/out/ao_netbsd.c.orig	2020-04-09 20:51:23.971921857 +0000
 +++ audio/out/ao_netbsd.c
 @@ -0,0 +1,276 @@
 +/*
 + * Copyright (c) 2020 Nia Alarie <nia@NetBSD.org>
 + * All rights reserved.
 + *
 + * Redistribution and use in source and binary forms, with or without
 + * modification, are permitted provided that the following conditions
 + * are met:
 + *
 + * 1. Redistributions of source code must retain the above copyright
 + *    notice, this list of conditions and the following disclaimer.
 + * 2. Redistributions in binary form must reproduce the above copyright
 @@ -36,73 +36,71 @@ NetBSD audio support.
 +#include <unistd.h>
 +#include <fcntl.h>
 +#include <errno.h>
 +#include <stdint.h>
 +#include <string.h>
++
 +#include "options/m_option.h"
 +#include "common/msg.h"
++
 +#include "audio/format.h"
 +#include "ao.h"
 +#include "internal.h"
++
-+#ifndef NETBSD_MAX_DEVS
++#ifndef NETBSD_MAX_CHANNELS
-+#define NETBSD_MAX_DEVS (8)
++#define NETBSD_MAX_CHANNELS (12)
 +#endif
++
-+#ifndef NETBSD_BUF_SIZE
++#ifndef NETBSD_MAX_DEVS
-+#define NETBSD_BUF_SIZE (1024)
++#define NETBSD_MAX_DEVS (8)
 +#endif
++
 +struct priv {
 +    int fd;
 +    uint64_t total_blocks; /* audio blocks output */
 +    uint64_t total_bytes; /* bytes sent to the queue */
 +};
++
 +static int init(struct ao *ao)
 +{
 +    char device[16] = "/dev/audio";
 +    struct priv *p = ao->priv;
 +    struct audio_info info;
 +    struct audio_info hw_info;
 +    struct audio_prinfo *pinfo;
 +    struct mp_chmap_sel sel = {0};
++
 +    AUDIO_INITINFO(&info);
 +    AUDIO_INITINFO(&hw_info);
 +    pinfo = &info.play;
++
 +    if (ao->device != NULL) {
 +         (void)snprintf(device, sizeof(device), "/dev/audio%s",
 +                        ao->device + sizeof("netbsd/") - 1);
 +    }
++
 +    MP_ERR(ao, "Opening device %s\n", device);
-+    if ((p->fd = open(device, O_WRONLY)) == -1) {
++    if ((p->fd = open(device, O_WRONLY | O_NONBLOCK)) == -1) {
 +        MP_ERR(ao, "Can't open audio device %s: %s\n",
 +               device, mp_strerror(errno));
 +        goto fail;
 +    }
++
 +    if (ioctl(p->fd, AUDIO_GETFORMAT, &hw_info) == -1) {
 +        MP_ERR(ao, "AUDIO_GETFORMAT failed: %s\n", mp_strerror(errno));
 +        goto fail;
 +    }
++
 +    info.mode = AUMODE_PLAY;
++
-+    for (int n = 1; n <= hw_info.play.channels; n++) {
++    for (int n = 1; n <= NETBSD_MAX_CHANNELS; n++) {
 +        struct mp_chmap map;
++
 +        mp_chmap_from_channels(&map, n);
 +        mp_chmap_sel_add_map(&sel, &map);
 +    }
++
 +    if (!ao_chmap_sel_adjust(ao, &sel, &ao->channels)) {
 +        MP_ERR(ao, "Failed to select a valid channel map\n");
 +        goto fail;
 +    }
++
 +    pinfo->channels = ao->channels.num;
 +    pinfo->sample_rate = ao->samplerate = hw_info.play.sample_rate;
 @@ -117,80 +115,91 @@ NetBSD audio support.
 +        pinfo->encoding = AUDIO_ENCODING_SLINEAR;
 +        break;
 +    default:
 +        pinfo->precision = 32;
 +        pinfo->encoding = AUDIO_ENCODING_SLINEAR;
 +        ao->format = AF_FORMAT_S32;
 +        break;
 +    }
++
 +    if (ioctl(p->fd, AUDIO_SETINFO, &info) == -1) {
 +        MP_ERR(ao, "AUDIO_SETINFO failed: %s\n", mp_strerror(errno));
 +        goto fail;
 +    }
++
 +    if (ioctl(p->fd, AUDIO_GETINFO, &info) == -1) {
 +        MP_ERR(ao, "AUDIO_GETINFO failed: %s\n", mp_strerror(errno));
 +        goto fail;
 +    }
++
 +    ao->period_size = info.blocksize / (pinfo->precision / 8) / pinfo->channels;
 +    ao->device_buffer = info.play.buffer_size / (pinfo->precision / 8) / pinfo->channels;
++
 +    return 0;
++
 +fail:
 +    if (p->fd != -1) {
 +        close(p->fd);
 +    }
 +    return -1;
 +}
++
 +static void uninit(struct ao *ao)
 +{
 +    struct priv *p = ao->priv;
++
 +    (void)ioctl(p->fd, AUDIO_FLUSH, NULL);
 +    (void)close(p->fd);
 +    p->fd = -1;
 +}
++
 +static void reset(struct ao *ao)
 +{
 +    struct priv *p = ao->priv;
 +    struct audio_info info;
 +    struct audio_offset offset;
++
-+    if (ioctl(p->fd, AUDIO_GETINFO, &info) == -1) {
++    if (ioctl(p->fd, AUDIO_GETBUFINFO, &info) == -1) {
-+        MP_ERR(ao, "AUDIO_GETINFO failed: %s\n", mp_strerror(errno));
++        MP_ERR(ao, "AUDIO_GETBUFINFO failed: %s\n", mp_strerror(errno));
 +        return;
 +    }
++
 +    (void)ioctl(p->fd, AUDIO_FLUSH, NULL);
 +    (void)ioctl(p->fd, AUDIO_GETOOFFS, &offset); /* reset deltablks */
 +    p->total_blocks = p->total_bytes / info.blocksize;
 +}
++
 +static void drain(struct ao *ao)
 +{
 +    struct priv *p = ao->priv;
 +    struct audio_info info;
 +    struct audio_offset offset;
++
-+    if (ioctl(p->fd, AUDIO_GETINFO, &info) == -1) {
++    if (ioctl(p->fd, AUDIO_GETBUFINFO, &info) == -1) {
-+        MP_ERR(ao, "AUDIO_GETINFO failed: %s\n", mp_strerror(errno));
++        MP_ERR(ao, "AUDIO_GETBUFINFO failed: %s\n", mp_strerror(errno));
 +        return;
 +    }
++
 +    (void)ioctl(p->fd, AUDIO_DRAIN, NULL);
 +    (void)ioctl(p->fd, AUDIO_FLUSH, NULL);
 +    (void)ioctl(p->fd, AUDIO_GETOOFFS, &offset); /* reset deltablks */
 +    p->total_blocks = p->total_bytes / info.blocksize;
 +}
++
 +static int get_space(struct ao *ao)
 +{
-+    return NETBSD_BUF_SIZE;
++    struct priv *p = ao->priv;
 +    struct audio_info info;
 +    unsigned int nblk;
++
 +    if (ioctl(p->fd, AUDIO_GETBUFINFO, &info) == -1) {
 +        MP_ERR(ao, "AUDIO_GETBUFINFO failed: %s\n", mp_strerror(errno));
 +        return 0;
 +    }
 +    nblk = info.hiwat - (info.play.seek / info.blocksize);
 +    return nblk * ao->period_size;
 +}
++
 +static void audio_pause(struct ao *ao)
 +{
 +    struct priv *p = ao->priv;
 +    struct audio_info info;
++
 +    if (ioctl(p->fd, AUDIO_GETINFO, &info) == -1) {
 +        MP_ERR(ao, "AUDIO_GETINFO failed: %s\n", mp_strerror(errno));
 +        return;
 +    }
 +    info.play.pause = 1;
 +    (void)ioctl(p->fd, AUDIO_SETINFO, &info);
 @@ -204,57 +213,48 @@ NetBSD audio support.
 +    if (ioctl(p->fd, AUDIO_GETINFO, &info) == -1) {
 +        MP_ERR(ao, "AUDIO_GETINFO failed: %s\n", mp_strerror(errno));
 +        return;
 +    }
 +    info.play.pause = 0;
 +    (void)ioctl(p->fd, AUDIO_SETINFO, &info);
 +    reset(ao);
 +}
++
 +static double get_delay(struct ao *ao)
 +{
 +    struct priv *p = ao->priv;
 +    struct audio_info info;
 +    struct audio_offset offset;
 +    uint64_t transfer_len;
++
-+    if (ioctl(p->fd, AUDIO_GETINFO, &info) == -1) {
++    if (ioctl(p->fd, AUDIO_GETBUFINFO, &info) == -1) {
-+        MP_ERR(ao, "AUDIO_GETINFO failed: %s\n", mp_strerror(errno));
++        MP_ERR(ao, "AUDIO_GETBUFINFO failed: %s\n", mp_strerror(errno));
 +        return 0;
 +    }
 +    if (ioctl(p->fd, AUDIO_GETOOFFS, &offset) == -1) {
 +        MP_ERR(ao, "AUDIO_GETOOFFS failed: %s\n", mp_strerror(errno));
 +        return 0;
 +    }
-+    p->total_blocks += offset.deltablks;
++    return (info.blocksize + info.play.seek) / (double)ao->bps;
 +    transfer_len = p->total_bytes - (p->total_blocks * info.blocksize);
 +    return transfer_len / (double)ao->bps;
 +}
++
 +static int play(struct ao *ao, void **data, int samples, int flags)
 +{
 +    struct priv *p = ao->priv;
 +    int len = samples * ao->sstride;
 +    int ret;
++
 +    if (len == 0)
 +        return 0;
++
 +    errno = 0;
 +    if ((ret = write(p->fd, data[0], len)) == -1) {
 +        MP_ERR(ao, "audio write failed: %s\n", mp_strerror(errno));
 +        return 0;
 +    }
 +    p->total_bytes += ret;
 +    return ret / ao->sstride;
 +}
++
 +static void list_devs(struct ao *ao, struct ao_device_list *list)
 +{
 +    char name[16];
 +    struct audio_device dev;
 +    int fd;
++
 +    for (int i = 0; 0 < NETBSD_MAX_DEVS; ++i) {
 +        (void)snprintf(name, sizeof(name), "/dev/audio%d", i);
 +        fd = open(name, O_WRONLY);
 +        if (fd == -1 || ioctl(fd, AUDIO_GETDEV, &dev) == -1) {

 @@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.106 2020/04/08 12:17:02 nia Exp $
+# $NetBSD: Makefile,v 1.107 2020/04/09 20:53:39 nia Exp $
 DISTNAME=	mpv-0.32.0
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mpv-player/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 MAINTAINER=	leot@NetBSD.org
 HOMEPAGE=	https://mpv.io/
 COMMENT=	Video player based on MPlayer and mplayer2
 LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2.1
 # needs sem_timedwait(3)
 NOT_FOR_PLATFORM=	NetBSD-[1-6].*-*
 NOT_PAX_MPROTECT_SAFE+=	bin/mpv

 @@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.64 2020/04/08 12:17:02 nia Exp $
+$NetBSD: distinfo,v 1.65 2020/04/09 20:53:39 nia Exp $
 SHA1 (mpv-0.32.0.tar.gz) = 5b69ea34dd5f8d209acd5266415c7bc00ab83341
 RMD160 (mpv-0.32.0.tar.gz) = d1e399fce8985a0399fe627248b87d8537cfefd7
 SHA512 (mpv-0.32.0.tar.gz) = f6426c0254ec0bf2f120e2196904f1e15fe17032b06764abca1d5e074f0cabb452eaf1cd09f8fd9b25b591accee7b881bfc3b06c19d5c98980305c4712486bd6
 Size (mpv-0.32.0.tar.gz) = 3148730 bytes
 SHA1 (patch-DOCS_man_ao.rst) = 5940fe1ad4d4328c03b9e6e5265c517762cfe2d0
 SHA1 (patch-audio_out_ao.c) = 1527c818d0f50801485ad3b90c5d86b30b2ca6f1
 SHA1 (patch-audio_out_ao__alsa.c) = c4661d0d22550d6e4eb2b7a42dd04dbcc58123b0
-SHA1 (patch-audio_out_ao__netbsd.c) = 1a88957a89dd8ebffaeadb14463c16796eb444d3
+SHA1 (patch-audio_out_ao__netbsd.c) = 6e3eee552499d61daee79e4b15a67e403dfafe9e
 SHA1 (patch-options_options.c) = c75fb27140ad21e0a11c6ded976116c544661f56
 SHA1 (patch-player_main.c) = 7d1d62091c327fca698844004ddb9a7871e15fce
 SHA1 (patch-video_out_drm__common.c) = a545a8aec29f1b3c44d26aacbc59b86d3333a0b9
 SHA1 (patch-video_out_wayland__common.c) = d3e72c4ff5426bd8349c15679a47d446c35666b1
 SHA1 (patch-wscript) = cc3f24fcd10a23fef81bad149bfb88bf7d2a117c
 SHA1 (patch-wscript__build.py) = bbb391be46f6e5c02d1946a07bb5d8bbb442fd5a