Add stereo rematrixing support to the AC-3 encoders.

[ffmpeg] / libavcodec / ac3tab.h

diff --git a/libavcodec/ac3tab.h b/libavcodec/ac3tab.h
index 9e7728f9eb1e112f3f6dfa4bd8e76308aff7f02d..dd8cabfcfdee98c877e70388060cfa3017cc337f 100644 (file)
--- a/libavcodec/ac3tab.h
+++ b/libavcodec/ac3tab.h
@@ -1,6 +1,6 @@
 /*
- * AC3 tables
- * Copyright (c) 2000, 2001, 2002 Fabrice Bellard.
+ * AC-3 tables
+ * Copyright (c) 2000, 2001, 2002 Fabrice Bellard
  *
  * This file is part of FFmpeg.
  *
@@ -19,18 +19,23 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_AC3TAB_H
-#define FFMPEG_AC3TAB_H
+#ifndef AVCODEC_AC3TAB_H
+#define AVCODEC_AC3TAB_H
 
-#include "common.h"
+#include "libavutil/common.h"
+#include "ac3.h"
 
 extern const uint16_t ff_ac3_frame_size_tab[38][3];
 extern const uint8_t  ff_ac3_channels_tab[8];
+extern const uint16_t ff_ac3_channel_layout_tab[8];
+extern const uint8_t  ff_ac3_enc_channel_map[8][2][6];
+extern const uint8_t  ff_ac3_dec_channel_map[8][2][6];
 extern const uint16_t ff_ac3_sample_rate_tab[3];
 extern const uint16_t ff_ac3_bitrate_tab[19];
-extern const int16_t  ff_ac3_window[256];
+extern const uint8_t  ff_ac3_rematrix_band_tab[5];
+extern const int16_t  ff_ac3_window[AC3_WINDOW_SIZE/2];
 extern const uint8_t  ff_ac3_log_add_tab[260];
-extern const uint16_t ff_ac3_hearing_threshold_tab[50][3];
+extern const uint16_t ff_ac3_hearing_threshold_tab[AC3_CRITICAL_BANDS][3];
 extern const uint8_t  ff_ac3_bap_tab[64];
 extern const uint8_t  ff_ac3_slow_decay_tab[4];
 extern const uint8_t  ff_ac3_fast_decay_tab[4];
@@ -38,7 +43,7 @@ extern const uint16_t ff_ac3_slow_gain_tab[4];
 extern const uint16_t ff_ac3_db_per_bit_tab[4];
 extern const int16_t  ff_ac3_floor_tab[8];
 extern const uint16_t ff_ac3_fast_gain_tab[8];
-extern const uint8_t  ff_ac3_critical_band_size_tab[50];
+extern const uint8_t  ff_ac3_critical_band_size_tab[AC3_CRITICAL_BANDS];
 extern const uint16_t ff_eac3_default_chmap[8];
 
 /** Custom channel map locations bitmask
@@ -56,4 +61,4 @@ enum CustomChannelMapLocation{
     AC3_CHMAP_LFE =     1<<(15-15)
 };
 
-#endif /* FFMPEG_AC3TAB_H */
+#endif /* AVCODEC_AC3TAB_H */