int tmp, err;
char *flip = getenv("AUDIO_FLIP_LEFT");
- /* open linux audio device */
- if (!audio_device)
-#ifdef __OpenBSD__
- audio_device = "/dev/sound";
-#else
- audio_device = "/dev/dsp";
-#endif
-
if (is_output)
audio_fd = open(audio_device, O_WRONLY);
else
audio_fd = open(audio_device, O_RDONLY);
if (audio_fd < 0) {
perror(audio_device);
- return AVERROR_IO;
+ return AVERROR(EIO);
}
if (flip && *flip == '1') {
default:
av_log(NULL, AV_LOG_ERROR, "Soundcard does not support 16 bit sample format\n");
close(audio_fd);
- return AVERROR_IO;
+ return AVERROR(EIO);
}
err=ioctl(audio_fd, SNDCTL_DSP_SETFMT, &tmp);
if (err < 0) {
return 0;
fail:
close(audio_fd);
- return AVERROR_IO;
+ return AVERROR(EIO);
}
static int audio_close(AudioData *s)
st = s1->streams[0];
s->sample_rate = st->codec->sample_rate;
s->channels = st->codec->channels;
- ret = audio_open(s, 1, NULL);
+ ret = audio_open(s, 1, s1->filename);
if (ret < 0) {
- return AVERROR_IO;
+ return AVERROR(EIO);
} else {
return 0;
}
if (ret > 0)
break;
if (ret < 0 && (errno != EAGAIN && errno != EINTR))
- return AVERROR_IO;
+ return AVERROR(EIO);
}
s->buffer_ptr = 0;
}
s->sample_rate = ap->sample_rate;
s->channels = ap->channels;
- ret = audio_open(s, 0, ap->device);
+ ret = audio_open(s, 0, s1->filename);
if (ret < 0) {
av_free(st);
- return AVERROR_IO;
+ return AVERROR(EIO);
}
/* take real parameters */
struct audio_buf_info abufi;
if (av_new_packet(pkt, s->frame_size) < 0)
- return AVERROR_IO;
+ return AVERROR(EIO);
for(;;) {
struct timeval tv;
fd_set fds;
}
if (!(ret == 0 || (ret == -1 && (errno == EAGAIN || errno == EINTR)))) {
av_free_packet(pkt);
- return AVERROR_IO;
+ return AVERROR(EIO);
}
}
pkt->size = ret;
return 0;
}
-#ifdef CONFIG_AUDIO_DEMUXER
-AVInputFormat audio_demuxer = {
- "audio_device",
+#ifdef CONFIG_OSS_DEMUXER
+AVInputFormat oss_demuxer = {
+ "oss",
"audio grab and output",
sizeof(AudioData),
NULL,
};
#endif
-#ifdef CONFIG_AUDIO_MUXER
-AVOutputFormat audio_muxer = {
- "audio_device",
+#ifdef CONFIG_OSS_MUXER
+AVOutputFormat oss_muxer = {
+ "oss",
"audio grab and output",
"",
"",