diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2011-06-22 16:38:20 -0400 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2011-07-09 16:01:06 -0400 |
| commit | e35c674d13a7f180412cfe058530a2e7f1d49a90 (patch) | |
| tree | a719cbd75f877a31902d100a920c36e9bf30c966 | |
| parent | 8bfd7f6a475225a0595bf657f8b99a8fffb461e4 (diff) | |
| download | ffmpeg-e35c674d13a7f180412cfe058530a2e7f1d49a90.tar.gz | |
alsa: limit buffer_size to 32768 frames.
In testing, the file output plugin gave a max buffer size of about 20 million
frames, which is way more than what is really needed and causes a memory
allocation error on my system.
| -rw-r--r-- | libavdevice/alsa-audio-common.c | 1 | ||||
| -rw-r--r-- | libavdevice/alsa-audio.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/libavdevice/alsa-audio-common.c b/libavdevice/alsa-audio-common.c index 1e945fc389..126695f754 100644 --- a/libavdevice/alsa-audio-common.c +++ b/libavdevice/alsa-audio-common.c @@ -260,6 +260,7 @@ av_cold int ff_alsa_open(AVFormatContext *ctx, snd_pcm_stream_t mode, } snd_pcm_hw_params_get_buffer_size_max(hw_params, &buffer_size); + buffer_size = FFMIN(buffer_size, ALSA_BUFFER_SIZE_MAX); /* TODO: maybe use ctx->max_picture_buffer somehow */ res = snd_pcm_hw_params_set_buffer_size_near(h, hw_params, &buffer_size); if (res < 0) { diff --git a/libavdevice/alsa-audio.h b/libavdevice/alsa-audio.h index 1e0be1cac7..ee43463696 100644 --- a/libavdevice/alsa-audio.h +++ b/libavdevice/alsa-audio.h @@ -40,6 +40,8 @@ other formats */ #define DEFAULT_CODEC_ID AV_NE(CODEC_ID_PCM_S16BE, CODEC_ID_PCM_S16LE) +#define ALSA_BUFFER_SIZE_MAX 32768 + typedef struct { AVClass *class; snd_pcm_t *h; |