mirror of
https://github.com/alsa-project/alsa-lib.git
synced 2025-11-02 09:01:48 -05:00
Merged pcmfinal branch.
This commit is contained in:
Jaroslav Kysela
parent
3cc2b957fb
commit
41bb7068f2
57 changed files with 5189 additions and 3088 deletions
|
|
@ -21,13 +21,14 @@
|
|||
|
||||
#include <byteswap.h>
|
||||
#include <limits.h>
|
||||
#include <sys/shm.h>
|
||||
#include "pcm_local.h"
|
||||
#include "pcm_plugin.h"
|
||||
|
||||
typedef struct {
|
||||
snd_pcm_setup_t setup;
|
||||
snd_timestamp_t trigger_time;
|
||||
int state;
|
||||
int shmid;
|
||||
size_t appl_ptr;
|
||||
size_t hw_ptr;
|
||||
int poll_fd;
|
||||
|
|
@ -58,25 +59,10 @@ static int snd_pcm_null_info(snd_pcm_t *pcm ATTRIBUTE_UNUSED, snd_pcm_info_t * i
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int snd_pcm_null_channel_info(snd_pcm_t *pcm ATTRIBUTE_UNUSED, snd_pcm_channel_info_t * info)
|
||||
static int snd_pcm_null_channel_info(snd_pcm_t *pcm, snd_pcm_channel_info_t * info)
|
||||
{
|
||||
int channel = info->channel;
|
||||
memset(info, 0, sizeof(*info));
|
||||
info->channel = channel;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int snd_pcm_null_channel_params(snd_pcm_t *pcm ATTRIBUTE_UNUSED, snd_pcm_channel_params_t * params ATTRIBUTE_UNUSED)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int snd_pcm_null_channel_setup(snd_pcm_t *pcm ATTRIBUTE_UNUSED, snd_pcm_channel_setup_t * setup)
|
||||
{
|
||||
int channel = setup->channel;
|
||||
memset(setup, 0, sizeof(*setup));
|
||||
setup->channel = channel;
|
||||
return 0;
|
||||
snd_pcm_null_t *null = pcm->private;
|
||||
return snd_pcm_channel_info_shm(pcm, info, null->shmid);
|
||||
}
|
||||
|
||||
static int snd_pcm_null_status(snd_pcm_t *pcm, snd_pcm_status_t * status)
|
||||
|
|
@ -86,7 +72,7 @@ static int snd_pcm_null_status(snd_pcm_t *pcm, snd_pcm_status_t * status)
|
|||
status->state = null->state;
|
||||
status->trigger_time = null->trigger_time;
|
||||
gettimeofday(&status->tstamp, 0);
|
||||
status->avail = pcm->setup.buffer_size;
|
||||
status->avail = pcm->buffer_size;
|
||||
status->avail_max = status->avail;
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -118,7 +104,7 @@ static int snd_pcm_null_start(snd_pcm_t *pcm)
|
|||
assert(null->state == SND_PCM_STATE_PREPARED);
|
||||
null->state = SND_PCM_STATE_RUNNING;
|
||||
if (pcm->stream == SND_PCM_STREAM_CAPTURE)
|
||||
snd_pcm_mmap_appl_forward(pcm, pcm->setup.buffer_size);
|
||||
snd_pcm_mmap_appl_forward(pcm, pcm->buffer_size);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -182,7 +168,7 @@ static ssize_t snd_pcm_null_writei(snd_pcm_t *pcm, const void *buffer ATTRIBUTE_
|
|||
{
|
||||
snd_pcm_null_t *null = pcm->private;
|
||||
if (null->state == SND_PCM_STATE_PREPARED &&
|
||||
pcm->setup.start_mode != SND_PCM_START_EXPLICIT) {
|
||||
pcm->start_mode != SND_PCM_START_EXPLICIT) {
|
||||
null->state = SND_PCM_STATE_RUNNING;
|
||||
}
|
||||
return snd_pcm_null_fwd(pcm, size);
|
||||
|
|
@ -192,7 +178,7 @@ static ssize_t snd_pcm_null_writen(snd_pcm_t *pcm, void **bufs ATTRIBUTE_UNUSED,
|
|||
{
|
||||
snd_pcm_null_t *null = pcm->private;
|
||||
if (null->state == SND_PCM_STATE_PREPARED &&
|
||||
pcm->setup.start_mode != SND_PCM_START_EXPLICIT) {
|
||||
pcm->start_mode != SND_PCM_START_EXPLICIT) {
|
||||
null->state = SND_PCM_STATE_RUNNING;
|
||||
}
|
||||
return snd_pcm_null_fwd(pcm, size);
|
||||
|
|
@ -202,9 +188,9 @@ static ssize_t snd_pcm_null_readi(snd_pcm_t *pcm, void *buffer ATTRIBUTE_UNUSED,
|
|||
{
|
||||
snd_pcm_null_t *null = pcm->private;
|
||||
if (null->state == SND_PCM_STATE_PREPARED &&
|
||||
pcm->setup.start_mode != SND_PCM_START_EXPLICIT) {
|
||||
pcm->start_mode != SND_PCM_START_EXPLICIT) {
|
||||
null->state = SND_PCM_STATE_RUNNING;
|
||||
snd_pcm_mmap_hw_forward(pcm, pcm->setup.buffer_size);
|
||||
snd_pcm_mmap_hw_forward(pcm, pcm->buffer_size);
|
||||
}
|
||||
return snd_pcm_null_fwd(pcm, size);
|
||||
}
|
||||
|
|
@ -213,9 +199,9 @@ static ssize_t snd_pcm_null_readn(snd_pcm_t *pcm, void **bufs ATTRIBUTE_UNUSED,
|
|||
{
|
||||
snd_pcm_null_t *null = pcm->private;
|
||||
if (null->state == SND_PCM_STATE_PREPARED &&
|
||||
pcm->setup.start_mode != SND_PCM_START_EXPLICIT) {
|
||||
pcm->start_mode != SND_PCM_START_EXPLICIT) {
|
||||
null->state = SND_PCM_STATE_RUNNING;
|
||||
snd_pcm_mmap_hw_forward(pcm, pcm->setup.buffer_size);
|
||||
snd_pcm_mmap_hw_forward(pcm, pcm->buffer_size);
|
||||
}
|
||||
return snd_pcm_null_fwd(pcm, size);
|
||||
}
|
||||
|
|
@ -227,111 +213,83 @@ static ssize_t snd_pcm_null_mmap_forward(snd_pcm_t *pcm, size_t size)
|
|||
|
||||
static ssize_t snd_pcm_null_avail_update(snd_pcm_t *pcm)
|
||||
{
|
||||
return pcm->setup.buffer_size;
|
||||
return pcm->buffer_size;
|
||||
}
|
||||
|
||||
static int snd_pcm_null_set_avail_min(snd_pcm_t *pcm, size_t frames)
|
||||
{
|
||||
pcm->setup.buffer_size = frames;
|
||||
pcm->avail_min = frames;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int snd_pcm_null_hw_info(snd_pcm_t *pcm ATTRIBUTE_UNUSED, snd_pcm_hw_info_t * info)
|
||||
{
|
||||
snd_pcm_hw_info_complete(info);
|
||||
info->fifo_size = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int snd_pcm_null_hw_params(snd_pcm_t *pcm ATTRIBUTE_UNUSED, snd_pcm_hw_params_t * params ATTRIBUTE_UNUSED)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int snd_pcm_null_sw_params(snd_pcm_t *pcm ATTRIBUTE_UNUSED, snd_pcm_sw_params_t * params)
|
||||
{
|
||||
if (params->start_mode > SND_PCM_START_LAST) {
|
||||
params->fail_mask = SND_PCM_SW_PARBIT_START_MODE;
|
||||
return -EINVAL;
|
||||
}
|
||||
if (params->ready_mode > SND_PCM_READY_LAST) {
|
||||
params->fail_mask = SND_PCM_SW_PARBIT_READY_MODE;
|
||||
return -EINVAL;
|
||||
}
|
||||
if (params->xrun_mode > SND_PCM_XRUN_LAST) {
|
||||
params->fail_mask = SND_PCM_SW_PARBIT_XRUN_MODE;
|
||||
return -EINVAL;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int snd_pcm_null_dig_params(snd_pcm_t *pcm ATTRIBUTE_UNUSED, snd_pcm_dig_params_t *params ATTRIBUTE_UNUSED)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int snd_pcm_null_dig_info(snd_pcm_t *pcm ATTRIBUTE_UNUSED, snd_pcm_dig_info_t *info ATTRIBUTE_UNUSED)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int snd_pcm_null_mmap(snd_pcm_t *pcm)
|
||||
{
|
||||
snd_pcm_mmap_info_t *i;
|
||||
int err;
|
||||
i = calloc(1, sizeof(*i));
|
||||
if (!i)
|
||||
return -ENOMEM;
|
||||
err = snd_pcm_alloc_user_mmap(pcm, i);
|
||||
if (err < 0) {
|
||||
free(i);
|
||||
return err;
|
||||
snd_pcm_null_t *null = pcm->private;
|
||||
if (!(pcm->info & SND_PCM_INFO_MMAP)) {
|
||||
size_t size = snd_pcm_frames_to_bytes(pcm, pcm->buffer_size);
|
||||
int id = shmget(IPC_PRIVATE, size, 0666);
|
||||
if (id < 0) {
|
||||
SYSERR("shmget failed");
|
||||
return -errno;
|
||||
}
|
||||
null->shmid = id;
|
||||
}
|
||||
pcm->mmap_info = i;
|
||||
pcm->mmap_info_count = 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int snd_pcm_null_munmap(snd_pcm_t *pcm)
|
||||
{
|
||||
int err = snd_pcm_free_mmap(pcm, pcm->mmap_info);
|
||||
if (err < 0)
|
||||
return err;
|
||||
free(pcm->mmap_info);
|
||||
pcm->mmap_info_count = 0;
|
||||
pcm->mmap_info = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int snd_pcm_null_params_info(snd_pcm_t *pcm ATTRIBUTE_UNUSED, snd_pcm_params_info_t * info)
|
||||
{
|
||||
int sizes = ((info->req_mask & SND_PCM_PARAMS_SFMT) &&
|
||||
(info->req_mask & SND_PCM_PARAMS_CHANNELS));
|
||||
info->flags = SND_PCM_INFO_MMAP | SND_PCM_INFO_MMAP_VALID |
|
||||
SND_PCM_INFO_INTERLEAVED | SND_PCM_INFO_NONINTERLEAVED |
|
||||
SND_PCM_INFO_PAUSE;
|
||||
info->formats = ~0;
|
||||
info->rates = SND_PCM_RATE_CONTINUOUS | SND_PCM_RATE_8000_192000;
|
||||
info->min_rate = 4000;
|
||||
info->max_rate = 192000;
|
||||
info->min_channels = 1;
|
||||
info->max_channels = 32;
|
||||
info->min_fragments = 1;
|
||||
info->max_fragments = 1024 * 1024;
|
||||
if (sizes) {
|
||||
info->buffer_size = 1024 * 1024;
|
||||
info->min_fragment_size = 1;
|
||||
info->max_fragment_size = 1024 * 1024;
|
||||
info->fragment_align = 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int snd_pcm_null_params(snd_pcm_t *pcm, snd_pcm_params_t * params)
|
||||
{
|
||||
snd_pcm_null_t *null = pcm->private;
|
||||
snd_pcm_setup_t *s = &null->setup;
|
||||
int w = snd_pcm_format_width(s->format.sfmt);
|
||||
if (w < 0) {
|
||||
params->fail_mask = SND_PCM_PARAMS_SFMT;
|
||||
return -EINVAL;
|
||||
if (shmctl(null->shmid, IPC_RMID, 0) < 0) {
|
||||
SYSERR("shmctl IPC_RMID failed");
|
||||
return -errno;
|
||||
}
|
||||
s->msbits = w;
|
||||
s->format = params->format;
|
||||
s->start_mode = params->start_mode;
|
||||
s->ready_mode = params->ready_mode;
|
||||
s->avail_min = params->avail_min;
|
||||
s->xfer_mode = params->xfer_mode;
|
||||
s->xfer_min = params->xfer_min;
|
||||
s->xfer_align = params->xfer_align;
|
||||
s->xrun_mode = params->xrun_mode;
|
||||
s->mmap_shape = params->mmap_shape;
|
||||
s->frag_size = params->frag_size;
|
||||
s->frags = s->buffer_size / s->frag_size;
|
||||
if (s->frags < 1)
|
||||
s->frags = 1;
|
||||
s->buffer_size = s->frag_size * s->frags;
|
||||
s->boundary = LONG_MAX - LONG_MAX % s->buffer_size;
|
||||
s->time = params->time;
|
||||
s->rate_master = s->format.rate;
|
||||
s->rate_divisor = 1;
|
||||
s->mmap_bytes = 0;
|
||||
s->fifo_size = 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int snd_pcm_null_setup(snd_pcm_t *pcm, snd_pcm_setup_t * setup)
|
||||
{
|
||||
snd_pcm_null_t *null = pcm->private;
|
||||
*setup = null->setup;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void snd_pcm_null_dump(snd_pcm_t *pcm, FILE *fp)
|
||||
{
|
||||
fprintf(fp, "Null PCM\n");
|
||||
if (pcm->valid_setup) {
|
||||
if (pcm->setup) {
|
||||
fprintf(fp, "Its setup is:\n");
|
||||
snd_pcm_dump_setup(pcm, fp);
|
||||
}
|
||||
|
|
@ -340,12 +298,12 @@ static void snd_pcm_null_dump(snd_pcm_t *pcm, FILE *fp)
|
|||
snd_pcm_ops_t snd_pcm_null_ops = {
|
||||
close: snd_pcm_null_close,
|
||||
info: snd_pcm_null_info,
|
||||
params_info: snd_pcm_null_params_info,
|
||||
params: snd_pcm_null_params,
|
||||
setup: snd_pcm_null_setup,
|
||||
hw_info: snd_pcm_null_hw_info,
|
||||
hw_params: snd_pcm_null_hw_params,
|
||||
sw_params: snd_pcm_null_sw_params,
|
||||
dig_params: snd_pcm_null_dig_params,
|
||||
dig_info: snd_pcm_null_dig_info,
|
||||
channel_info: snd_pcm_null_channel_info,
|
||||
channel_params: snd_pcm_null_channel_params,
|
||||
channel_setup: snd_pcm_null_channel_setup,
|
||||
dump: snd_pcm_null_dump,
|
||||
nonblock: snd_pcm_null_nonblock,
|
||||
async: snd_pcm_null_async,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue