vp8: Fix pthread_cond and pthread_mutex leaks

[ffmpeg] / libavcodec / ws-snd1.c

diff --git a/libavcodec/ws-snd1.c b/libavcodec/ws-snd1.c
index 3842ec9b32ff2aeb4a873c8879268f25dc3c6810..14a93354efe22a8c6778d0da868ad4cf52f9adbf 100644 (file)
--- a/libavcodec/ws-snd1.c
+++ b/libavcodec/ws-snd1.c
@@ -20,48 +20,46 @@
  */
 
 #include <stdint.h>
+
+#include "libavutil/channel_layout.h"
+#include "libavutil/common.h"
 #include "libavutil/intreadwrite.h"
 #include "avcodec.h"
+#include "internal.h"
 
 /**
  * @file
- * Westwood SNDx codecs.
+ * Westwood SNDx codecs
  *
  * Reference documents about VQA format and its audio codecs
  * can be found here:
  * http://www.multimedia.cx
  */
 
-static const int8_t ws_adpcm_2bit[] = { -2, -1, 0, 1};
 static const int8_t ws_adpcm_4bit[] = {
     -9, -8, -6, -5, -4, -3, -2, -1,
-     0,  1,  2,  3,  4,  5,  6,  8 };
+     0,  1,  2,  3,  4,  5,  6,  8
+};
 
-static av_cold int ws_snd_decode_init(AVCodecContext * avctx)
+static av_cold int ws_snd_decode_init(AVCodecContext *avctx)
 {
-//    WSSNDContext *c = avctx->priv_data;
+    avctx->channels       = 1;
+    avctx->channel_layout = AV_CH_LAYOUT_MONO;
+    avctx->sample_fmt     = AV_SAMPLE_FMT_U8;
 
-    if (avctx->channels != 1) {
-        av_log_ask_for_sample(avctx, "unsupported number of channels\n");
-        return AVERROR(EINVAL);
-    }
-
-    avctx->sample_fmt = AV_SAMPLE_FMT_U8;
     return 0;
 }
 
-static int ws_snd_decode_frame(AVCodecContext *avctx,
-                void *data, int *data_size,
-                AVPacket *avpkt)
+static int ws_snd_decode_frame(AVCodecContext *avctx, void *data,
+                               int *got_frame_ptr, AVPacket *avpkt)
 {
+    AVFrame *frame     = data;
     const uint8_t *buf = avpkt->data;
-    int buf_size = avpkt->size;
-//    WSSNDContext *c = avctx->priv_data;
+    int buf_size       = avpkt->size;
 
-    int in_size, out_size;
+    int in_size, out_size, ret;
     int sample = 128;
-    int i;
-    uint8_t *samples = data;
+    uint8_t *samples;
     uint8_t *samples_end;
 
     if (!buf_size)
@@ -73,37 +71,40 @@ static int ws_snd_decode_frame(AVCodecContext *avctx,
     }
 
     out_size = AV_RL16(&buf[0]);
-    in_size = AV_RL16(&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;
     }
+
+    /* get output buffer */
+    frame->nb_samples = out_size;
+    if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
+        av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+        return ret;
+    }
+    samples     = frame->data[0];
     samples_end = samples + out_size;
 
     if (in_size == out_size) {
-        for (i = 0; i < out_size; i++)
-            *samples++ = *buf++;
-        *data_size = out_size;
+        memcpy(samples, buf, out_size);
+        *got_frame_ptr = 1;
         return buf_size;
     }
 
     while (samples < samples_end && buf - avpkt->data < buf_size) {
         int code, smp, size;
         uint8_t count;
-        code = (*buf) >> 6;
-        count = (*buf) & 0x3F;
+        code  = *buf >> 6;
+        count = *buf & 0x3F;
         buf++;
 
         /* make sure we don't write past the output buffer */
         switch (code) {
-        case 0:  smp = 4;                              break;
-        case 1:  smp = 2;                              break;
+        case 0:  smp = 4 * (count + 1);                break;
+        case 1:  smp = 2 * (count + 1);                break;
         case 2:  smp = (count & 0x20) ? 1 : count + 1; break;
         default: smp = count + 1;                      break;
         }
@@ -115,20 +116,20 @@ static int ws_snd_decode_frame(AVCodecContext *avctx,
         if ((buf - avpkt->data) + size > buf_size)
             break;
 
-        switch(code) {
+        switch (code) {
         case 0: /* ADPCM 2-bit */
             for (count++; count > 0; count--) {
                 code = *buf++;
-                sample += ws_adpcm_2bit[code & 0x3];
+                sample += ( code       & 0x3) - 2;
                 sample = av_clip_uint8(sample);
                 *samples++ = sample;
-                sample += ws_adpcm_2bit[(code >> 2) & 0x3];
+                sample += ((code >> 2) & 0x3) - 2;
                 sample = av_clip_uint8(sample);
                 *samples++ = sample;
-                sample += ws_adpcm_2bit[(code >> 4) & 0x3];
+                sample += ((code >> 4) & 0x3) - 2;
                 sample = av_clip_uint8(sample);
                 *samples++ = sample;
-                sample += ws_adpcm_2bit[(code >> 6) & 0x3];
+                sample +=  (code >> 6)        - 2;
                 sample = av_clip_uint8(sample);
                 *samples++ = sample;
             }
@@ -153,20 +154,20 @@ static int ws_snd_decode_frame(AVCodecContext *avctx,
                 sample = av_clip_uint8(sample);
                 *samples++ = sample;
             } else { /* copy */
-                for (count++; count > 0; count--) {
-                    *samples++ = *buf++;
-                }
+                memcpy(samples, buf, smp);
+                samples += smp;
+                buf     += smp;
                 sample = buf[-1];
             }
             break;
         default: /* run */
-            for(count++; count > 0; count--) {
-                *samples++ = sample;
-            }
+            memset(samples, sample, smp);
+            samples += smp;
         }
     }
 
-    *data_size = samples - (uint8_t *)data;
+    frame->nb_samples = samples - frame->data[0];
+    *got_frame_ptr    = 1;
 
     return buf_size;
 }
@@ -174,8 +175,9 @@ static int ws_snd_decode_frame(AVCodecContext *avctx,
 AVCodec ff_ws_snd1_decoder = {
     .name           = "ws_snd1",
     .type           = AVMEDIA_TYPE_AUDIO,
-    .id             = CODEC_ID_WESTWOOD_SND1,
+    .id             = AV_CODEC_ID_WESTWOOD_SND1,
     .init           = ws_snd_decode_init,
     .decode         = ws_snd_decode_frame,
-    .long_name = NULL_IF_CONFIG_SMALL("Westwood Audio (SND1)"),
+    .capabilities   = CODEC_CAP_DR1,
+    .long_name      = NULL_IF_CONFIG_SMALL("Westwood Audio (SND1)"),
 };