Check available size before writing in decode_frame()

[ffmpeg] / libavcodec / aac_parser.c

diff --git a/libavcodec/aac_parser.c b/libavcodec/aac_parser.c
index 45c8b95e7629e3d8d1264c2d30386d198da571ad..db2c697725d6edcd5799032c16edb789b37f82c0 100644 (file)
--- a/libavcodec/aac_parser.c
+++ b/libavcodec/aac_parser.c
@@ -23,28 +23,18 @@
 #include "parser.h"
 #include "aac_ac3_parser.h"
 #include "bitstream.h"
-#include "ac3.h"
-
+#include "mpeg4audio.h"
 
 #define AAC_HEADER_SIZE 7
 
-
-static const int aac_sample_rates[16] = {
-    96000, 88200, 64000, 48000, 44100, 32000,
-    24000, 22050, 16000, 12000, 11025, 8000, 7350
-};
-
-static const int aac_channels[8] = {
-    0, 1, 2, 3, 4, 5, 6, 8
-};
-
-
-static int aac_sync(AACAC3ParseContext *hdr_info)
+static int aac_sync(uint64_t state, AACAC3ParseContext *hdr_info,
+        int *need_next_header, int *new_frame_start)
 {
     GetBitContext bits;
     int size, rdb, ch, sr;
+    uint64_t tmp = be2me_64(state);
 
-    init_get_bits(&bits, hdr_info->inbuf, AAC_HEADER_SIZE * 8);
+    init_get_bits(&bits, ((uint8_t *)&tmp)+8-AAC_HEADER_SIZE, AAC_HEADER_SIZE * 8);
 
     if(get_bits(&bits, 12) != 0xfff)
         return 0;
@@ -54,11 +44,11 @@ static int aac_sync(AACAC3ParseContext *hdr_info)
     skip_bits1(&bits);          /* protection_absent */
     skip_bits(&bits, 2);        /* profile_objecttype */
     sr = get_bits(&bits, 4);    /* sample_frequency_index */
-    if(!aac_sample_rates[sr])
+    if(!ff_mpeg4audio_sample_rates[sr])
         return 0;
     skip_bits1(&bits);          /* private_bit */
     ch = get_bits(&bits, 3);    /* channel_configuration */
-    if(!aac_channels[ch])
+    if(!ff_mpeg4audio_channels[ch])
         return 0;
     skip_bits1(&bits);          /* original/copy */
     skip_bits1(&bits);          /* home */
@@ -73,19 +63,19 @@ static int aac_sync(AACAC3ParseContext *hdr_info)
     skip_bits(&bits, 11);       /* adts_buffer_fullness */
     rdb = get_bits(&bits, 2);   /* number_of_raw_data_blocks_in_frame */
 
-    hdr_info->channels = aac_channels[ch];
-    hdr_info->sample_rate = aac_sample_rates[sr];
+    hdr_info->channels = ff_mpeg4audio_channels[ch];
+    hdr_info->sample_rate = ff_mpeg4audio_sample_rates[sr];
     hdr_info->samples = (rdb + 1) * 1024;
     hdr_info->bit_rate = size * 8 * hdr_info->sample_rate / hdr_info->samples;
 
+    *need_next_header = 0;
+    *new_frame_start  = 1;
     return size;
 }
 
 static av_cold int aac_parse_init(AVCodecParserContext *s1)
 {
     AACAC3ParseContext *s = s1->priv_data;
-    s->stream_type = EAC3_STREAM_TYPE_INDEPENDENT;
-    s->inbuf_ptr = s->inbuf;
     s->header_size = AAC_HEADER_SIZE;
     s->sync = aac_sync;
     return 0;