diff options
Diffstat (limited to 'libavdevice/oss.c')
| -rw-r--r-- | libavdevice/oss.c | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/libavdevice/oss.c b/libavdevice/oss.c index eb8d454422..d74112825b 100644 --- a/libavdevice/oss.c +++ b/libavdevice/oss.c @@ -2,20 +2,20 @@ * Linux audio play and grab interface * Copyright (c) 2000, 2001 Fabrice Bellard * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -29,15 +29,16 @@ #include <sys/soundcard.h> #endif +#if HAVE_UNISTD_H #include <unistd.h> +#endif #include <fcntl.h> #include <sys/ioctl.h> #include "libavutil/log.h" #include "libavcodec/avcodec.h" - -#include "libavformat/avformat.h" +#include "avdevice.h" #include "oss.h" @@ -48,14 +49,13 @@ int ff_oss_audio_open(AVFormatContext *s1, int is_output, int audio_fd; int tmp, err; char *flip = getenv("AUDIO_FLIP_LEFT"); - char errbuff[128]; if (is_output) audio_fd = avpriv_open(audio_device, O_WRONLY); else audio_fd = avpriv_open(audio_device, O_RDONLY); if (audio_fd < 0) { - av_log(s1, AV_LOG_ERROR, "%s: %s\n", audio_device, strerror(errno)); + av_log(s1, AV_LOG_ERROR, "%s: %s\n", audio_device, av_err2str(AVERROR(errno))); return AVERROR(EIO); } @@ -64,15 +64,17 @@ int ff_oss_audio_open(AVFormatContext *s1, int is_output, } /* non blocking mode */ - if (!is_output) - fcntl(audio_fd, F_SETFL, O_NONBLOCK); + if (!is_output) { + if (fcntl(audio_fd, F_SETFL, O_NONBLOCK) < 0) { + av_log(s1, AV_LOG_WARNING, "%s: Could not enable non block mode (%s)\n", audio_device, av_err2str(AVERROR(errno))); + } + } s->frame_size = OSS_AUDIO_BLOCK_SIZE; #define CHECK_IOCTL_ERROR(event) \ if (err < 0) { \ - av_strerror(AVERROR(errno), errbuff, sizeof(errbuff)); \ - av_log(s1, AV_LOG_ERROR, #event ": %s\n", errbuff); \ + av_log(s1, AV_LOG_ERROR, #event ": %s\n", av_err2str(AVERROR(errno)));\ goto fail; \ } @@ -80,7 +82,10 @@ int ff_oss_audio_open(AVFormatContext *s1, int is_output, * We don't CHECK_IOCTL_ERROR here because even if failed OSS still may be * usable. If OSS is not usable the SNDCTL_DSP_SETFMTS later is going to * fail anyway. */ - (void) ioctl(audio_fd, SNDCTL_DSP_GETFMTS, &tmp); + err = ioctl(audio_fd, SNDCTL_DSP_GETFMTS, &tmp); + if (err < 0) { + av_log(s1, AV_LOG_WARNING, "SNDCTL_DSP_GETFMTS: %s\n", av_err2str(AVERROR(errno))); + } #if HAVE_BIGENDIAN if (tmp & AFMT_S16_BE) { |