david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wavcapture: Use stdio instead of QEMUFile

Browse Source 
QEMUFile * is only intended for migration nowadays.  Using it for
anything else just adds pain and a layer of buffers for no good
reason.

Signed-off-by: Juan Quintela <quintela@redhat.com>
CC: malc <av1474@comtv.ru>
Signed-off-by: malc <av1474@comtv.ru>
This commit is contained in:
Juan Quintela 2011-09-20 15:16:28 +02:00 committed by malc
parent 530889ff95
commit b04df2a440
1 changed files with 56 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
audio/wavcapture.c
View File

@ -3,7 +3,7 @@
#include "audio.h" #include "audio.h"
typedef struct { typedef struct {
QEMUFile *f; FILE *f;
int bytes; int bytes;
char *path; char *path;
int freq; int freq;
@ -35,17 +35,37 @@ static void wav_destroy (void *opaque)
uint8_t dlen[4]; uint8_t dlen[4];
uint32_t datalen = wav->bytes; uint32_t datalen = wav->bytes;
uint32_t rifflen = datalen + 36; uint32_t rifflen = datalen + 36;
Monitor *mon = cur_mon;
if (wav->f) { if (wav->f) {
le_store (rlen, rifflen, 4); le_store (rlen, rifflen, 4);
le_store (dlen, datalen, 4); le_store (dlen, datalen, 4);
qemu_fseek (wav->f, 4, SEEK_SET); if (fseek (wav->f, 4, SEEK_SET)) {
qemu_put_buffer (wav->f, rlen, 4); monitor_printf (mon, "wav_destroy: rlen fseek failed\nReason: %s\n",
strerror (errno));
qemu_fseek (wav->f, 32, SEEK_CUR); goto doclose;
qemu_put_buffer (wav->f, dlen, 4); }
qemu_fclose (wav->f); if (fwrite (rlen, 4, 1, wav->f) != 1) {
monitor_printf (mon, "wav_destroy: rlen fwrite failed\nReason %s\n",
strerror (errno));
goto doclose;
}
if (fseek (wav->f, 32, SEEK_CUR)) {
monitor_printf (mon, "wav_destroy: dlen fseek failed\nReason %s\n",
strerror (errno));
goto doclose;
}
if (fwrite (dlen, 1, 4, wav->f) != 4) {
monitor_printf (mon, "wav_destroy: dlen fwrite failed\nReason %s\n",
strerror (errno));
goto doclose;
}
doclose:
if (fclose (wav->f)) {
fprintf (stderr, "wav_destroy: fclose failed: %s",
strerror (errno));
}
} }
g_free (wav->path); g_free (wav->path);
@ -55,7 +75,10 @@ static void wav_capture (void *opaque, void *buf, int size)
{ {
WAVState *wav = opaque; WAVState *wav = opaque;
qemu_put_buffer (wav->f, buf, size); if (fwrite (buf, size, 1, wav->f) != 1) {
monitor_printf (cur_mon, "wav_capture: fwrite error\nReason: %s",
strerror (errno));
}
wav->bytes += size; wav->bytes += size;
} }
@ -71,9 +94,9 @@ static void wav_capture_info (void *opaque)
WAVState *wav = opaque; WAVState *wav = opaque;
char *path = wav->path; char *path = wav->path;
monitor_printf(cur_mon, "Capturing audio(%d,%d,%d) to %s: %d bytes\n", monitor_printf (cur_mon, "Capturing audio(%d,%d,%d) to %s: %d bytes\n",
wav->freq, wav->bits, wav->nchannels, wav->freq, wav->bits, wav->nchannels,
path ? path : "<not available>", wav->bytes); path ? path : "<not available>", wav->bytes);
} }
static struct capture_ops wav_capture_ops = { static struct capture_ops wav_capture_ops = {
@ -98,13 +121,13 @@ int wav_start_capture (CaptureState *s, const char *path, int freq,
CaptureVoiceOut *cap; CaptureVoiceOut *cap;
if (bits != 8 && bits != 16) { if (bits != 8 && bits != 16) {
monitor_printf(mon, "incorrect bit count %d, must be 8 or 16\n", bits); monitor_printf (mon, "incorrect bit count %d, must be 8 or 16\n", bits);
return -1; return -1;
} }
if (nchannels != 1 && nchannels != 2) { if (nchannels != 1 && nchannels != 2) {
monitor_printf(mon, "incorrect channel count %d, must be 1 or 2\n", monitor_printf (mon, "incorrect channel count %d, must be 1 or 2\n",
nchannels); nchannels);
return -1; return -1;
} }
@ -130,10 +153,10 @@ int wav_start_capture (CaptureState *s, const char *path, int freq,
le_store (hdr + 28, freq << shift, 4); le_store (hdr + 28, freq << shift, 4);
le_store (hdr + 32, 1 << shift, 2); le_store (hdr + 32, 1 << shift, 2);
wav->f = qemu_fopen (path, "wb"); wav->f = fopen (path, "wb");
if (!wav->f) { if (!wav->f) {
monitor_printf(mon, "Failed to open wave file `%s'\nReason: %s\n", monitor_printf (mon, "Failed to open wave file `%s'\nReason: %s\n",
path, strerror (errno)); path, strerror (errno));
g_free (wav); g_free (wav);
return -1; return -1;
} }
@ -143,19 +166,29 @@ int wav_start_capture (CaptureState *s, const char *path, int freq,
wav->nchannels = nchannels; wav->nchannels = nchannels;
wav->freq = freq; wav->freq = freq;
qemu_put_buffer (wav->f, hdr, sizeof (hdr)); if (fwrite (hdr, sizeof (hdr), 1, wav->f) != 1) {
monitor_printf (mon, "Failed to write header\nReason: %s\n",
strerror (errno));
goto error_free;
}
cap = AUD_add_capture (&as, &ops, wav); cap = AUD_add_capture (&as, &ops, wav);
if (!cap) { if (!cap) {
monitor_printf(mon, "Failed to add audio capture\n"); monitor_printf (mon, "Failed to add audio capture\n");
g_free (wav->path); goto error_free;
qemu_fclose (wav->f);
g_free (wav);
return -1;
} }
wav->cap = cap; wav->cap = cap;
s->opaque = wav; s->opaque = wav;
s->ops = wav_capture_ops; s->ops = wav_capture_ops;
return 0; return 0;
error_free:
g_free (wav->path);
if (fclose (wav->f)) {
monitor_printf (mon, "Failed to close wave file\nReason: %s\n",
strerror (errno));
}
g_free (wav);
return -1;
} }