Merge remote-tracking branch 'qatar/master'

* qatar/master: (22 commits)
  prores: add FATE tests
  id3v2: reduce the scope of some non-globally-used symbols/structures
  id3v2: cosmetics: move some declarations before the places they are used
  shorten: remove the flush function.
  shn: do not allow seeking in the raw shn demuxer.
  avformat: add AVInputFormat flag AVFMT_NO_BYTE_SEEK.
  avformat: update AVInputFormat allowed flags
  avformat: don't unconditionally call ff_read_frame_flush() when trying to seek.
  truespeech: use sizeof() instead of hardcoded sizes
  truespeech: remove unneeded variable, 'consumed'
  truespeech: simplify truespeech_read_frame() by using get_bits()
  truespeech: decode directly to output buffer instead of a temp buffer
  truespeech: check to make sure channels == 1
  truespeech: check for large enough output buffer rather than truncating output
  truespeech: remove unneeded zero-size packet check.
  mlpdec: return meaningful error codes instead of -1
  mlpdec: remove unnecessary wrapper function
  mlpdec: only calculate output size once
  mlpdec: validate that the reported channel count matches the actual output channel count
  pcm: reduce pointer type casting
  ...

Conflicts:
	libavformat/avformat.h
	libavformat/id3v2.c
	libavformat/id3v2.h
	libavformat/utils.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 80 insertions, 110 deletions

diff --git a/libavcodec/truespeech.c b/libavcodec/truespeech.c
index 1b98b140b9..8cd05145db 100644
--- a/libavcodec/truespeech.c
+++ b/libavcodec/truespeech.c
@@ -21,6 +21,8 @@
 
 #include "libavutil/intreadwrite.h"
 #include "avcodec.h"
+#include "dsputil.h"
+#include "get_bits.h"
 
 #include "truespeech_data.h"
 /**
@@ -32,7 +34,9 @@
  * TrueSpeech decoder context
  */
 typedef struct {
+    DSPContext dsp;
     /* input data */
+    uint8_t buffer[32];
     int16_t vector[8];  ///< input vector: 5/5/4/4/4/3/3/3
     int offset1[2];     ///< 8-bit value, used in one copying offset
     int offset2[4];     ///< 7-bit value, encodes offsets for copying and for two-point filter
@@ -54,100 +58,66 @@ typedef struct {
 
 static av_cold int truespeech_decode_init(AVCodecContext * avctx)
 {
-//    TSContext *c = avctx->priv_data;
+    TSContext *c = avctx->priv_data;
+
+    if (avctx->channels != 1) {
+        av_log_ask_for_sample(avctx, "Unsupported channel count: %d\n", avctx->channels);
+        return AVERROR(EINVAL);
+    }
 
     avctx->sample_fmt = AV_SAMPLE_FMT_S16;
+
+    dsputil_init(&c->dsp, avctx);
+
     return 0;
 }
 
 static void truespeech_read_frame(TSContext *dec, const uint8_t *input)
 {
-    uint32_t t;
-
-    /* first dword */
-    t = AV_RL32(input);
-    input += 4;
-
-    dec->flag = t & 1;
-
-    dec->vector[0] = ts_codebook[0][(t >>  1) & 0x1F];
-    dec->vector[1] = ts_codebook[1][(t >>  6) & 0x1F];
-    dec->vector[2] = ts_codebook[2][(t >> 11) &  0xF];
-    dec->vector[3] = ts_codebook[3][(t >> 15) &  0xF];
-    dec->vector[4] = ts_codebook[4][(t >> 19) &  0xF];
-    dec->vector[5] = ts_codebook[5][(t >> 23) &  0x7];
-    dec->vector[6] = ts_codebook[6][(t >> 26) &  0x7];
-    dec->vector[7] = ts_codebook[7][(t >> 29) &  0x7];
-
-    /* second dword */
-    t = AV_RL32(input);
-    input += 4;
-
-    dec->offset2[0] = (t >>  0) & 0x7F;
-    dec->offset2[1] = (t >>  7) & 0x7F;
-    dec->offset2[2] = (t >> 14) & 0x7F;
-    dec->offset2[3] = (t >> 21) & 0x7F;
-
-    dec->offset1[0] = ((t >> 28) & 0xF) << 4;
-
-    /* third dword */
-    t = AV_RL32(input);
-    input += 4;
-
-    dec->pulseval[0] = (t >>  0) & 0x3FFF;
-    dec->pulseval[1] = (t >> 14) & 0x3FFF;
-
-    dec->offset1[1] = (t >> 28) & 0x0F;
-
-    /* fourth dword */
-    t = AV_RL32(input);
-    input += 4;
-
-    dec->pulseval[2] = (t >>  0) & 0x3FFF;
-    dec->pulseval[3] = (t >> 14) & 0x3FFF;
-
-    dec->offset1[1] |= ((t >> 28) & 0x0F) << 4;
-
-    /* fifth dword */
-    t = AV_RL32(input);
-    input += 4;
-
-    dec->pulsepos[0] = (t >> 4) & 0x7FFFFFF;
-
-    dec->pulseoff[0] = (t >> 0) & 0xF;
-
-    dec->offset1[0] |= (t >> 31) & 1;
-
-    /* sixth dword */
-    t = AV_RL32(input);
-    input += 4;
-
-    dec->pulsepos[1] = (t >> 4) & 0x7FFFFFF;
-
-    dec->pulseoff[1] = (t >> 0) & 0xF;
-
-    dec->offset1[0] |= ((t >> 31) & 1) << 1;
-
-    /* seventh dword */
-    t = AV_RL32(input);
-    input += 4;
-
-    dec->pulsepos[2] = (t >> 4) & 0x7FFFFFF;
-
-    dec->pulseoff[2] = (t >> 0) & 0xF;
-
-    dec->offset1[0] |= ((t >> 31) & 1) << 2;
-
-    /* eighth dword */
-    t = AV_RL32(input);
-    input += 4;
-
-    dec->pulsepos[3] = (t >> 4) & 0x7FFFFFF;
-
-    dec->pulseoff[3] = (t >> 0) & 0xF;
-
-    dec->offset1[0] |= ((t >> 31) & 1) << 3;
-
+    GetBitContext gb;
+
+    dec->dsp.bswap_buf((uint32_t *)dec->buffer, (const uint32_t *)input, 8);
+    init_get_bits(&gb, dec->buffer, 32 * 8);
+
+    dec->vector[7] = ts_codebook[7][get_bits(&gb, 3)];
+    dec->vector[6] = ts_codebook[6][get_bits(&gb, 3)];
+    dec->vector[5] = ts_codebook[5][get_bits(&gb, 3)];
+    dec->vector[4] = ts_codebook[4][get_bits(&gb, 4)];
+    dec->vector[3] = ts_codebook[3][get_bits(&gb, 4)];
+    dec->vector[2] = ts_codebook[2][get_bits(&gb, 4)];
+    dec->vector[1] = ts_codebook[1][get_bits(&gb, 5)];
+    dec->vector[0] = ts_codebook[0][get_bits(&gb, 5)];
+    dec->flag      = get_bits1(&gb);
+
+    dec->offset1[0] = get_bits(&gb, 4) << 4;
+    dec->offset2[3] = get_bits(&gb, 7);
+    dec->offset2[2] = get_bits(&gb, 7);
+    dec->offset2[1] = get_bits(&gb, 7);
+    dec->offset2[0] = get_bits(&gb, 7);
+
+    dec->offset1[1]  = get_bits(&gb, 4);
+    dec->pulseval[1] = get_bits(&gb, 14);
+    dec->pulseval[0] = get_bits(&gb, 14);
+
+    dec->offset1[1] |= get_bits(&gb, 4) << 4;
+    dec->pulseval[3] = get_bits(&gb, 14);
+    dec->pulseval[2] = get_bits(&gb, 14);
+
+    dec->offset1[0] |= get_bits1(&gb);
+    dec->pulsepos[0] = get_bits_long(&gb, 27);
+    dec->pulseoff[0] = get_bits(&gb, 4);
+
+    dec->offset1[0] |= get_bits1(&gb) << 1;
+    dec->pulsepos[1] = get_bits_long(&gb, 27);
+    dec->pulseoff[1] = get_bits(&gb, 4);
+
+    dec->offset1[0] |= get_bits1(&gb) << 2;
+    dec->pulsepos[2] = get_bits_long(&gb, 27);
+    dec->pulseoff[2] = get_bits(&gb, 4);
+
+    dec->offset1[0] |= get_bits1(&gb) << 3;
+    dec->pulsepos[3] = get_bits_long(&gb, 27);
+    dec->pulseoff[3] = get_bits(&gb, 4);
 }
 
 static void truespeech_correlate_filter(TSContext *dec)
@@ -157,7 +127,7 @@ static void truespeech_correlate_filter(TSContext *dec)
 
     for(i = 0; i < 8; i++){
         if(i > 0){
-            memcpy(tmp, dec->cvector, i * 2);
+            memcpy(tmp, dec->cvector, i * sizeof(*tmp));
             for(j = 0; j < i; j++)
                 dec->cvector[j] = ((tmp[i - j - 1] * dec->vector[i]) +
                                    (dec->cvector[j] << 15) + 0x4000) >> 15;
@@ -199,7 +169,7 @@ static void truespeech_apply_twopoint_filter(TSContext *dec, int quart)
 
     t = dec->offset2[quart];
     if(t == 127){
-        memset(dec->newvec, 0, 60 * 2);
+        memset(dec->newvec, 0, 60 * sizeof(*dec->newvec));
         return;
     }
     for(i = 0; i < 146; i++)
@@ -224,7 +194,7 @@ static void truespeech_place_pulses(TSContext *dec, int16_t *out, int quart)
     int16_t *ptr2;
     int coef;
 
-    memset(out, 0, 60 * 2);
+    memset(out, 0, 60 * sizeof(*out));
     for(i = 0; i < 7; i++) {
         t = dec->pulseval[quart] & 3;
         dec->pulseval[quart] >>= 2;
@@ -340,45 +310,45 @@ static int truespeech_decode_frame(AVCodecContext *avctx,
 
     int i, j;
     short *samples = data;
-    int consumed = 0;
-    int16_t out_buf[240];
-    int iterations;
+    int iterations, out_size;
 
-    if (!buf_size)
-        return 0;
+    iterations = buf_size / 32;
 
-    if (buf_size < 32) {
+    if (!iterations) {
         av_log(avctx, AV_LOG_ERROR,
                "Too small input buffer (%d bytes), need at least 32 bytes\n", buf_size);
         return -1;
     }
-    iterations = FFMIN(buf_size / 32, *data_size / 480);
+
+    out_size = iterations * 240 * av_get_bytes_per_sample(avctx->sample_fmt);
+    if (*data_size < out_size) {
+        av_log(avctx, AV_LOG_ERROR, "Output buffer is too small\n");
+        return AVERROR(EINVAL);
+    }
+
+    memset(samples, 0, out_size);
+
     for(j = 0; j < iterations; j++) {
-        truespeech_read_frame(c, buf + consumed);
-        consumed += 32;
+        truespeech_read_frame(c, buf);
+        buf += 32;
 
         truespeech_correlate_filter(c);
         truespeech_filters_merge(c);
 
-        memset(out_buf, 0, 240 * 2);
         for(i = 0; i < 4; i++) {
             truespeech_apply_twopoint_filter(c, i);
-            truespeech_place_pulses(c, out_buf + i * 60, i);
-            truespeech_update_filters(c, out_buf + i * 60, i);
-            truespeech_synth(c, out_buf + i * 60, i);
+            truespeech_place_pulses  (c, samples, i);
+            truespeech_update_filters(c, samples, i);
+            truespeech_synth         (c, samples, i);
+            samples += 60;
         }
 
         truespeech_save_prevvec(c);
-
-        /* finally output decoded frame */
-        for(i = 0; i < 240; i++)
-            *samples++ = out_buf[i];
-
     }
 
-    *data_size = consumed * 15;
+    *data_size = out_size;
 
-    return consumed;
+    return buf_size;
 }
 
 AVCodec ff_truespeech_decoder = {