Index: uspace/app/wavplay/Makefile =================================================================== --- uspace/app/wavplay/Makefile (revision ea6c83870417e73e052e92cb12eed894e739dbca) +++ uspace/app/wavplay/Makefile (revision 1de97fe6462d672ed1e88df7ccd3b67da8be0d13) @@ -31,11 +31,15 @@ LIBS = \ - $(LIBHOUND_PREFIX)/libhound.a + $(LIBHOUND_PREFIX)/libhound.a \ + $(LIBDRV_PREFIX)/libdrv.a EXTRA_CFLAGS = \ - -I$(LIBHOUND_PREFIX)/include -I$(LIBPCM_PREFIX)/include + -I$(LIBDRV_PREFIX)/include \ + -I$(LIBHOUND_PREFIX)/include \ + -I$(LIBPCM_PREFIX)/include SOURCES = \ - wavplay.c \ + dplay.c \ + main.c \ wave.c Index: uspace/app/wavplay/dplay.c =================================================================== --- uspace/app/wavplay/dplay.c (revision 1de97fe6462d672ed1e88df7ccd3b67da8be0d13) +++ uspace/app/wavplay/dplay.c (revision 1de97fe6462d672ed1e88df7ccd3b67da8be0d13) @@ -0,0 +1,221 @@ +/* + * Copyright (c) 2012 Jan Vesely + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup dplay + * @{ + */ +/** + * @file PCM playback audio devices + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include "wave.h" +#include "dplay.h" + +#define DEFAULT_DEVICE "/hw/pci0/00:01.0/sb16/pcm" +#define BUFFER_PARTS 2 + +typedef struct { + struct { + void *base; + size_t size; + void* position; + } buffer; + FILE* source; + volatile bool playing; + fibril_mutex_t mutex; + fibril_condvar_t cv; + audio_pcm_sess_t *device; +} playback_t; + +static void playback_initialize(playback_t *pb, audio_pcm_sess_t *sess) +{ + assert(sess); + assert(pb); + pb->buffer.base = NULL; + pb->buffer.size = 0; + pb->buffer.position = NULL; + pb->playing = false; + pb->source = NULL; + pb->device = sess; + fibril_mutex_initialize(&pb->mutex); + fibril_condvar_initialize(&pb->cv); +} + + +static void device_event_callback(ipc_callid_t iid, ipc_call_t *icall, void* arg) +{ + async_answer_0(iid, EOK); + playback_t *pb = arg; + const size_t buffer_part = pb->buffer.size / BUFFER_PARTS; + while (1) { + ipc_call_t call; + ipc_callid_t callid = async_get_call(&call); + switch(IPC_GET_IMETHOD(call)) { + case PCM_EVENT_FRAMES_PLAYED: + printf("%u frames\n", IPC_GET_ARG1(call)); + async_answer_0(callid, EOK); + break; + case PCM_EVENT_PLAYBACK_TERMINATED: + printf("Playback terminated\n"); + fibril_mutex_lock(&pb->mutex); + pb->playing = false; + fibril_condvar_signal(&pb->cv); + async_answer_0(callid, EOK); + fibril_mutex_unlock(&pb->mutex); + return; + default: + printf("Unknown event %d.\n", IPC_GET_IMETHOD(call)); + async_answer_0(callid, ENOTSUP); + continue; + + } + const size_t bytes = fread(pb->buffer.position, sizeof(uint8_t), + buffer_part, pb->source); + if (bytes == 0) { + audio_pcm_stop_playback(pb->device); + } + bzero(pb->buffer.position + bytes, buffer_part - bytes); + pb->buffer.position += buffer_part; + + if (pb->buffer.position >= (pb->buffer.base + pb->buffer.size)) + pb->buffer.position = pb->buffer.base; + } +} + + +static void play(playback_t *pb, unsigned channels, unsigned sampling_rate, + pcm_sample_format_t format) +{ + assert(pb); + assert(pb->device); + pb->buffer.position = pb->buffer.base; + printf("Playing: %dHz, %s, %d channel(s).\n", + sampling_rate, pcm_sample_format_str(format), channels); + const size_t bytes = fread(pb->buffer.base, sizeof(uint8_t), + pb->buffer.size, pb->source); + if (bytes != pb->buffer.size) + bzero(pb->buffer.base + bytes, pb->buffer.size - bytes); + printf("Buffer data ready.\n"); + fibril_mutex_lock(&pb->mutex); + const unsigned frames = pb->buffer.size / + (BUFFER_PARTS * channels * pcm_sample_format_size(format)); + int ret = audio_pcm_start_playback(pb->device, + frames, channels, sampling_rate, format); + if (ret != EOK) { + fibril_mutex_unlock(&pb->mutex); + printf("Failed to start playback: %s.\n", str_error(ret)); + return; + } + + for (pb->playing = true; pb->playing; + fibril_condvar_wait(&pb->cv, &pb->mutex)); + + fibril_mutex_unlock(&pb->mutex); + printf("\n"); +} + +int dplay(const char *device, const char *file) +{ + if (str_cmp(device, "default") == 0) + device = DEFAULT_DEVICE; + audio_pcm_sess_t *session = audio_pcm_open(device); + if (!session) { + printf("Failed to connect to device %s.\n", device); + return 1; + } + printf("Playing on device: %s.\n", device); + + const char* info = NULL; + int ret = audio_pcm_get_info_str(session, &info); + if (ret != EOK) { + printf("Failed to get PCM info.\n"); + goto close_session; + } + printf("Playing on %s.\n", info); + free(info); + + playback_t pb; + playback_initialize(&pb, session); + + ret = audio_pcm_get_buffer(pb.device, &pb.buffer.base, + &pb.buffer.size, device_event_callback, &pb); + if (ret != EOK) { + printf("Failed to get PCM buffer: %s.\n", str_error(ret)); + goto close_session; + } + printf("Buffer: %p %zu.\n", pb.buffer.base, pb.buffer.size); + uintptr_t ptr = 0; + as_get_physical_mapping(pb.buffer.base, &ptr); + printf("buffer mapped at %x.\n", ptr); + + pb.source = fopen(file, "rb"); + if (pb.source == NULL) { + ret = ENOENT; + printf("Failed to open %s.\n", file); + goto cleanup; + } + wave_header_t header; + fread(&header, sizeof(header), 1, pb.source); + unsigned rate, channels; + pcm_sample_format_t format; + const char *error; + ret = wav_parse_header(&header, NULL, NULL, &channels, &rate, &format, + &error); + if (ret != EOK) { + printf("Error parsing wav header: %s.\n", error); + fclose(pb.source); + goto cleanup; + } + + play(&pb, channels, rate, format); + fclose(pb.source); + +cleanup: + munmap(pb.buffer.base, pb.buffer.size); + audio_pcm_release_buffer(pb.device); +close_session: + audio_pcm_close(session); + return ret == EOK ? 0 : 1; +} +/** + * @} + */ Index: uspace/app/wavplay/dplay.h =================================================================== --- uspace/app/wavplay/dplay.h (revision 1de97fe6462d672ed1e88df7ccd3b67da8be0d13) +++ uspace/app/wavplay/dplay.h (revision 1de97fe6462d672ed1e88df7ccd3b67da8be0d13) @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2011 Jan Vesely + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +/** @addtogroup wavplay + * @{ + */ +/** @file + * @brief .wav file format. + */ +#ifndef DPLAY_H +#define DPLAY_H + +int dplay(const char *device, const char *file); + +#endif +/** + * @} + */ + Index: uspace/app/wavplay/main.c =================================================================== --- uspace/app/wavplay/main.c (revision 1de97fe6462d672ed1e88df7ccd3b67da8be0d13) +++ uspace/app/wavplay/main.c (revision 1de97fe6462d672ed1e88df7ccd3b67da8be0d13) @@ -0,0 +1,205 @@ +/* + * Copyright (c) 2012 Jan Vesely + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup wavplay + * @{ + */ +/** + * @file PCM playback audio devices + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "dplay.h" +#include "wave.h" + +#define NAME_MAX 32 +char name[NAME_MAX + 1]; + +typedef struct { + FILE* source; + volatile bool playing; + fibril_mutex_t mutex; + fibril_condvar_t cv; + hound_sess_t *server; +} playback_t; + +static void playback_initialize(playback_t *pb, hound_sess_t *sess) +{ + assert(pb); + pb->playing = false; + pb->source = NULL; + pb->server = sess; + fibril_mutex_initialize(&pb->mutex); + fibril_condvar_initialize(&pb->cv); +} + + +static void data_callback(void* arg, void *buffer, ssize_t size) +{ + playback_t *pb = arg; + assert(pb); + + if (size > 0) { + const ssize_t bytes = + fread(buffer, sizeof(uint8_t), size, pb->source); + printf("%zu bytes ready\n", bytes); + if (bytes < size) { + printf(" requested: %zd ready: %zd zero: %zd\n", + size, bytes, size - bytes); + bzero(buffer + bytes, size - bytes); + } + if (bytes == 0) { + pb->playing = false; + printf("The end, nothing more to play.\n"); + fibril_condvar_signal(&pb->cv); + } + } else { + printf("Got error %s.\n", str_error(size)); + pb->playing = false; + fibril_condvar_signal(&pb->cv); + } +} + +static void play(playback_t *pb, unsigned channels, unsigned rate, pcm_sample_format_t format) +{ + assert(pb); + /* Create playback client */ + int ret = hound_register_playback(pb->server, name, channels, rate, + format, data_callback, pb); + if (ret != EOK) { + printf("Failed to register playback: %s\n", str_error(ret)); + return; + } + + /* Connect */ + ret = hound_create_connection(pb->server, name, DEFAULT_SINK); + if (ret == EOK) { + fibril_mutex_lock(&pb->mutex); + for (pb->playing = true; pb->playing; + fibril_condvar_wait(&pb->cv, &pb->mutex)); + fibril_mutex_unlock(&pb->mutex); + + hound_destroy_connection(pb->server, name, DEFAULT_SINK); + } else + printf("Failed to connect: %s\n", str_error(ret)); + + printf("Unregistering playback\n"); + hound_unregister_playback(pb->server, name); +} + +static const struct option opts[] = { + {"device", required_argument, 0, 'd'}, + {"record", no_argument, 0, 'r'}, + {0, 0, 0, 0} +}; + + +int main(int argc, char *argv[]) +{ + const char *device = "default"; + int idx = 0; + bool direct = false, record = false; + optind = 0; + int ret = 0; + while (ret != -1) { + ret = getopt_long(argc, argv, "d:r", opts, &idx); + switch (ret) { + case 'd': + direct = true; + device = optarg; + break; + case 'r': + record = true; + break; + }; + } + + if (optind == argc) { + printf("Not enough arguments.\n"); + return 1; + } + const char *file = argv[optind]; + + printf("%s %s\n", record ? "Recording" : "Playing", file); + if (record) { + printf("Recording is not supported yet.\n"); + return 1; + } + if (direct) + return dplay(device, file); + + task_id_t tid = task_get_id(); + snprintf(name, NAME_MAX, "%s%" PRIu64 ":%s", argv[0], tid, file); + + printf("Client name: %s\n", name); + + hound_sess_t *sess = hound_get_session(); + if (!sess) { + printf("Failed to connect to hound service\n"); + return 1; + } + + playback_t pb; + playback_initialize(&pb, sess); + pb.source = fopen(file, "rb"); + if (pb.source == NULL) { + printf("Failed to open %s.\n", file); + hound_release_session(sess); + return 1; + } + wave_header_t header; + fread(&header, sizeof(header), 1, pb.source); + unsigned rate, channels; + pcm_sample_format_t format; + const char *error; + ret = wav_parse_header(&header, NULL, NULL, &channels, &rate, + &format, &error); + if (ret != EOK) { + printf("Error parsing wav header: %s.\n", error); + fclose(pb.source); + hound_release_session(sess); + return 1; + } + + play(&pb, channels, rate, format); + + printf("Releasing session\n"); + hound_release_session(sess); + return 0; +} +/** + * @} + */ Index: uspace/app/wavplay/wavplay.c =================================================================== --- uspace/app/wavplay/wavplay.c (revision ea6c83870417e73e052e92cb12eed894e739dbca) +++ (revision ) @@ -1,168 +1,0 @@ -/* - * Copyright (c) 2012 Jan Vesely - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup wavplay - * @{ - */ -/** - * @file PCM playback audio devices - */ - -#include -#include -#include -#include -#include -#include -#include - -#include "wave.h" - -#define NAME_MAX 32 -char name[NAME_MAX + 1]; - -typedef struct { - FILE* source; - volatile bool playing; - fibril_mutex_t mutex; - fibril_condvar_t cv; - hound_sess_t *server; -} playback_t; - -static void playback_initialize(playback_t *pb, hound_sess_t *sess) -{ - assert(pb); - pb->playing = false; - pb->source = NULL; - pb->server = sess; - fibril_mutex_initialize(&pb->mutex); - fibril_condvar_initialize(&pb->cv); -} - - -static void data_callback(void* arg, void *buffer, ssize_t size) -{ - playback_t *pb = arg; - assert(pb); - - if (size > 0) { - const ssize_t bytes = - fread(buffer, sizeof(uint8_t), size, pb->source); - printf("%zu bytes ready\n", bytes); - if (bytes < size) { - printf(" requested: %zd ready: %zd zero: %zd\n", - size, bytes, size - bytes); - bzero(buffer + bytes, size - bytes); - } - if (bytes == 0) { - pb->playing = false; - printf("The end, nothing more to play.\n"); - fibril_condvar_signal(&pb->cv); - } - } else { - printf("Got error %s.\n", str_error(size)); - pb->playing = false; - fibril_condvar_signal(&pb->cv); - } -} - -static void play(playback_t *pb, unsigned channels, unsigned rate, pcm_sample_format_t format) -{ - assert(pb); - /* Create playback client */ - int ret = hound_register_playback(pb->server, name, channels, rate, - format, data_callback, pb); - if (ret != EOK) { - printf("Failed to register playback: %s\n", str_error(ret)); - return; - } - - /* Connect */ - ret = hound_create_connection(pb->server, name, DEFAULT_SINK); - if (ret == EOK) { - fibril_mutex_lock(&pb->mutex); - for (pb->playing = true; pb->playing; - fibril_condvar_wait(&pb->cv, &pb->mutex)); - fibril_mutex_unlock(&pb->mutex); - - hound_destroy_connection(pb->server, name, DEFAULT_SINK); - } else - printf("Failed to connect: %s\n", str_error(ret)); - - printf("Unregistering playback\n"); - hound_unregister_playback(pb->server, name); -} - -int main(int argc, char *argv[]) -{ - if (argc != 2) - return 1; - const char *file = argv[1]; - - task_id_t tid = task_get_id(); - snprintf(name, NAME_MAX, "%s%" PRIu64 ":%s", argv[0], tid, file); - - printf("Client name: %s\n", name); - - hound_sess_t *sess = hound_get_session(); - if (!sess) { - printf("Failed to connect to hound service\n"); - return 1; - } - - playback_t pb; - playback_initialize(&pb, sess); - pb.source = fopen(file, "rb"); - if (pb.source == NULL) { - printf("Failed to open %s.\n", file); - hound_release_session(sess); - return 1; - } - wave_header_t header; - fread(&header, sizeof(header), 1, pb.source); - unsigned rate, channels; - pcm_sample_format_t format; - const char *error; - const int ret = wav_parse_header(&header, NULL, NULL, &channels, &rate, - &format, &error); - if (ret != EOK) { - printf("Error parsing wav header: %s.\n", error); - fclose(pb.source); - hound_release_session(sess); - return 1; - } - - play(&pb, channels, rate, format); - - printf("Releasing session\n"); - hound_release_session(sess); - return 0; -} -/** - * @} - */