optimize imdct_half:

[ffmpeg] / libavcodec / ac3_parser.h

diff --git a/libavcodec/ac3_parser.h b/libavcodec/ac3_parser.h
index 1e512bf2b6003fa504cb2b5060c30281b4a80d47..e49492558ab7b67553d6c2521eeb5d3c052d549f 100644 (file)
--- a/libavcodec/ac3_parser.h
+++ b/libavcodec/ac3_parser.h
@@ -1,5 +1,5 @@
 /*
- * AC3 parser prototypes
+ * AC-3 parser prototypes
  * Copyright (c) 2003 Fabrice Bellard.
  * Copyright (c) 2003 Michael Niedermayer.
  *
@@ -24,6 +24,7 @@
 #define FFMPEG_AC3_PARSER_H
 
 #include "ac3.h"
+#include "bitstream.h"
 
 typedef enum {
     AC3_PARSE_ERROR_SYNC        = -1,
@@ -31,18 +32,30 @@ typedef enum {
     AC3_PARSE_ERROR_SAMPLE_RATE = -3,
     AC3_PARSE_ERROR_FRAME_SIZE  = -4,
     AC3_PARSE_ERROR_FRAME_TYPE  = -5,
+    AC3_PARSE_ERROR_CRC         = -6,
 } AC3ParseError;
 
 /**
  * Parses AC-3 frame header.
  * Parses the header up to the lfeon element, which is the first 52 or 54 bits
  * depending on the audio coding mode.
- * @param buf[in] Array containing the first 7 bytes of the frame.
+ * @param gbc[in] BitContext containing the first 54 bits of the frame.
  * @param hdr[out] Pointer to struct where header info is written.
  * @return Returns 0 on success, -1 if there is a sync word mismatch,
  * -2 if the bsid (version) element is invalid, -3 if the fscod (sample rate)
  * element is invalid, or -4 if the frmsizecod (bit rate) element is invalid.
  */
-int ff_ac3_parse_header(const uint8_t buf[7], AC3HeaderInfo *hdr);
+int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr);
+
+/**
+ * Parses AC-3 frame header and sets channel_map
+ * Parses the header up to the lfeon (channel_map in E-AC-3)
+ * element, which is the first 52, 54 or 104 bits depending
+ * on the audio coding mode.
+ * @param gbc[in] BitContext containing the first 54 bits of the frame.
+ * @param hdr[out] Pointer to struct where header info is written.
+ * @return value returned by ff_ac3_parse_header
+ */
+int ff_ac3_parse_header_full(GetBitContext *gbc, AC3HeaderInfo *hdr);
 
 #endif /* FFMPEG_AC3_PARSER_H */