Mercurial > libavcodec.hg

changeset 9633:9592af8b6ce0 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move the ADTS header size to the parser's header file.
author alexc
date Wed, 13 May 2009 14:11:11 +0000
parents 31a033fae70e
children 61c62ab2218f
files aac_parser.c aac_parser.h
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/aac_parser.c	Wed May 13 06:06:59 2009 +0000
+++ b/aac_parser.c	Wed May 13 14:11:11 2009 +0000
@@ -26,8 +26,6 @@
 #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;
@@ -56,7 +54,7 @@
     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 */
@@ -86,7 +84,7 @@
     } 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 +100,7 @@
 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;
 }
--- a/aac_parser.h	Wed May 13 06:06:59 2009 +0000
+++ b/aac_parser.h	Wed May 13 14:11:11 2009 +0000
@@ -27,6 +27,8 @@
 #include "aac_ac3_parser.h"
 #include "get_bits.h"
 
+#define AAC_ADTS_HEADER_SIZE 7
+
 typedef struct {
     uint32_t sample_rate;
     uint32_t samples;