* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef FFMPEG_VORBIS_H
-#define FFMPEG_VORBIS_H
+#ifndef AVCODEC_VORBIS_H
+#define AVCODEC_VORBIS_H
#include "avcodec.h"
extern const float ff_vorbis_floor1_inverse_db_table[256];
-extern const float * ff_vorbis_vwin[8];
+extern const float * const ff_vorbis_vwin[8];
+extern const uint8_t ff_vorbis_channel_layout_offsets[6][6];
+extern const int64_t ff_vorbis_channel_layouts[7];
typedef struct {
uint_fast16_t x;
uint_fast16_t sort;
uint_fast16_t low;
uint_fast16_t high;
-} floor1_entry_t;
+} vorbis_floor1_entry;
-void ff_vorbis_ready_floor1_list(floor1_entry_t * list, int values);
+void ff_vorbis_ready_floor1_list(vorbis_floor1_entry * list, int values);
unsigned int ff_vorbis_nth_root(unsigned int x, unsigned int n); // x^(1/n)
int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, uint_fast32_t num);
-void ff_vorbis_floor1_render_list(floor1_entry_t * list, int values, uint_fast16_t * y_list, int * flag, int multiplier, float * out, int samples);
+void ff_vorbis_floor1_render_list(vorbis_floor1_entry * list, int values,
+ uint_fast16_t * y_list, int * flag,
+ int multiplier, float * out, int samples);
#define ilog(i) av_log2(2*(i))
-#endif /* FFMPEG_VORBIS_H */
+#endif /* AVCODEC_VORBIS_H */