diff options
author | David 'Digit' Turner <digit@google.com> | 2009-09-14 14:32:27 -0700 |
---|---|---|
committer | David 'Digit' Turner <digit@google.com> | 2009-09-14 14:32:27 -0700 |
commit | 5d8f37ad78fc66901af50c762029a501561f3b23 (patch) | |
tree | 206790f8f21000850a98c4f9590a79e779106278 /audio/wavcapture.c | |
parent | cd059b15f2c7df69f4a087bd66900eb172e41d1c (diff) | |
download | external_qemu-5d8f37ad78fc66901af50c762029a501561f3b23.zip external_qemu-5d8f37ad78fc66901af50c762029a501561f3b23.tar.gz external_qemu-5d8f37ad78fc66901af50c762029a501561f3b23.tar.bz2 |
Merge upstream QEMU 10.0.50 into the Android source tree.
This change integrates many changes from the upstream QEMU sources.
Its main purpose is to enable correct ARMv6 and ARMv7 support to the
Android emulator. Due to the nature of the upstream code base, this
unfortunately also required changes to many other parts of the source.
Note that to ensure easier integrations in the future, some source files
and directories that have heavy Android-specific customization have been
renamed with an -android suffix. The original files are still there for
easier integration tracking, but *never* compiled. For example:
net.c net-android.c
qemu-char.c qemu-char-android.c
slirp/ slirp-android/
etc...
Tested on linux-x86, darwin-x86 and windows host machines.
Diffstat (limited to 'audio/wavcapture.c')
-rw-r--r-- | audio/wavcapture.c | 55 |
1 files changed, 25 insertions, 30 deletions
diff --git a/audio/wavcapture.c b/audio/wavcapture.c index d6f733e..1f49cd1 100644 --- a/audio/wavcapture.c +++ b/audio/wavcapture.c @@ -1,6 +1,6 @@ -#include "audio/audio.h" -#include "qemu_file.h" -#include "console.h" +#include "hw/hw.h" +#include "monitor.h" +#include "audio.h" typedef struct { QEMUFile *f; @@ -36,22 +36,19 @@ static void wav_destroy (void *opaque) uint32_t datalen = wav->bytes; uint32_t rifflen = datalen + 36; - if (!wav->f) { - return; - } + if (wav->f) { + le_store (rlen, rifflen, 4); + le_store (dlen, datalen, 4); - le_store (rlen, rifflen, 4); - le_store (dlen, datalen, 4); + qemu_fseek (wav->f, 4, SEEK_SET); + qemu_put_buffer (wav->f, rlen, 4); - qemu_fseek (wav->f, 4, SEEK_SET); - qemu_put_buffer (wav->f, rlen, 4); - - qemu_fseek (wav->f, 32, SEEK_CUR); - qemu_put_buffer (wav->f, dlen, 4); - qemu_fclose (wav->f); - if (wav->path) { - qemu_free (wav->path); + qemu_fseek (wav->f, 32, SEEK_CUR); + qemu_put_buffer (wav->f, dlen, 4); + qemu_fclose (wav->f); } + + qemu_free (wav->path); } static void wav_capture (void *opaque, void *buf, int size) @@ -74,9 +71,9 @@ static void wav_capture_info (void *opaque) WAVState *wav = opaque; char *path = wav->path; - term_printf ("Capturing audio(%d,%d,%d) to %s: %d bytes\n", - wav->freq, wav->bits, wav->nchannels, - path ? path : "<not available>", wav->bytes); + monitor_printf(cur_mon, "Capturing audio(%d,%d,%d) to %s: %d bytes\n", + wav->freq, wav->bits, wav->nchannels, + path ? path : "<not available>", wav->bytes); } static struct capture_ops wav_capture_ops = { @@ -87,6 +84,7 @@ static struct capture_ops wav_capture_ops = { int wav_start_capture (CaptureState *s, const char *path, int freq, int bits, int nchannels) { + Monitor *mon = cur_mon; WAVState *wav; uint8_t hdr[] = { 0x52, 0x49, 0x46, 0x46, 0x00, 0x00, 0x00, 0x00, 0x57, 0x41, 0x56, @@ -94,18 +92,19 @@ int wav_start_capture (CaptureState *s, const char *path, int freq, 0x02, 0x00, 0x44, 0xac, 0x00, 0x00, 0x10, 0xb1, 0x02, 0x00, 0x04, 0x00, 0x10, 0x00, 0x64, 0x61, 0x74, 0x61, 0x00, 0x00, 0x00, 0x00 }; - audsettings_t as; + struct audsettings as; struct audio_capture_ops ops; int stereo, bits16, shift; CaptureVoiceOut *cap; if (bits != 8 && bits != 16) { - term_printf ("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; } if (nchannels != 1 && nchannels != 2) { - term_printf ("incorrect channel count %d, must be 1 or 2\n", bits); + monitor_printf(mon, "incorrect channel count %d, must be 1 or 2\n", + nchannels); return -1; } @@ -122,10 +121,6 @@ int wav_start_capture (CaptureState *s, const char *path, int freq, ops.destroy = wav_destroy; wav = qemu_mallocz (sizeof (*wav)); - if (!wav) { - AUD_log ("wav", "Could not allocate memory (%zu bytes)", sizeof (*wav)); - return -1; - } shift = bits16 + stereo; hdr[34] = bits16 ? 0x10 : 0x08; @@ -137,8 +132,8 @@ int wav_start_capture (CaptureState *s, const char *path, int freq, wav->f = qemu_fopen (path, "wb"); if (!wav->f) { - term_printf ("Failed to open wave file `%s'\nReason: %s\n", - path, strerror (errno)); + monitor_printf(mon, "Failed to open wave file `%s'\nReason: %s\n", + path, strerror (errno)); qemu_free (wav); return -1; } @@ -150,9 +145,9 @@ int wav_start_capture (CaptureState *s, const char *path, int freq, qemu_put_buffer (wav->f, hdr, sizeof (hdr)); - cap = AUD_add_capture (NULL, &as, &ops, wav); + cap = AUD_add_capture (&as, &ops, wav); if (!cap) { - term_printf ("Failed to add audio capture\n"); + monitor_printf(mon, "Failed to add audio capture\n"); qemu_free (wav->path); qemu_fclose (wav->f); qemu_free (wav); |