X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Faac_ac3_parser.h;h=90b49c5a590b444fb8374548dbbc34f09ee1ac95;hb=8c9af5b2051b9927f845c7afdfeb30b82670ee77;hp=ec9ce48a4a210e19a55aa1213ea6c5f482f2e445;hpb=be1e2a2bfa592ff14355c6b97e90c530e2c0fcc0;p=ffmpeg

diff --git a/libavcodec/aac_ac3_parser.h b/libavcodec/aac_ac3_parser.h
index ec9ce48a4a2..90b49c5a590 100644
--- a/libavcodec/aac_ac3_parser.h
+++ b/libavcodec/aac_ac3_parser.h
@@ -1,48 +1,61 @@
 /*
- * Common AAC and AC3 parser prototypes
- * Copyright (c) 2003 Fabrice Bellard.
- * Copyright (c) 2003 Michael Niedermayer.
+ * Common AAC and AC-3 parser prototypes
+ * Copyright (c) 2003 Fabrice Bellard
+ * Copyright (c) 2003 Michael Niedermayer
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_AAC_AC3_PARSER_H
-#define FFMPEG_AAC_AC3_PARSER_H
+#ifndef AVCODEC_AAC_AC3_PARSER_H
+#define AVCODEC_AAC_AC3_PARSER_H
 
 #include <stdint.h>
 #include "avcodec.h"
+#include "parser.h"
 
-typedef enum{
-    FRAME_COMPLETE,    ///< Complete frame, ends previous frame
-    FRAME_START,       ///< Frame start, ends previous frame
-    FRAME_CONTINUATION ///< Part of the previous frame
-}AACAC3FrameFlag;
+typedef enum {
+    AAC_AC3_PARSE_ERROR_SYNC        = -1,
+    AAC_AC3_PARSE_ERROR_BSID        = -2,
+    AAC_AC3_PARSE_ERROR_SAMPLE_RATE = -3,
+    AAC_AC3_PARSE_ERROR_FRAME_SIZE  = -4,
+    AAC_AC3_PARSE_ERROR_FRAME_TYPE  = -5,
+    AAC_AC3_PARSE_ERROR_CRC         = -6,
+    AAC_AC3_PARSE_ERROR_CHANNEL_CFG = -7,
+} AACAC3ParseError;
 
 typedef struct AACAC3ParseContext {
-    uint8_t *inbuf_ptr;
+    ParseContext pc;
     int frame_size;
     int header_size;
-    int (*sync)(struct AACAC3ParseContext *hdr_info, AACAC3FrameFlag *flag);
-    uint8_t inbuf[8192]; /* input buffer */
+    int (*sync)(uint64_t state, struct AACAC3ParseContext *hdr_info,
+            int *need_next_header, int *new_frame_start);
 
     int channels;
     int sample_rate;
     int bit_rate;
     int samples;
+    uint64_t channel_layout;
+    int service_type;
+
+    int remaining_size;
+    uint64_t state;
+
+    int need_next_header;
+    enum AVCodecID codec_id;
 } AACAC3ParseContext;
 
 int ff_aac_ac3_parse(AVCodecParserContext *s1,
@@ -50,4 +63,4 @@ int ff_aac_ac3_parse(AVCodecParserContext *s1,
                      const uint8_t **poutbuf, int *poutbuf_size,
                      const uint8_t *buf, int buf_size);
 
-#endif /* FFMPEG_AAC_AC3_PARSER_H */
+#endif /* AVCODEC_AAC_AC3_PARSER_H */