Reduce warnings about too few consumed bytes to debug level.

[ffmpeg] / libavcodec / aac_parser.c

diff --git a/libavcodec/aac_parser.c b/libavcodec/aac_parser.c
index e38b5ecf01c3a81367ce8129bfb722630634691c..30ce04d4ad7a62fc7c1f2e07a728219e19337792 100644 (file)
--- a/libavcodec/aac_parser.c
+++ b/libavcodec/aac_parser.c
@@ -1,7 +1,7 @@
 /*
  * Audio and Video frame extraction
- * Copyright (c) 2003 Fabrice Bellard.
- * Copyright (c) 2003 Michael Niedermayer.
+ * Copyright (c) 2003 Fabrice Bellard
+ * Copyright (c) 2003 Michael Niedermayer
  *
  * This file is part of FFmpeg.
  *
@@ -23,11 +23,9 @@
 #include "parser.h"
 #include "aac_ac3_parser.h"
 #include "aac_parser.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "mpeg4audio.h"
 
-#define AAC_HEADER_SIZE 7
-
 int ff_aac_parse_header(GetBitContext *gbc, AACADTSHeaderInfo *hdr)
 {
     int size, rdb, ch, sr;
@@ -46,9 +44,6 @@ int ff_aac_parse_header(GetBitContext *gbc, AACADTSHeaderInfo *hdr)
     skip_bits1(gbc);             /* private_bit */
     ch      = get_bits(gbc, 3);  /* channel_configuration */
 
-    if(!ff_mpeg4audio_channels[ch])
-        return AAC_AC3_PARSE_ERROR_CHANNEL_CFG;
-
     skip_bits1(gbc);             /* original/copy */
     skip_bits1(gbc);             /* home */
 
@@ -56,13 +51,13 @@ int ff_aac_parse_header(GetBitContext *gbc, AACADTSHeaderInfo *hdr)
     skip_bits1(gbc);             /* copyright_identification_bit */
     skip_bits1(gbc);             /* copyright_identification_start */
     size    = get_bits(gbc, 13); /* aac_frame_length */
-    if(size < AAC_HEADER_SIZE)
+    if(size < AAC_ADTS_HEADER_SIZE)
         return AAC_AC3_PARSE_ERROR_FRAME_SIZE;
 
     skip_bits(gbc, 11);          /* adts_buffer_fullness */
     rdb = get_bits(gbc, 2);      /* number_of_raw_data_blocks_in_frame */
 
-    hdr->object_type    = aot;
+    hdr->object_type    = aot + 1;
     hdr->chan_config    = ch;
     hdr->crc_absent     = crc_abs;
     hdr->num_aac_frames = rdb + 1;
@@ -86,7 +81,7 @@ static int aac_sync(uint64_t state, AACAC3ParseContext *hdr_info,
     } tmp;
 
     tmp.u64 = be2me_64(state);
-    init_get_bits(&bits, tmp.u8+8-AAC_HEADER_SIZE, AAC_HEADER_SIZE * 8);
+    init_get_bits(&bits, tmp.u8+8-AAC_ADTS_HEADER_SIZE, AAC_ADTS_HEADER_SIZE * 8);
 
     if ((size = ff_aac_parse_header(&bits, &hdr)) < 0)
         return 0;
@@ -102,7 +97,7 @@ static int aac_sync(uint64_t state, AACAC3ParseContext *hdr_info,
 static av_cold int aac_parse_init(AVCodecParserContext *s1)
 {
     AACAC3ParseContext *s = s1->priv_data;
-    s->header_size = AAC_HEADER_SIZE;
+    s->header_size = AAC_ADTS_HEADER_SIZE;
     s->sync = aac_sync;
     return 0;
 }
@@ -113,5 +108,5 @@ AVCodecParser aac_parser = {
     sizeof(AACAC3ParseContext),
     aac_parse_init,
     ff_aac_ac3_parse,
-    NULL,
+    ff_parse_close,
 };