diff options
| author | leot <leot@pkgsrc.org> | 2018-10-23 13:08:39 +0000 |
|---|---|---|
| committer | leot <leot@pkgsrc.org> | 2018-10-23 13:08:39 +0000 |
| commit | e2062069f730dee997bbaddb9199fe12256378bc (patch) | |
| tree | 90813624c2c07c46afa2a060757cbd3372a13339 /multimedia/mpv | |
| parent | cd4fee94605001ece2b46acf30714b24103e5f37 (diff) | |
| download | pkgsrc-e2062069f730dee997bbaddb9199fe12256378bc.tar.gz | |
mpv: Do not force files with multiple audio channels to stereo
With the previous version all files with >2 audio channels and an audio device
that supported them actually fall back inconditionally to stereo channel.
(Hopefully now the logic to gracefully handle audio channels should
work, sorry again for the noise!)
Diffstat (limited to 'multimedia/mpv')
| -rw-r--r-- | multimedia/mpv/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/mpv/patches/patch-audio_out_ao__oss.c | 17 |
2 files changed, 10 insertions, 11 deletions
diff --git a/multimedia/mpv/distinfo b/multimedia/mpv/distinfo index d2ab9461367..4da2e4d44e6 100644 --- a/multimedia/mpv/distinfo +++ b/multimedia/mpv/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.45 2018/10/23 12:39:35 leot Exp $ +$NetBSD: distinfo,v 1.46 2018/10/23 13:08:39 leot Exp $ SHA1 (mpv-0.29.1.tar.gz) = 83f2bc0eb5a8bec9a9d5efc7de0e19a442238ac5 RMD160 (mpv-0.29.1.tar.gz) = 72a4fda3a72ac4fd37ed04435833fa2cf378a012 SHA512 (mpv-0.29.1.tar.gz) = ec57c9ceaaf2915ee237dd5a1c5ea5d22725d8611e28a9b998e5bb0d8ab5bdf3631d0267fc7b54da31cb1eaa145ef35841e68846bd41c3b9e1024902e92fd086 Size (mpv-0.29.1.tar.gz) = 3059503 bytes -SHA1 (patch-audio_out_ao__oss.c) = b07972345960e4024ad7f48b166b4ebd81cb0758 +SHA1 (patch-audio_out_ao__oss.c) = 5bc2d81523876b31b226081868117a833c9e2f14 SHA1 (patch-player_main.c) = e794199990059cc95050032194bca70557c381d7 diff --git a/multimedia/mpv/patches/patch-audio_out_ao__oss.c b/multimedia/mpv/patches/patch-audio_out_ao__oss.c index f1d07825299..7a9f9383484 100644 --- a/multimedia/mpv/patches/patch-audio_out_ao__oss.c +++ b/multimedia/mpv/patches/patch-audio_out_ao__oss.c @@ -1,4 +1,4 @@ -$NetBSD: patch-audio_out_ao__oss.c,v 1.8 2018/10/23 12:39:35 leot Exp $ +$NetBSD: patch-audio_out_ao__oss.c,v 1.9 2018/10/23 13:08:39 leot Exp $ - ioctl(..., SNDCTL_DSP_CHANNELS, &nchannels) for not supported nchannels does not return an error and instead set nchannels to the default value. Instead of @@ -6,7 +6,7 @@ $NetBSD: patch-audio_out_ao__oss.c,v 1.8 2018/10/23 12:39:35 leot Exp $ --- audio/out/ao_oss.c.orig 2018-10-02 19:03:41.000000000 +0000 +++ audio/out/ao_oss.c -@@ -336,19 +336,24 @@ static int reopen_device(struct ao *ao, +@@ -336,19 +336,23 @@ static int reopen_device(struct ao *ao, mp_chmap_sel_add_map(&sel, &oss_layouts[n]); if (!ao_chmap_sel_adjust(ao, &sel, &channels)) goto fail; @@ -24,16 +24,15 @@ $NetBSD: patch-audio_out_ao__oss.c,v 1.8 2018/10/23 12:39:35 leot Exp $ reqchannels); goto fail; } -+ goto stereo; - } else { -- int c = reqchannels - 1; -+stereo: + if (nchannels != reqchannels) { + // Fallback to stereo -+ c = 1; -+ } else { -+ c = reqchannels - 1; ++ nchannels = 2; ++ goto stereo; + } + } else { +- int c = reqchannels - 1; ++stereo: ++ c = nchannels - 1; if (ioctl(p->audio_fd, SNDCTL_DSP_STEREO, &c) == -1) { MP_ERR(ao, "Failed to set audio device to %d channels.\n", reqchannels); |