pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/multimedia/mplayer-share Backport PulseAudio driver fr...
details: https://anonhg.NetBSD.org/pkgsrc/rev/e4e7fcf664bd
branches: trunk
changeset: 551784:e4e7fcf664bd
user: jmcneill <jmcneill%pkgsrc.org@localhost>
date: Sat Dec 20 00:43:47 2008 +0000
description:
Backport PulseAudio driver from MPlayer SVN.
diffstat:
multimedia/mplayer-share/Makefile.common | 6 +-
multimedia/mplayer-share/distinfo | 5 +-
multimedia/mplayer-share/files/ao_pulse.c | 386 ++++++++++++++++++++++++++++++
multimedia/mplayer-share/options.mk | 13 +-
multimedia/mplayer-share/patches/patch-aa | 36 ++-
multimedia/mplayer-share/patches/patch-be | 22 +
6 files changed, 460 insertions(+), 8 deletions(-)
diffs (truncated from 559 to 300 lines):
diff -r 0ae68428b474 -r e4e7fcf664bd multimedia/mplayer-share/Makefile.common
--- a/multimedia/mplayer-share/Makefile.common Sat Dec 20 00:16:46 2008 +0000
+++ b/multimedia/mplayer-share/Makefile.common Sat Dec 20 00:43:47 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.38 2008/09/08 14:32:42 joerg Exp $
+# $NetBSD: Makefile.common,v 1.39 2008/12/20 00:43:47 jmcneill Exp $
MPLAYER_DIST_VERSION= 1.0rc2
@@ -27,6 +27,7 @@
#
PATCHDIR= ${.CURDIR}/../../multimedia/mplayer-share/patches
+FILESDIR= ${.CURDIR}/../../multimedia/mplayer-share/files
DISTINFO_FILE= ${.CURDIR}/../../multimedia/mplayer-share/distinfo
RESTRICTED= Prohibited by USAs DMCA and patent law
@@ -51,6 +52,9 @@
# TMPDIR to ${WRKDIR}
CONFIGURE_ENV+= TMPDIR=${WRKDIR:Q}
+post-extract:
+ ${CP} ${FILESDIR}/ao_pulse.c ${WRKSRC}/libao2/ao_polyp.c
+
.include "../../mk/bsd.prefs.mk"
.include "../../multimedia/mplayer-share/options.mk"
diff -r 0ae68428b474 -r e4e7fcf664bd multimedia/mplayer-share/distinfo
--- a/multimedia/mplayer-share/distinfo Sat Dec 20 00:16:46 2008 +0000
+++ b/multimedia/mplayer-share/distinfo Sat Dec 20 00:43:47 2008 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.57 2008/12/18 16:40:58 bjs Exp $
+$NetBSD: distinfo,v 1.58 2008/12/20 00:43:47 jmcneill Exp $
SHA1 (mplayer-1.0rc10/MPlayer-1.0rc2.tar.bz2) = e9b496f3527c552004ec6d01d6b43f196b43ce2d
RMD160 (mplayer-1.0rc10/MPlayer-1.0rc2.tar.bz2) = 3b5cba1529856a177a5191e22f8dcc00b5a83c52
Size (mplayer-1.0rc10/MPlayer-1.0rc2.tar.bz2) = 9338201 bytes
-SHA1 (patch-aa) = cd6735a7fd2db3eeccc2f1417cb187648775bff6
+SHA1 (patch-aa) = 66237776593acde3de025d485285978e63b4996a
SHA1 (patch-ab) = 29bf59ecb3d283708ae1c5002d1fa71cac627cc9
SHA1 (patch-ac) = 6d0de4bd41d9842ea1bf46e9fbe60bf6a943b913
SHA1 (patch-ad) = d0b72eaa5e63d2cfd7828ea1a9973f1728c607b5
@@ -22,6 +22,7 @@
SHA1 (patch-bb) = 26d000bcbc94b9139e6dbc79237fdb3a109c6057
SHA1 (patch-bc) = fd46ce3cd6d5f7525e210cf6d475b89573ca988d
SHA1 (patch-bd) = 9132118a143758b6c9e9dffb713f7dadd29ce3c3
+SHA1 (patch-be) = d9b0573c9ea9767bed7d9b3f29cd07cc31c37519
SHA1 (patch-ca) = 68603a92b3dd8c7a33e6bc982f8ced1219fa419d
SHA1 (patch-tc) = 89f802ff0ebfc14d6f2a4b17177915f66c9f9038
SHA1 (patch-va) = db69c373e78048924c536055c68c7de0feabc623
diff -r 0ae68428b474 -r e4e7fcf664bd multimedia/mplayer-share/files/ao_pulse.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/mplayer-share/files/ao_pulse.c Sat Dec 20 00:43:47 2008 +0000
@@ -0,0 +1,386 @@
+/*
+ * PulseAudio audio output driver.
+ * Copyright (C) 2006 Lennart Poettering
+ * Copyright (C) 2007 Reimar Doeffinger
+ *
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <string.h>
+
+#include <pulse/pulseaudio.h>
+
+#include "config.h"
+#include "libaf/af_format.h"
+#include "mp_msg.h"
+#include "audio_out.h"
+#include "audio_out_internal.h"
+
+#define PULSE_CLIENT_NAME "MPlayer"
+
+/** General driver info */
+static ao_info_t info = {
+ "PulseAudio audio output",
+ "pulse",
+ "Lennart Poettering",
+ ""
+};
+
+/** PulseAudio playback stream object */
+static struct pa_stream *stream;
+
+/** PulseAudio connection context */
+static struct pa_context *context;
+
+/** Main event loop object */
+static struct pa_threaded_mainloop *mainloop;
+
+/** A temporary variable to store the current volume */
+static pa_cvolume volume;
+
+LIBAO_EXTERN(pulse)
+
+#define GENERIC_ERR_MSG(ctx, str) \
+ mp_msg(MSGT_AO, MSGL_ERR, "AO: [pulse] "str": %s\n", \
+ pa_strerror(pa_context_errno(ctx)))
+
+static void context_state_cb(pa_context *c, void *userdata) {
+ switch (pa_context_get_state(c)) {
+ case PA_CONTEXT_READY:
+ case PA_CONTEXT_TERMINATED:
+ case PA_CONTEXT_FAILED:
+ pa_threaded_mainloop_signal(mainloop, 0);
+ break;
+ }
+}
+
+static void stream_state_cb(pa_stream *s, void *userdata) {
+ switch (pa_stream_get_state(s)) {
+ case PA_STREAM_READY:
+ case PA_STREAM_FAILED:
+ case PA_STREAM_TERMINATED:
+ pa_threaded_mainloop_signal(mainloop, 0);
+ break;
+ }
+}
+
+static void stream_request_cb(pa_stream *s, size_t length, void *userdata) {
+ pa_threaded_mainloop_signal(mainloop, 0);
+}
+
+static void stream_latency_update_cb(pa_stream *s, void *userdata) {
+ pa_threaded_mainloop_signal(mainloop, 0);
+}
+
+static void success_cb(pa_stream *s, int success, void *userdata) {
+ if (userdata)
+ *(int *)userdata = success;
+ pa_threaded_mainloop_signal(mainloop, 0);
+}
+
+/**
+ * \brief waits for a pulseaudio operation to finish, frees it and
+ * unlocks the mainloop
+ * \param op operation to wait for
+ * \return 1 if operation has finished normally (DONE state), 0 otherwise
+ */
+static int waitop(pa_operation *op) {
+ pa_operation_state_t state;
+ if (!op) return 0;
+ state = pa_operation_get_state(op);
+ while (state == PA_OPERATION_RUNNING) {
+ pa_threaded_mainloop_wait(mainloop);
+ state = pa_operation_get_state(op);
+ }
+ pa_operation_unref(op);
+ pa_threaded_mainloop_unlock(mainloop);
+ return state == PA_OPERATION_DONE;
+}
+
+static const struct format_map_s {
+ int mp_format;
+ pa_sample_format_t pa_format;
+} format_maps[] = {
+ {AF_FORMAT_S16_LE, PA_SAMPLE_S16LE},
+ {AF_FORMAT_S16_BE, PA_SAMPLE_S16BE},
+#ifdef PA_SAMPLE_S32NE
+ {AF_FORMAT_S32_LE, PA_SAMPLE_S32LE},
+ {AF_FORMAT_S32_BE, PA_SAMPLE_S32BE},
+#endif
+#ifdef PA_SAMPLE_FLOAT32NE
+ {AF_FORMAT_FLOAT_LE, PA_SAMPLE_FLOAT32LE},
+ {AF_FORMAT_FLOAT_BE, PA_SAMPLE_FLOAT32BE},
+#endif
+ {AF_FORMAT_U8, PA_SAMPLE_U8},
+ {AF_FORMAT_MU_LAW, PA_SAMPLE_ULAW},
+ {AF_FORMAT_A_LAW, PA_SAMPLE_ALAW},
+ {AF_FORMAT_UNKNOWN, 0}
+};
+
+static int init(int rate_hz, int channels, int format, int flags) {
+ struct pa_sample_spec ss;
+ struct pa_channel_map map;
+ const struct format_map_s *fmt_map;
+ char *devarg = NULL;
+ char *host = NULL;
+ char *sink = NULL;
+
+ if (ao_subdevice) {
+ devarg = strdup(ao_subdevice);
+ sink = strchr(devarg, ':');
+ if (sink) *sink++ = 0;
+ if (devarg[0]) host = devarg;
+ }
+
+ ss.channels = channels;
+ ss.rate = rate_hz;
+
+ ao_data.samplerate = rate_hz;
+ ao_data.channels = channels;
+
+ fmt_map = format_maps;
+ while (fmt_map->mp_format != format) {
+ if (fmt_map->mp_format == AF_FORMAT_UNKNOWN) {
+ mp_msg(MSGT_AO, MSGL_V, "AO: [pulse] Unsupported format, using default\n");
+ fmt_map = format_maps;
+ break;
+ }
+ fmt_map++;
+ }
+ ao_data.format = fmt_map->mp_format;
+ ss.format = fmt_map->pa_format;
+
+ if (!pa_sample_spec_valid(&ss)) {
+ mp_msg(MSGT_AO, MSGL_ERR, "AO: [pulse] Invalid sample spec\n");
+ goto fail;
+ }
+
+ pa_channel_map_init_auto(&map, ss.channels, PA_CHANNEL_MAP_ALSA);
+ ao_data.bps = pa_bytes_per_second(&ss);
+
+ pa_cvolume_reset(&volume, ss.channels);
+
+ if (!(mainloop = pa_threaded_mainloop_new())) {
+ mp_msg(MSGT_AO, MSGL_ERR, "AO: [pulse] Failed to allocate main loop\n");
+ goto fail;
+ }
+
+ if (!(context = pa_context_new(pa_threaded_mainloop_get_api(mainloop), PULSE_CLIENT_NAME))) {
+ mp_msg(MSGT_AO, MSGL_ERR, "AO: [pulse] Failed to allocate context\n");
+ goto fail;
+ }
+
+ pa_context_set_state_callback(context, context_state_cb, NULL);
+
+ if (pa_context_connect(context, host, 0, NULL) < 0)
+ goto fail;
+
+ pa_threaded_mainloop_lock(mainloop);
+
+ if (pa_threaded_mainloop_start(mainloop) < 0)
+ goto unlock_and_fail;
+
+ /* Wait until the context is ready */
+ pa_threaded_mainloop_wait(mainloop);
+
+ if (pa_context_get_state(context) != PA_CONTEXT_READY)
+ goto unlock_and_fail;
+
+ if (!(stream = pa_stream_new(context, "audio stream", &ss, &map)))
+ goto unlock_and_fail;
+
+ pa_stream_set_state_callback(stream, stream_state_cb, NULL);
+ pa_stream_set_write_callback(stream, stream_request_cb, NULL);
+ pa_stream_set_latency_update_callback(stream, stream_latency_update_cb, NULL);
+
+ if (pa_stream_connect_playback(stream, sink, NULL, PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE, &volume, NULL) < 0)
+ goto unlock_and_fail;
+
+ /* Wait until the stream is ready */
+ pa_threaded_mainloop_wait(mainloop);
+
+ if (pa_stream_get_state(stream) != PA_STREAM_READY)
+ goto unlock_and_fail;
+
+ pa_threaded_mainloop_unlock(mainloop);
+
+ free(devarg);
+ return 1;
+
+unlock_and_fail:
+
+ if (mainloop)
+ pa_threaded_mainloop_unlock(mainloop);
+
+fail:
+ if (context)
+ GENERIC_ERR_MSG(context, "Init failed");
+ free(devarg);
+ uninit(1);
+ return 0;
+}
+
+/** Destroy libao driver */
+static void uninit(int immed) {
+ if (stream && !immed) {
+ pa_threaded_mainloop_lock(mainloop);
+ waitop(pa_stream_drain(stream, success_cb, NULL));
+ }
+
+ if (mainloop)
+ pa_threaded_mainloop_stop(mainloop);
+
Home |
Main Index |
Thread Index |
Old Index