summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Ruggles <[email protected]>2011-06-22 15:33:56 -0400
committerReinhard Tartler <[email protected]>2011-09-26 19:26:28 +0200
commit6ed533f56137f678ff8507012de14d277aded9cc (patch)
treeb44bf3fd7be7f1c2a02a897a5499fda4fcf308d7
parentc75ba07f6eb83439bc44e5504152f8ca03097bec (diff)
alsa: fallback to buffer_size/4 for period_size.
buffer_size/4 is the value used by aplay. This fixes output to null devices, e.g. writing ALSA output to a file. (cherry picked from commit 8bfd7f6a475225a0595bf657f8b99a8fffb461e4) Signed-off-by: Anton Khirnov <[email protected]>
-rw-r--r--libavdevice/alsa-audio-common.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavdevice/alsa-audio-common.c b/libavdevice/alsa-audio-common.c
index baa6ac79ca..4c7c881300 100644
--- a/libavdevice/alsa-audio-common.c
+++ b/libavdevice/alsa-audio-common.c
@@ -146,6 +146,8 @@ av_cold int ff_alsa_open(AVFormatContext *ctx, snd_pcm_stream_t mode,
}
snd_pcm_hw_params_get_period_size_min(hw_params, &period_size, NULL);
+ if (!period_size)
+ period_size = buffer_size / 4;
res = snd_pcm_hw_params_set_period_size_near(h, hw_params, &period_size, NULL);
if (res < 0) {
av_log(ctx, AV_LOG_ERROR, "cannot set ALSA period size (%s)\n",