aboutsummaryrefslogtreecommitdiff
path: root/lib/ffmpeg/libavcodec/ac3.h
diff options
context:
space:
mode:
Diffstat (limited to 'lib/ffmpeg/libavcodec/ac3.h')
-rw-r--r--lib/ffmpeg/libavcodec/ac3.h21
1 files changed, 9 insertions, 12 deletions
diff --git a/lib/ffmpeg/libavcodec/ac3.h b/lib/ffmpeg/libavcodec/ac3.h
index 9c8dc4870e..405e3cd0a3 100644
--- a/lib/ffmpeg/libavcodec/ac3.h
+++ b/lib/ffmpeg/libavcodec/ac3.h
@@ -27,13 +27,17 @@
#ifndef AVCODEC_AC3_H
#define AVCODEC_AC3_H
-#include "ac3tab.h"
-
#define AC3_MAX_CODED_FRAME_SIZE 3840 /* in bytes */
#define AC3_MAX_CHANNELS 6 /* including LFE channel */
-#define NB_BLOCKS 6 /* number of PCM blocks inside an AC-3 frame */
-#define AC3_FRAME_SIZE (NB_BLOCKS * 256)
+#define AC3_MAX_COEFS 256
+#define AC3_BLOCK_SIZE 256
+#define AC3_MAX_BLOCKS 6
+#define AC3_FRAME_SIZE (AC3_MAX_BLOCKS * 256)
+#define AC3_WINDOW_SIZE (AC3_BLOCK_SIZE * 2)
+#define AC3_CRITICAL_BANDS 50
+
+#include "ac3tab.h"
/* exponent encoding strategy */
#define EXP_REUSE 0
@@ -111,7 +115,7 @@ typedef enum {
EAC3_FRAME_TYPE_RESERVED
} EAC3FrameType;
-void ac3_common_init(void);
+void ff_ac3_common_init(void);
/**
* Calculate the log power-spectral density of the input signal.
@@ -177,11 +181,4 @@ void ff_ac3_bit_alloc_calc_bap(int16_t *mask, int16_t *psd, int start, int end,
int snr_offset, int floor,
const uint8_t *bap_tab, uint8_t *bap);
-void ac3_parametric_bit_allocation(AC3BitAllocParameters *s, uint8_t *bap,
- int8_t *exp, int start, int end,
- int snr_offset, int fast_gain, int is_lfe,
- int dba_mode, int dba_nsegs,
- uint8_t *dba_offsets, uint8_t *dba_lengths,
- uint8_t *dba_values);
-
#endif /* AVCODEC_AC3_H */