Commit 9e37cc11 authored by foo86's avatar foo86 Committed by James Almer

avcodec/dca: move bits per sample array to dca.c

It will be used by the parser. This change avoids unwanted parser
dependency on dcadata.
Signed-off-by: 's avatarJames Almer <jamrial@gmail.com>
parent f6b86b62
...@@ -45,6 +45,10 @@ const uint8_t ff_dca_freq_ranges[16] = { ...@@ -45,6 +45,10 @@ const uint8_t ff_dca_freq_ranges[16] = {
0, 1, 2, 3, 4, 1, 2, 3, 4, 4, 0, 1, 2, 3, 4, 4 0, 1, 2, 3, 4, 1, 2, 3, 4, 4, 0, 1, 2, 3, 4, 4
}; };
const uint8_t ff_dca_bits_per_sample[8] = {
16, 16, 20, 20, 0, 24, 24, 0
};
int avpriv_dca_convert_bitstream(const uint8_t *src, int src_size, uint8_t *dst, int avpriv_dca_convert_bitstream(const uint8_t *src, int src_size, uint8_t *dst,
int max_size) int max_size)
{ {
......
...@@ -156,6 +156,8 @@ extern av_export const uint32_t avpriv_dca_sample_rates[16]; ...@@ -156,6 +156,8 @@ extern av_export const uint32_t avpriv_dca_sample_rates[16];
extern const uint32_t ff_dca_sampling_freqs[16]; extern const uint32_t ff_dca_sampling_freqs[16];
extern const uint8_t ff_dca_freq_ranges[16]; extern const uint8_t ff_dca_freq_ranges[16];
extern const uint8_t ff_dca_bits_per_sample[8];
/** /**
* Convert bitstream to one representation based on sync marker * Convert bitstream to one representation based on sync marker
......
...@@ -42,10 +42,6 @@ const uint8_t ff_dca_channels[16] = { ...@@ -42,10 +42,6 @@ const uint8_t ff_dca_channels[16] = {
1, 2, 2, 2, 2, 3, 3, 4, 4, 5, 6, 6, 6, 7, 8, 8 1, 2, 2, 2, 2, 3, 3, 4, 4, 5, 6, 6, 6, 7, 8, 8
}; };
const uint8_t ff_dca_bits_per_sample[8] = {
16, 16, 20, 20, 0, 24, 24, 0
};
const uint8_t ff_dca_dmix_primary_nch[8] = { const uint8_t ff_dca_dmix_primary_nch[8] = {
1, 2, 2, 3, 3, 4, 4, 0 1, 2, 2, 3, 3, 4, 4, 0
}; };
......
...@@ -32,8 +32,6 @@ extern const uint32_t ff_dca_bit_rates[32]; ...@@ -32,8 +32,6 @@ extern const uint32_t ff_dca_bit_rates[32];
extern const uint8_t ff_dca_channels[16]; extern const uint8_t ff_dca_channels[16];
extern const uint8_t ff_dca_bits_per_sample[8];
extern const uint8_t ff_dca_dmix_primary_nch[8]; extern const uint8_t ff_dca_dmix_primary_nch[8];
extern const uint8_t ff_dca_quant_index_sel_nbits[DCA_CODE_BOOKS]; extern const uint8_t ff_dca_quant_index_sel_nbits[DCA_CODE_BOOKS];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment