gcc chokes on xmm constraints, so pessimize int32_to_float_fmul_scalar_sse a little

[ffmpeg] / libavcodec / ws-snd1.c

diff --git a/libavcodec/ws-snd1.c b/libavcodec/ws-snd1.c
index 2d1ed92b9203b186bb2900d38c45c5faf5421504..24753b0c9ce9361f01c362f1dabe02b77978e572 100644 (file)
--- a/libavcodec/ws-snd1.c
+++ b/libavcodec/ws-snd1.c
@@ -29,9 +29,6 @@
  * http://www.multimedia.cx
  */
 
-typedef struct {
-} WSSNDContext;
-
 static const char ws_adpcm_2bit[] = { -2, -1, 0, 1};
 static const char ws_adpcm_4bit[] = {
     -9, -8, -6, -5, -4, -3, -2, -1,
@@ -39,16 +36,17 @@ static const char ws_adpcm_4bit[] = {
 
 #define CLIP8(a) if(a>127)a=127;if(a<-128)a=-128;
 
-static int ws_snd_decode_init(AVCodecContext * avctx)
+static av_cold int ws_snd_decode_init(AVCodecContext * avctx)
 {
 //    WSSNDContext *c = avctx->priv_data;
 
+    avctx->sample_fmt = SAMPLE_FMT_S16;
     return 0;
 }
 
 static int ws_snd_decode_frame(AVCodecContext *avctx,
                 void *data, int *data_size,
-                uint8_t *buf, int buf_size)
+                const uint8_t *buf, int buf_size)
 {
 //    WSSNDContext *c = avctx->priv_data;
 
@@ -60,11 +58,19 @@ static int ws_snd_decode_frame(AVCodecContext *avctx,
     if (!buf_size)
         return 0;
 
-    out_size = LE_16(&buf[0]);
+    out_size = AV_RL16(&buf[0]);
     *data_size = out_size * 2;
-    in_size = LE_16(&buf[2]);
+    in_size = AV_RL16(&buf[2]);
     buf += 4;
 
+    if (out_size > *data_size) {
+        av_log(avctx, AV_LOG_ERROR, "Frame is too large to fit in buffer\n");
+        return -1;
+    }
+    if (in_size > buf_size) {
+        av_log(avctx, AV_LOG_ERROR, "Frame data is larger than input buffer\n");
+        return -1;
+    }
     if (in_size == out_size) {
         for (i = 0; i < out_size; i++)
             *samples++ = (*buf++ - 0x80) << 8;
@@ -139,9 +145,10 @@ AVCodec ws_snd1_decoder = {
     "ws_snd1",
     CODEC_TYPE_AUDIO,
     CODEC_ID_WESTWOOD_SND1,
-    sizeof(WSSNDContext),
+    0,
     ws_snd_decode_init,
     NULL,
     NULL,
     ws_snd_decode_frame,
+    .long_name = NULL_IF_CONFIG_SMALL("Westwood Audio (SND1)"),
 };