Commit 1108f899 authored by Justin Ruggles's avatar Justin Ruggles Committed by Ronald S. Bultje

vmdaudio: output 8-bit audio as AV_SAMPLE_FMT_U8.

There is no need to expand to 16-bits. Just use memcpy() to copy the raw data.
Signed-off-by: 's avatarRonald S. Bultje <rsbultje@gmail.com>
parent 2ec7862d
...@@ -445,7 +445,10 @@ static av_cold int vmdaudio_decode_init(AVCodecContext *avctx) ...@@ -445,7 +445,10 @@ static av_cold int vmdaudio_decode_init(AVCodecContext *avctx)
VmdAudioContext *s = avctx->priv_data; VmdAudioContext *s = avctx->priv_data;
s->avctx = avctx; s->avctx = avctx;
avctx->sample_fmt = AV_SAMPLE_FMT_S16; if (avctx->bits_per_coded_sample == 16)
avctx->sample_fmt = AV_SAMPLE_FMT_S16;
else
avctx->sample_fmt = AV_SAMPLE_FMT_U8;
s->out_bps = av_get_bits_per_sample_fmt(avctx->sample_fmt) >> 3; s->out_bps = av_get_bits_per_sample_fmt(avctx->sample_fmt) >> 3;
av_log(avctx, AV_LOG_DEBUG, "%d channels, %d bits/sample, " av_log(avctx, AV_LOG_DEBUG, "%d channels, %d bits/sample, "
...@@ -477,21 +480,17 @@ static void vmdaudio_decode_audio(VmdAudioContext *s, unsigned char *data, ...@@ -477,21 +480,17 @@ static void vmdaudio_decode_audio(VmdAudioContext *s, unsigned char *data,
static int vmdaudio_loadsound(VmdAudioContext *s, unsigned char *data, static int vmdaudio_loadsound(VmdAudioContext *s, unsigned char *data,
const uint8_t *buf, int silent_chunks, int data_size) const uint8_t *buf, int silent_chunks, int data_size)
{ {
int i;
int silent_size = s->avctx->block_align * silent_chunks * s->out_bps; int silent_size = s->avctx->block_align * silent_chunks * s->out_bps;
if (silent_chunks) { if (silent_chunks) {
memset(data, 0, silent_size); memset(data, s->out_bps == 2 ? 0x00 : 0x80, silent_size);
data += silent_size; data += silent_size;
} }
if (s->avctx->bits_per_coded_sample == 16) if (s->avctx->bits_per_coded_sample == 16)
vmdaudio_decode_audio(s, data, buf, data_size, s->avctx->channels == 2); vmdaudio_decode_audio(s, data, buf, data_size, s->avctx->channels == 2);
else { else {
/* copy the data but convert it to signed */ /* just copy the data */
for (i = 0; i < data_size; i++){ memcpy(data, buf, data_size);
*data++ = buf[i] + 0x80;
*data++ = buf[i] + 0x80;
}
} }
return silent_size + data_size * s->out_bps; return silent_size + data_size * s->out_bps;
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment