Move emms_c() from libavcodec to libavutil.

[ffmpeg] / libavcodec / vmdav.c

diff --git a/libavcodec/vmdav.c b/libavcodec/vmdav.c
index 88f674a9fd045167413dff67a42e90289c5c5d2f..710c2028cf15cf665706e842033b244aca86f90c 100644 (file)
--- a/libavcodec/vmdav.c
+++ b/libavcodec/vmdav.c
@@ -2,20 +2,20 @@
  * Sierra VMD Audio & Video Decoders
  * Copyright (C) 2004 the ffmpeg project
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav 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.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav 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 FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
@@ -445,7 +445,10 @@ static av_cold int vmdaudio_decode_init(AVCodecContext *avctx)
     VmdAudioContext *s = avctx->priv_data;
 
     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;
 
     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,
 static int vmdaudio_loadsound(VmdAudioContext *s, unsigned char *data,
     const uint8_t *buf, int silent_chunks, int data_size)
 {
-    int i;
     int silent_size = s->avctx->block_align * silent_chunks * s->out_bps;
 
     if (silent_chunks) {
-        memset(data, 0, silent_size);
+        memset(data, s->out_bps == 2 ? 0x00 : 0x80, silent_size);
         data += silent_size;
     }
     if (s->avctx->bits_per_coded_sample == 16)
         vmdaudio_decode_audio(s, data, buf, data_size, s->avctx->channels == 2);
     else {
-        /* copy the data but convert it to signed */
-        for (i = 0; i < data_size; i++){
-            *data++ = buf[i] + 0x80;
-            *data++ = buf[i] + 0x80;
-        }
+        /* just copy the data */
+        memcpy(data, buf, data_size);
     }
 
     return silent_size + data_size * s->out_bps;