optimize imdct_half:

[ffmpeg] / libavcodec / flac.c

diff --git a/libavcodec/flac.c b/libavcodec/flac.c
index 2e8e99b9d32b745b289cd4cbee1ba48665f9bbe9..60b35a3933614b917210ecbda686d8f384f722f9 100644 (file)
--- a/libavcodec/flac.c
+++ b/libavcodec/flac.c
@@ -36,10 +36,10 @@
 #include <limits.h>
 
 #define ALT_BITSTREAM_READER
+#include "libavutil/crc.h"
 #include "avcodec.h"
 #include "bitstream.h"
 #include "golomb.h"
-#include "crc.h"
 #include "flac.h"
 
 #undef NDEBUG
@@ -68,22 +68,22 @@ typedef struct FLACContext {
 
     int32_t *decoded[MAX_CHANNELS];
     uint8_t *bitstream;
-    int bitstream_size;
-    int bitstream_index;
+    unsigned int bitstream_size;
+    unsigned int bitstream_index;
     unsigned int allocated_bitstream_size;
 } FLACContext;
 
 #define METADATA_TYPE_STREAMINFO 0
 
-static int sample_rate_table[] =
+static const int sample_rate_table[] =
 { 0, 0, 0, 0,
   8000, 16000, 22050, 24000, 32000, 44100, 48000, 96000,
   0, 0, 0, 0 };
 
-static int sample_size_table[] =
+static const int sample_size_table[] =
 { 0, 8, 12, 0, 16, 20, 24, 0 };
 
-static int blocksize_table[] = {
+static const int blocksize_table[] = {
      0,    192, 576<<0, 576<<1, 576<<2, 576<<3,      0,      0,
 256<<0, 256<<1, 256<<2, 256<<3, 256<<4, 256<<5, 256<<6, 256<<7
 };
@@ -113,6 +113,7 @@ static av_cold int flac_decode_init(AVCodecContext * avctx)
         }
     }
 
+    avctx->sample_fmt = SAMPLE_FMT_S16;
     return 0;
 }
 
@@ -139,7 +140,8 @@ static void allocate_buffers(FLACContext *s){
         s->decoded[i] = av_realloc(s->decoded[i], sizeof(int32_t)*s->max_blocksize);
     }
 
-    s->bitstream= av_fast_realloc(s->bitstream, &s->allocated_bitstream_size, s->max_framesize);
+    if(s->allocated_bitstream_size < s->max_framesize)
+        s->bitstream= av_fast_realloc(s->bitstream, &s->allocated_bitstream_size, s->max_framesize);
 }
 
 void ff_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *s,
@@ -180,6 +182,7 @@ void ff_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *s,
 static int metadata_parse(FLACContext *s)
 {
     int i, metadata_last, metadata_type, metadata_size, streaminfo_updated=0;
+    int initial_pos= get_bits_count(&s->gb);
 
     if (show_bits_long(&s->gb, 32) == MKBETAG('f','L','a','C')) {
         skip_bits(&s->gb, 32);
@@ -190,6 +193,11 @@ static int metadata_parse(FLACContext *s)
             metadata_type = get_bits(&s->gb, 7);
             metadata_size = get_bits_long(&s->gb, 24);
 
+            if(get_bits_count(&s->gb) + 8*metadata_size > s->gb.size_in_bits){
+                skip_bits_long(&s->gb, initial_pos - get_bits_count(&s->gb));
+                break;
+            }
+
             av_log(s->avctx, AV_LOG_DEBUG,
                    " metadata block: flag = %d, type = %d, size = %d\n",
                    metadata_last, metadata_type, metadata_size);
@@ -280,13 +288,13 @@ static int decode_subframe_fixed(FLACContext *s, int channel, int pred_order)
         return -1;
 
     if(pred_order > 0)
-    a = decoded[pred_order-1];
+        a = decoded[pred_order-1];
     if(pred_order > 1)
-    b = a - decoded[pred_order-2];
+        b = a - decoded[pred_order-2];
     if(pred_order > 2)
-    c = b - decoded[pred_order-2] + decoded[pred_order-3];
+        c = b - decoded[pred_order-2] + decoded[pred_order-3];
     if(pred_order > 3)
-    d = c - decoded[pred_order-2] + 2*decoded[pred_order-3] - decoded[pred_order-4];
+        d = c - decoded[pred_order-2] + 2*decoded[pred_order-3] - decoded[pred_order-4];
 
     switch(pred_order)
     {
@@ -611,9 +619,16 @@ static int flac_decode_frame(AVCodecContext *avctx,
     }
 
     if(1 && s->max_framesize){//FIXME truncated
-            buf_size= FFMAX(FFMIN(buf_size, s->max_framesize - s->bitstream_size), 0);
+            if(s->bitstream_size < 4 || AV_RL32(s->bitstream) != MKTAG('f','L','a','C'))
+                buf_size= FFMIN(buf_size, s->max_framesize - FFMIN(s->bitstream_size, s->max_framesize));
             input_buf_size= buf_size;
 
+            if(s->bitstream_size + buf_size < buf_size || s->bitstream_index + s->bitstream_size + buf_size < s->bitstream_index)
+                return -1;
+
+            if(s->allocated_bitstream_size < s->bitstream_size + buf_size)
+                s->bitstream= av_fast_realloc(s->bitstream, &s->allocated_bitstream_size, s->bitstream_size + buf_size);
+
             if(s->bitstream_index + s->bitstream_size + buf_size > s->allocated_bitstream_size){
 //                printf("memmove\n");
                 memmove(s->bitstream, &s->bitstream[s->bitstream_index], s->bitstream_size);
@@ -624,7 +639,7 @@ static int flac_decode_frame(AVCodecContext *avctx,
             buf_size += s->bitstream_size;
             s->bitstream_size= buf_size;
 
-            if(buf_size < s->max_framesize){
+            if(buf_size < s->max_framesize && input_buf_size){
 //                printf("wanna more data ...\n");
                 return input_buf_size;
             }
@@ -632,8 +647,9 @@ static int flac_decode_frame(AVCodecContext *avctx,
 
     init_get_bits(&s->gb, buf, buf_size*8);
 
-    if (!metadata_parse(s))
-    {
+    if(metadata_parse(s))
+        goto end;
+
         tmp = show_bits(&s->gb, 16);
         if((tmp & 0xFFFE) != 0xFFF8){
             av_log(s->avctx, AV_LOG_ERROR, "FRAME HEADER not here\n");
@@ -648,7 +664,6 @@ static int flac_decode_frame(AVCodecContext *avctx,
             s->bitstream_index=0;
             return -1;
         }
-    }
 
 
 #if 0
@@ -773,6 +788,7 @@ AVCodec flac_decoder = {
     NULL,
     flac_decode_close,
     flac_decode_frame,
+    CODEC_CAP_DELAY,
     .flush= flac_flush,
-    .long_name= "FLAC (Free Lossless Audio Codec)"
+    .long_name= NULL_IF_CONFIG_SMALL("FLAC (Free Lossless Audio Codec)"),
 };