[MPlayer-users] sblive and ac3
joy
joy at pingfm.org
Tue Jul 2 00:40:02 CEST 2002
On Mon, Jul 01, 2002 at 05:49:36PM +0200, Ashendra Singh wrote:
> [Automatic answer: RTFM (read DOCS, FAQ), also read DOCS/bugreports.html]
> i've installed alsa9 and my live card works (xmms etc) just not with
> mplayer with the followinf options (2 channels do work however)
> help please ???
>
try the patch i attached. copy it in the mplayer source tree, then it
should aply with
patch -p1 <ao_alsa9_whole_for_mplayer_09_pre5a.patch
recompile!
you will still get no sound then for the file you tried to play cause
you dont have the codec:
> Forcing audio codec: [ac3] drv:3 (AC3)
> Requested audio codec family [ac3] (vfm=3) not available (enable it at
^^^^^^^^^^^^^
> compile time!)
^^^^^^^^^^^^^^^^
but mplayer will not crash ;).
--
regards
____-
joy
________/\---------%%%___________-----------
webcast every sunday 2000 cest at pingfm.org
pgp key at: x-hkp://wwwkeys.de.pgp.net
-------------- next part --------------
diff -Naur /usr/local2/src/MPlayer-0.90pre5/libao2/ao_alsa9.c /usr/local2/src/MPlayer-0.90pre5_patched/libao2/ao_alsa9.c
--- MPlayer-0.90pre5/libao2/ao_alsa9.c Sun May 26 14:30:54 2002
+++ MPlayer-0.90pre5_patched/libao2/ao_alsa9.c Mon Jul 1 23:26:37 2002
@@ -3,16 +3,16 @@
(C) Alex Beregszaszi <alex at naxine.org>
- modified for better alsa-0.9.0beta8a-support by Joy Winter <joy at pingfm.org>
+ modified for better alsa-0.9.0beta12(rc1)-support by Joy Winter <joy at pingfm.org>
additional AC3 passthrough support by Andy Lo A Foe <andy at alsaplayer.org>
- This driver is still at alpha stage.
- If you want stable sound-support use the OSS emulation instead.
-
Any bugreports regarding to this driver are welcome either to the mplayer-user-mailinglist or directly to the authors.
*/
#include <errno.h>
+#include <sys/time.h>
+#include <stdlib.h>
+#include <math.h>
#include "../config.h"
@@ -46,15 +46,30 @@
static snd_pcm_hw_params_t *alsa_hwparams;
static snd_pcm_sw_params_t *alsa_swparams;
static char *alsa_device;
-#define ALSA_DEVICE_SIZE 48
-static int alsa_fragsize = 8192; /* possible 4096, original 8192 */
+/* possible 4096, original 8192, OUTBURST is set statically to 512 in config.h */
+static int alsa_fragsize = 4096; //OUTBURST
static int alsa_fragcount = 8;
static int chunk_size = -1;
-static int start_delay = 1;
+static int buffer_size = 0;
+static size_t bits_per_sample, bits_per_frame;
+static size_t chunk_bytes;
+
+int ao_mmap = 0;
+int ao_noblock = 0;
+
+static int open_mode;
+static int set_block_mode;
+
+#define ALSA_DEVICE_SIZE 48
+
+#undef BUFFERTIME
+#define SET_CHUNKSIZE
+#define SW_PARAMS
snd_pcm_t *
+
spdif_init(int acard, int adevice)
{
//char *pcm_name = "hw:0,2"; /* first card second device */
@@ -138,8 +153,8 @@
fprintf(stderr, "Broken configuration for this PCM: no configurations available");
return NULL;
}
- err = snd_pcm_hw_params_set_access(handler, params,
- SND_PCM_ACCESS_RW_INTERLEAVED);
+
+ err = snd_pcm_hw_params_set_access(handler, params,SND_PCM_ACCESS_RW_INTERLEAVED);
if (err < 0) {
fprintf(stderr, "Access tyep not available");
return NULL;
@@ -175,15 +190,107 @@
/* to set/get/query special features/parameters */
static int control(int cmd, int arg)
{
- return(CONTROL_UNKNOWN);
+ switch(cmd) {
+ case AOCONTROL_QUERY_FORMAT:
+ return CONTROL_TRUE;
+ case AOCONTROL_GET_VOLUME:
+ case AOCONTROL_SET_VOLUME:
+ {
+ ao_control_vol_t *vol = (ao_control_vol_t *)arg;
+
+ int err;
+ snd_mixer_t *handle;
+ snd_mixer_elem_t *elem;
+ snd_mixer_selem_id_t *sid;
+
+ const char *mix_name = "PCM";
+ char *card = "default";
+
+ long pmin, pmax;
+ long get_vol, set_vol;
+ float calc_vol, diff, f_multi;
+
+ if(ao_data.format == AFMT_AC3)
+ return CONTROL_TRUE;
+
+ //allocate simple id
+ snd_mixer_selem_id_alloca(&sid);
+
+ //sets simple-mixer index and name
+ snd_mixer_selem_id_set_index(sid, 0);
+ snd_mixer_selem_id_set_name(sid, mix_name);
+
+ if ((err = snd_mixer_open(&handle, 0)) < 0) {
+ printf("alsa-control: mixer open error: %s\n", snd_strerror(err));
+ return CONTROL_ERROR;
+ }
+
+ if ((err = snd_mixer_attach(handle, card)) < 0) {
+ printf("alsa-control: mixer attach %s error: %s", card, snd_strerror(err));
+ snd_mixer_close(handle);
+ return CONTROL_ERROR;
+ }
+
+ if ((err = snd_mixer_selem_register(handle, NULL, NULL)) < 0) {
+ printf("alsa-control: mixer register error: %s", snd_strerror(err));
+ snd_mixer_close(handle);
+ return CONTROL_ERROR;
+ }
+ err = snd_mixer_load(handle);
+ if (err < 0) {
+ printf("alsa-control: mixer load error: %s", snd_strerror(err));
+ snd_mixer_close(handle);
+ return CONTROL_ERROR;
+ }
+
+ elem = snd_mixer_find_selem(handle, sid);
+ if (!elem) {
+ printf("alsa-control: unable to find simple control '%s',%i\n", snd_mixer_selem_id_get_name(sid), snd_mixer_selem_id_get_index(sid));
+ snd_mixer_close(handle);
+ return CONTROL_ERROR;
+ }
+
+ snd_mixer_selem_get_playback_volume_range(elem,&pmin,&pmax);
+ f_multi = (100 / (float)pmax);
+
+ if (cmd == AOCONTROL_SET_VOLUME) {
+
+ diff = (vol->left+vol->right) / 2;
+ set_vol = rint(diff / f_multi);
+
+ if (set_vol < 0)
+ set_vol = 0;
+ else if (set_vol > pmax)
+ set_vol = pmax;
+
+ //setting channels
+ if ((err = snd_mixer_selem_set_playback_volume(elem, 0, set_vol)) < 0) {
+ printf("alsa-control: error setting left channel, %s",snd_strerror(err));
+ return CONTROL_ERROR;
+ }
+ if ((err = snd_mixer_selem_set_playback_volume(elem, 1, set_vol)) < 0) {
+ printf("alsa-control: error setting right channel, %s",snd_strerror(err));
+ return CONTROL_ERROR;
+ }
+
+ //printf("diff=%f, set_vol=%i, pmax=%i, mult=%f\n", diff, set_vol, pmax, f_multi);
+ }
+ else {
+ snd_mixer_selem_get_playback_volume(elem, 0, &get_vol);
+ calc_vol = get_vol;
+ calc_vol = rintf(calc_vol * f_multi);
+
+ vol->left = vol->right = (int)calc_vol;
+
+ //printf("get_vol = %i, calc=%i\n",get_vol, calc_vol);
+ }
+ snd_mixer_close(handle);
+ return CONTROL_OK;
+ }
+ }
+ return(CONTROL_UNKNOWN);
}
-#undef start /* orig. undef */
-#define buffsize
-#define buffertime /* orig. undef? */
-#define set_period
-#define sw_params /* orig. undef */
-#undef set_start_mode /* orig. undef */
/*
open & setup audio device
@@ -193,12 +300,11 @@
{
int err;
int cards = -1;
+ int period_val;
snd_pcm_info_t *alsa_info;
+ char *str_block_mode;
- size_t xfer_align; //new
- snd_pcm_uframes_t start_threshold, stop_threshold; //new
-
- printf("alsa-init: this driver is still at alpha-stage. if you want stable sound support use the OSS emulation instead.\n");
+ printf("alsa-init: testing and bugreports are welcome.\n");
printf("alsa-init: requested format: %d Hz, %d channels, %s\n", rate_hz,
channels, audio_out_format_name(format));
@@ -218,7 +324,7 @@
ao_data.format = format;
ao_data.channels = channels;
ao_data.outburst = OUTBURST;
- ao_data.buffersize = 16384;
+ ao_data.buffersize = MAX_OUTBURST; // was 16384
switch (format)
{
@@ -262,32 +368,50 @@
audio_out_format_name(format));
return(0);
default:
- break;
+ break;
}
- if ((err = snd_pcm_info_malloc(&alsa_info)) < 0)
- {
- printf("alsa-init: memory allocation error: %s\n", snd_strerror(err));
- return(0);
- }
-
if (ao_subdevice != NULL)
alsa_device = ao_subdevice;
if (alsa_device == NULL)
- {
- if ((alsa_device = malloc(ALSA_DEVICE_SIZE)) == NULL)
- {
+ {
+ int tmp_device, tmp_subdevice, err;
+
+ if ((err = snd_pcm_info_malloc(&alsa_info)) < 0)
+ {
+ printf("alsa-init: memory allocation error: %s\n", snd_strerror(err));
+ return(0);
+ }
+
+ if ((alsa_device = alloca(ALSA_DEVICE_SIZE)) == NULL)
+ {
printf("alsa-init: memory allocation error: %s\n", strerror(errno));
return(0);
- }
+ }
+
+ if ((tmp_device = snd_pcm_info_get_device(alsa_info)) < 0)
+ {
+ printf("alsa-init: cant get device\n");
+ return(0);
+ }
- snprintf(alsa_device, ALSA_DEVICE_SIZE, "hw:%d,%d",
- snd_pcm_info_get_device(alsa_info),
- snd_pcm_info_get_subdevice(alsa_info));
+ if ((tmp_subdevice = snd_pcm_info_get_subdevice(alsa_info)) < 0)
+ {
+ printf("alsa-init: cant get subdevice\n");
+ return(0);
+ }
+
+ if (verbose)
+ printf("alsa-init: got device=%i, subdevice=%i\n", tmp_device, tmp_subdevice);
+
+ if ((err = snprintf(alsa_device, ALSA_DEVICE_SIZE, "hw:%1d,%1d", tmp_device, tmp_subdevice)) <= 0)
+ {
+ printf("alsa-init: cant wrote device-id\n");
+ }
snd_pcm_info_free(alsa_info);
- }
+ }
printf("alsa-init: %d soundcard%s found, using: %s\n", cards+1,
(cards >= 0) ? "" : "s", alsa_device);
@@ -296,18 +420,51 @@
// Try to initialize the SPDIF interface
alsa_handler = spdif_init(0, 2);
}
-
+
+ //setting modes for block or nonblock-mode
+ if (ao_noblock) {
+ open_mode = SND_PCM_NONBLOCK;
+ set_block_mode = 1;
+ str_block_mode = "nonblock-mode";
+ }
+ else {
+ open_mode = 0;
+ set_block_mode = 0;
+ str_block_mode = "block-mode";
+ }
+
+
+ //modes = 0, SND_PCM_NONBLOCK, SND_PCM_ASYNC
if (!alsa_handler) {
- if ((err = snd_pcm_open(&alsa_handler, alsa_device, SND_PCM_STREAM_PLAYBACK,
- 0)) < 0)
- {
- printf("alsa-init: playback open error: %s\n", snd_strerror(err));
- return(0);
+ if ((err = snd_pcm_open(&alsa_handler, alsa_device, SND_PCM_STREAM_PLAYBACK, open_mode)) < 0)
+ {
+ if (ao_noblock) {
+ printf("alsa-init: open in nonblock-mode failed, trying to open in block-mode\n");
+ if ((err = snd_pcm_open(&alsa_handler, alsa_device, SND_PCM_STREAM_PLAYBACK, 0)) < 0) {
+ printf("alsa-init: playback open error: %s\n", snd_strerror(err));
+ return(0);
+ } else {
+ set_block_mode = 0;
+ str_block_mode = "block-mode";
}
- }
+ } else {
+ printf("alsa-init: playback open error: %s\n", snd_strerror(err));
+ return(0);
+ }
+ }
+ }
+
+ if ((err = snd_pcm_nonblock(alsa_handler, set_block_mode)) < 0) {
+ printf("alsa-init: error set block-mode %s\n", snd_strerror(err));
+ }
+ else if (verbose) {
+ printf("alsa-init: pcm opend in %s\n", str_block_mode);
+ }
- snd_pcm_hw_params_malloc(&alsa_hwparams);
+ snd_pcm_hw_params_alloca(&alsa_hwparams);
snd_pcm_sw_params_alloca(&alsa_swparams);
+
+ // setting hw-parameters
if ((err = snd_pcm_hw_params_any(alsa_handler, alsa_hwparams)) < 0)
{
printf("alsa-init: unable to get initial parameters: %s\n",
@@ -315,12 +472,21 @@
return(0);
}
- if ((err = snd_pcm_hw_params_set_access(alsa_handler, alsa_hwparams,
- SND_PCM_ACCESS_RW_INTERLEAVED)) < 0)
- {
- printf("alsa-init: unable to set access type: %s\n",
- snd_strerror(err));
- return(0);
+ if (ao_mmap) {
+ snd_pcm_access_mask_t *mask = alloca(snd_pcm_access_mask_sizeof());
+ snd_pcm_access_mask_none(mask);
+ snd_pcm_access_mask_set(mask, SND_PCM_ACCESS_MMAP_INTERLEAVED);
+ snd_pcm_access_mask_set(mask, SND_PCM_ACCESS_MMAP_NONINTERLEAVED);
+ snd_pcm_access_mask_set(mask, SND_PCM_ACCESS_MMAP_COMPLEX);
+ err = snd_pcm_hw_params_set_access_mask(alsa_handler, alsa_hwparams, mask);
+ printf("alsa-init: mmap set\n");
+ } else {
+ err = snd_pcm_hw_params_set_access(alsa_handler, alsa_hwparams,SND_PCM_ACCESS_RW_INTERLEAVED);
+ printf("alsa-init: interleave set\n");
+ }
+ if (err < 0) {
+ printf("alsa-init: unable to set access type: %s\n", snd_strerror(err));
+ return (0);
}
if ((err = snd_pcm_hw_params_set_format(alsa_handler, alsa_hwparams,
@@ -340,45 +506,13 @@
}
if ((err = snd_pcm_hw_params_set_rate_near(alsa_handler, alsa_hwparams, ao_data.samplerate, 0)) < 0)
-/* was originally only snd_pcm_hw_params_set_rate jp*/
{
printf("alsa-init: unable to set samplerate-2: %s\n",
snd_strerror(err));
- //snd_pcm_hw_params_dump(alsa_hwparams, errlog); jp
return(0);
}
-#ifdef set_period
- {
- if ((err = snd_pcm_hw_params_set_period_size(alsa_handler, alsa_hwparams, alsa_fragsize / 4, 0)) < 0)
- {
- printf("alsa-init: unable to set periodsize: %s\n",
- snd_strerror(err));
- return(0);
- }
- if ((err = snd_pcm_hw_params_set_periods(alsa_handler, alsa_hwparams, alsa_fragcount, 0)) < 0)
- {
- printf("alsa-init: unable to set periods: %s\n",
- snd_strerror(err));
- return(0);
- }
- }
-#endif
-#ifdef buffsize
- if ((err = snd_pcm_hw_params_get_buffer_size(alsa_hwparams)) < 0)
- {
- printf("alsa-init: unable to get buffer size: %s\n",
- snd_strerror(err));
- return(0);
- } else
- {
- ao_data.buffersize = err;
- if (verbose)
- printf("alsa-init: got buffersize %i\n", ao_data.buffersize);
- }
-#endif
-
-#ifdef buffertime
+#ifdef BUFFERTIME
{
int alsa_buffer_time = 500000; /* original 60 */
@@ -397,144 +531,156 @@
snd_strerror(err));
return(0);
}
- printf("alsa-init: buffer_time: %d, period_time :%d\n",
- alsa_buffer_time, err);
+ if (verbose)
+ printf("alsa-init: buffer_time: %d, period_time :%d\n",alsa_buffer_time, err);
}
#endif
- if ((err = snd_pcm_hw_params(alsa_handler, alsa_hwparams)) < 0)
- {
- printf("alsa-init: unable to set parameters: %s\n",
- snd_strerror(err));
+#ifdef SET_CHUNKSIZE
+ {
+ //set chunksize
+ chunk_size = alsa_fragsize / 4;
+
+ if ((err = snd_pcm_hw_params_set_period_size(alsa_handler, alsa_hwparams, chunk_size, 0)) < 0)
+ {
+ printf("alsa-init: unable to set periodsize: %s\n", snd_strerror(err));
return(0);
+ }
+ else if (verbose) {
+ printf("alsa-init: chunksize set to %i\n", chunk_size);
}
-#ifdef sw_params
- {
- chunk_size = snd_pcm_hw_params_get_period_size(alsa_hwparams, 0);
- start_threshold = (double) ao_data.samplerate * start_delay / 1000000;
- xfer_align = snd_pcm_sw_params_get_xfer_align(alsa_swparams);
+ //set period_count
+ if ((period_val = snd_pcm_hw_params_get_periods_max(alsa_hwparams, 0)) < alsa_fragcount) {
+ alsa_fragcount = period_val;
+ }
- if ((err = snd_pcm_sw_params_current(alsa_handler, alsa_swparams)) < 0)
+ if (verbose)
+ printf("alsa-init: current val=%i, fragcount=%i\n", period_val, alsa_fragcount);
+
+ if ((err = snd_pcm_hw_params_set_periods(alsa_handler, alsa_hwparams, alsa_fragcount, 0)) < 0) {
+ printf("alsa-init: unable to set periods: %s\n", snd_strerror(err));
+ }
+ }
+#endif
+
+ /* finally install hardware parameters */
+ if ((err = snd_pcm_hw_params(alsa_handler, alsa_hwparams)) < 0)
{
- printf("alsa-init: unable to get parameters: %s\n",
+ printf("alsa-init: unable to set hw-parameters: %s\n",
snd_strerror(err));
return(0);
}
-
- if ((err = snd_pcm_sw_params_set_avail_min(alsa_handler, alsa_swparams, chunk_size)) < 0)
- {
- printf("alsa-init: unable to set avail_min %s\n",snd_strerror(err));
- return(0);
- }
+ // end setting hw-params
-
- if ((err = snd_pcm_sw_params_set_start_threshold(alsa_handler, alsa_swparams, start_threshold)) < 0)
- {
- printf("alsa-init: unable to set start_threshold %s\n",snd_strerror(err));
- return(0);
- }
- }
- // if ((err = snd_pcm_sw_params_set_xfer_align(alsa_handler, alsa_swparams, xfer_align)) < 0)
- //{
- // printf("alsa-init: unable to set xfer_align: %s\n",
- // snd_strerror(err));
- // return(0);
- //}
-
-#ifdef set_start_mode
- if ((err = snd_pcm_sw_params_set_start_mode(alsa_handler, alsa_swparams,
- SND_PCM_START_DATA)) < 0)
- {
- printf("alsa-init: unable to set start mode: %s\n",
- snd_strerror(err));
+ // gets buffersize for control
+ if ((err = snd_pcm_hw_params_get_buffer_size(alsa_hwparams)) < 0)
+ {
+ printf("alsa-init: unable to get buffersize: %s\n", snd_strerror(err));
return(0);
+ }
+ else {
+ ao_data.buffersize = err;
+ if (verbose)
+ printf("alsa-init: got buffersize=%i\n", ao_data.buffersize);
}
-#endif
- if ((err = snd_pcm_sw_params(alsa_handler, alsa_swparams)) < 0)
+ // setting sw-params (only avail-min) if noblocking mode was choosed
+ if (ao_noblock)
{
- printf("alsa-init: unable to set parameters: %s\n",
- snd_strerror(err));
+
+ if ((err = snd_pcm_sw_params_current(alsa_handler, alsa_swparams)) < 0)
+ {
+ printf("alsa-init: unable to get parameters: %s\n",snd_strerror(err));
return(0);
- }
+ }
+
+ //set min available frames to consider pcm ready (4)
+ //increased for nonblock-mode should be set dynamically later
+ if ((err = snd_pcm_sw_params_set_avail_min(alsa_handler, alsa_swparams, chunk_size)) < 0)
+ {
+ printf("alsa-init: unable to set avail_min %s\n",snd_strerror(err));
+ return(0);
+ }
+
+ if ((err = snd_pcm_sw_params(alsa_handler, alsa_swparams)) < 0)
+ {
+ printf("alsa-init: unable to install sw-params\n");
+ return(0);
+ }
+
+ bits_per_sample = snd_pcm_format_physical_width(alsa_format);
+ bits_per_frame = bits_per_sample * channels;
+ chunk_bytes = chunk_size * bits_per_frame / 8;
+
+ if (verbose) {
+ printf("alsa-init: bits per sample (bps)=%i, bits per frame (bpf)=%i, chunk_bytes=%i\n",bits_per_sample,bits_per_frame,chunk_bytes);}
+
+ }//end swparams
-// snd_pcm_sw_params_default(alsa_handler, alsa_swparams);
-#endif
if ((err = snd_pcm_prepare(alsa_handler)) < 0)
{
printf("alsa-init: pcm prepare error: %s\n", snd_strerror(err));
return(0);
}
-#ifdef start
- if ((err = snd_pcm_start(alsa_handler)) < 0)
- {
- printf("alsa-init: pcm start error: %s\n", snd_strerror(err));
- if (err != -EPIPE)
- return(0);
- if ((err = snd_pcm_start(alsa_handler)) < 0)
- {
- printf("alsa-init: pcm start error: %s\n", snd_strerror(err));
- return(0);
- }
- }
-#endif
- printf("AUDIO: %d Hz/%d channels/%d bpf/%d bytes buffer/%s\n",
+ printf("alsa9: %d Hz/%d channels/%d bpf/%d bytes buffer/%s\n",
ao_data.samplerate, ao_data.channels, ao_data.bps, ao_data.buffersize,
snd_pcm_format_description(alsa_format));
return(1);
-}
+} // end init
+
/* close audio device */
static void uninit()
{
- int err;
- if (alsa_device != NULL)
- free(alsa_device);
-
- snd_pcm_hw_params_free(alsa_hwparams);
-
- if ((err = snd_pcm_drain(alsa_handler)) < 0)
- {
- printf("alsa-uninit: pcm drain error: %s\n", snd_strerror(err));
- return;
- }
+ if (alsa_handler) {
+ int err;
-#ifdef start
- if ((err = snd_pcm_reset(alsa_handler)) < 0)
- {
- printf("alsa-uninit: pcm reset error: %s\n", snd_strerror(err));
- return;
+ if (!ao_noblock) {
+ if ((err = snd_pcm_drain(alsa_handler)) < 0)
+ {
+ printf("alsa-uninit: pcm drain error: %s\n", snd_strerror(err));
+ return;
+ }
}
-#endif
if ((err = snd_pcm_close(alsa_handler)) < 0)
- {
+ {
printf("alsa-uninit: pcm close error: %s\n", snd_strerror(err));
return;
- }
+ }
+ else {
+ alsa_handler = NULL;
+ alsa_device = NULL;
+ printf("alsa-uninit: pcm closed\n");
+ }
+ }
+ else {
+ printf("alsa-uninit: no handler defined!\n");
+ }
}
static void audio_pause()
{
int err;
- if ((err = snd_pcm_drain(alsa_handler)) < 0)
- {
- printf("alsa-pause: pcm drain error: %s\n", snd_strerror(err));
- return;
+ if (!ao_noblock) {
+ //drain causes error in nonblock-mode!
+ if ((err = snd_pcm_drain(alsa_handler)) < 0)
+ {
+ printf("alsa-pause: pcm drain error: %s\n", snd_strerror(err));
+ return;
+ }
}
+ else {
+ if (verbose)
+ printf("alsa-pause: paused nonblock\n");
-#ifdef reset
- if ((err = snd_pcm_reset(alsa_handler)) < 0)
- {
- printf("alsa-pause: pcm reset error: %s\n", snd_strerror(err));
- return;
+ return;
}
-#endif
}
static void audio_resume()
@@ -546,14 +692,6 @@
printf("alsa-resume: pcm prepare error: %s\n", snd_strerror(err));
return;
}
-
-#ifdef start
- if ((err = snd_pcm_start(alsa_handler)) < 0)
- {
- printf("alsa-resume: pcm start error: %s\n", snd_strerror(err));
- return;
- }
-#endif
}
/* stop playing and empty buffers (for seeking/pause) */
@@ -561,66 +699,133 @@
{
int err;
- if ((err = snd_pcm_drain(alsa_handler)) < 0)
- {
- printf("alsa-reset: pcm drain error: %s\n", snd_strerror(err));
- return;
- }
+ if (!ao_noblock) {
+ //drain causes error in nonblock-mode!
+ if ((err = snd_pcm_drain(alsa_handler)) < 0)
+ {
+ printf("alsa-pause: pcm drain error: %s\n", snd_strerror(err));
+ return;
+ }
-#ifdef start
- if ((err = snd_pcm_reset(alsa_handler)) < 0)
- {
- printf("alsa-reset: pcm reset error: %s\n", snd_strerror(err));
- return;
+ if ((err = snd_pcm_prepare(alsa_handler)) < 0)
+ {
+ printf("alsa-reset: pcm prepare error: %s\n", snd_strerror(err));
+ return;
+ }
+ } else {
+ if (verbose)
+ printf("alsa-reset: reset nonblocked");
+ return;
}
+}
+
+#ifndef timersub
+#define timersub(a, b, result) \
+do { \
+ (result)->tv_sec = (a)->tv_sec - (b)->tv_sec; \
+ (result)->tv_usec = (a)->tv_usec - (b)->tv_usec; \
+ if ((result)->tv_usec < 0) { \
+ --(result)->tv_sec; \
+ (result)->tv_usec += 1000000; \
+ } \
+} while (0)
#endif
- if ((err = snd_pcm_prepare(alsa_handler)) < 0)
- {
- printf("alsa-reset: pcm prepare error: %s\n", snd_strerror(err));
- return;
- }
+/* I/O error handler */
+static int xrun(u_char *str_mode)
+{
+ int err;
+ snd_pcm_status_t *status;
-#ifdef start
- if ((err = snd_pcm_start(alsa_handler)) < 0)
- {
- printf("alsa-reset: pcm start error: %s\n", snd_strerror(err));
- return;
- }
-#endif
+ snd_pcm_status_alloca(&status);
+
+ if ((err = snd_pcm_status(alsa_handler, status))<0) {
+ printf("status error: %s", snd_strerror(err));
+ return(0);
+ }
+
+ if (snd_pcm_status_get_state(status) == SND_PCM_STATE_XRUN) {
+ struct timeval now, diff, tstamp;
+ gettimeofday(&now, 0);
+ snd_pcm_status_get_trigger_tstamp(status, &tstamp);
+ timersub(&now, &tstamp, &diff);
+ printf("alsa-%s: xrun of at least %.3f msecs. resetting stream\n",
+ str_mode,
+ diff.tv_sec * 1000 + diff.tv_usec / 1000.0);
+ }
+
+ if ((err = snd_pcm_prepare(alsa_handler))<0) {
+ printf("xrun: prepare error: %s", snd_strerror(err));
+ return(0);
+ }
+
+ return(1); /* ok, data should be accepted again */
}
/*
plays 'len' bytes of 'data'
returns: number of bytes played
+ modified last at 29.06.02 by jp
*/
static int play(void* data, int len, int flags)
{
- int got_len;
-
- got_len = snd_pcm_writei(alsa_handler, data, len / 4);
-
- //if ((got_len = snd_pcm_writei(alsa_handler, data, (len/ao_data.bps))) != (len/ao_data.bps)) {
- //SHOULD BE FIXED
- if (got_len == -EPIPE) /* underrun? */
- {
- printf("alsa-play: alsa underrun, resetting stream\n");
- if ((got_len = snd_pcm_prepare(alsa_handler)) < 0)
- {
- printf("alsa-play: playback prepare error: %s\n", snd_strerror(got_len));
- return(0);
- }
- if ((got_len = snd_pcm_writei(alsa_handler, data, (len/ao_data.bps))) != (len/ao_data.bps))
- {
- printf("alsa-play: write error after reset: %s - giving up\n",
- snd_strerror(got_len));
- return(0);
- }
- return(len); /* 2nd write was ok */
- }
- return(len);
- //}
+
+ //ao_data.bps is always 4 cause its set to channels * 2 by alsa_format??
+ int num_frames = len / ao_data.bps;
+ signed short *output_samples=data;
+ snd_pcm_sframes_t res = 0;
+
+ //printf("alsa-play: frames=%i, len=%i",num_frames,len);
+
+ if (!alsa_handler) {
+ printf("alsa-play: device configuration error");
+ return 0;
+ }
+
+ while (num_frames > 0) {
+
+ if (ao_mmap) {
+ res = snd_pcm_mmap_writei(alsa_handler, (void *)output_samples, num_frames);
+ } else {
+ res = snd_pcm_writei(alsa_handler, (void *)output_samples, num_frames);
+ }
+
+ if (res == -EAGAIN) {
+ snd_pcm_wait(alsa_handler, 1000);
+ }
+ else if (res == -EPIPE) { /* underrun */
+ if (xrun("play") <= 0) {
+ printf("alsa-play: xrun reset error");
+ return(0);
+ }
+ }
+ else if (res == -ESTRPIPE) { /* suspend */
+ printf("alsa-play: pcm in suspend mode. trying to resume\n");
+ while ((res = snd_pcm_resume(alsa_handler)) == -EAGAIN)
+ sleep(1);
+ }
+ else if (res < 0) {
+ printf("alsa-play: unknown status, trying to reset soundcard\n");
+ if ((res = snd_pcm_prepare(alsa_handler)) < 0) {
+ printf("alsa-play: snd prepare error");
+ return(0);
+ break;
+ }
+ }
+
+ if (res > 0) {
+ output_samples += ao_data.channels * res;
+ num_frames -= res;
+ }
+
+ } //end while
+
+ if (res < 0) {
+ printf("alsa-play: write error %s", snd_strerror(res));
+ return 0;
+ }
+ return res < 0 ? (int)res : len;
}
/* how many byes are free in the buffer */
@@ -628,6 +833,9 @@
{
snd_pcm_status_t *status;
int ret;
+ char *str_status;
+
+ //snd_pcm_sframes_t avail_frames = 0;
if ((ret = snd_pcm_status_malloc(&status)) < 0)
{
@@ -643,25 +851,50 @@
switch(snd_pcm_status_get_state(status))
{
- case SND_PCM_STATE_OPEN:
- case SND_PCM_STATE_PREPARED:
- case SND_PCM_STATE_RUNNING:
- ret = snd_pcm_status_get_avail(status) * ao_data.bps;
- break;
- default:
- ret = 0;
+ case SND_PCM_STATE_OPEN:
+ str_status = "open";
+ case SND_PCM_STATE_PREPARED:
+ if (str_status != "open")
+ str_status = "prepared";
+ case SND_PCM_STATE_RUNNING:
+ ret = snd_pcm_status_get_avail(status) * ao_data.bps;
+ //avail_frames = snd_pcm_avail_update(alsa_handler) * ao_data.bps;
+ if (str_status != "open" && str_status != "prepared")
+ str_status = "running";
+ break;
+ case SND_PCM_STATE_PAUSED:
+ if (verbose) printf("alsa-space: paused");
+ str_status = "paused";
+ ret = 0;
+ break;
+ case SND_PCM_STATE_XRUN:
+ xrun("space");
+ str_status = "xrun";
+ ret = 0;
+ break;
+ default:
+ str_status = "undefined";
+ ret = 0;
}
-
+
+ if (verbose && str_status != "running")
+ printf("alsa-space: free space = %i, status=%i, %s --\n", ret, status, str_status);
snd_pcm_status_free(status);
- if (ret < 0)
- ret = 0;
+ if (ret < 0) {
+ printf("negative value!!\n");
+ ret = 0;
+ }
+
return(ret);
}
/* delay in seconds between first and last sample in buffer */
static float get_delay()
{
+
+ if (alsa_handler) {
+
snd_pcm_status_t *status;
float ret;
@@ -691,6 +924,10 @@
snd_pcm_status_free(status);
if (ret < 0)
- ret = 0;
+ ret = 0;
return(ret);
+
+ } else {
+ return(0);
+ }
}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 234 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-users/attachments/20020702/35c5030c/attachment.pgp>
More information about the MPlayer-users
mailing list