MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
It will be used by the parser. This change avoids unwanted parser
dependency on dcadata.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
foo86 2017-07-10 17:11:32 +03:00 committed by James Almer
parent f6b86b62f7
commit 9e37cc1101
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/dca.c
View File

@ -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
};
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 max_size)
{

2
libavcodec/dca.h
View File

@ -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 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

4
libavcodec/dcadata.c
View File

@ -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
};
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] = {
1, 2, 2, 3, 3, 4, 4, 0
};

2
libavcodec/dcadata.h
View File

@ -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_bits_per_sample[8];
extern const uint8_t ff_dca_dmix_primary_nch[8];
extern const uint8_t ff_dca_quant_index_sel_nbits[DCA_CODE_BOOKS];