xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-24 03:59:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

avcodec/dca: move EXSS sampling frequency arrays to dca.c

Browse Source 
Avoids unwanted parser dependency on dcadata.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
foo86 2016-05-26 14:29:35 +03:00 committed by James Almer
parent d93495c954
commit a0f76b825c
7 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/Makefile
View File

@ -900,7 +900,7 @@ OBJS-$(CONFIG_ADX_PARSER) += adx_parser.o adx.o
OBJS-$(CONFIG_BMP_PARSER) += bmp_parser.o OBJS-$(CONFIG_BMP_PARSER) += bmp_parser.o
OBJS-$(CONFIG_CAVSVIDEO_PARSER) += cavs_parser.o OBJS-$(CONFIG_CAVSVIDEO_PARSER) += cavs_parser.o
OBJS-$(CONFIG_COOK_PARSER) += cook_parser.o OBJS-$(CONFIG_COOK_PARSER) += cook_parser.o
OBJS-$(CONFIG_DCA_PARSER) += dca_parser.o dca_exss.o dcadata.o dca.o OBJS-$(CONFIG_DCA_PARSER) += dca_parser.o dca_exss.o dca.o
OBJS-$(CONFIG_DIRAC_PARSER) += dirac_parser.o OBJS-$(CONFIG_DIRAC_PARSER) += dirac_parser.o
OBJS-$(CONFIG_DNXHD_PARSER) += dnxhd_parser.o OBJS-$(CONFIG_DNXHD_PARSER) += dnxhd_parser.o
OBJS-$(CONFIG_DPX_PARSER) += dpx_parser.o OBJS-$(CONFIG_DPX_PARSER) += dpx_parser.o

9
libavcodec/dca.c
View File

@ -36,6 +36,15 @@ const uint32_t avpriv_dca_sample_rates[16] = {
12000, 24000, 48000, 96000, 192000 12000, 24000, 48000, 96000, 192000
}; };
const uint32_t ff_dca_sampling_freqs[16] = {
8000, 16000, 32000, 64000, 128000, 22050, 44100, 88200,
176400, 352800, 12000, 24000, 48000, 96000, 192000, 384000,
};
const uint8_t ff_dca_freq_ranges[16] = {
0, 1, 2, 3, 4, 1, 2, 3, 4, 4, 0, 1, 2, 3, 4, 4
};
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)
{ {

3
libavcodec/dca.h
View File

@ -154,6 +154,9 @@ enum DCADownMixType {
extern av_export const uint32_t avpriv_dca_sample_rates[16]; 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];
/** /**
* Convert bitstream to one representation based on sync marker * Convert bitstream to one representation based on sync marker
*/ */

1
libavcodec/dca_exss.c
View File

@ -19,7 +19,6 @@
*/ */
#include "dcadec.h" #include "dcadec.h"
#include "dcadata.h"
static void parse_xll_parameters(DCAExssParser *s, DCAExssAsset *asset) static void parse_xll_parameters(DCAExssParser *s, DCAExssAsset *asset)
{ {

1
libavcodec/dca_parser.c
View File

@ -23,7 +23,6 @@
*/ */
#include "dca.h" #include "dca.h"
#include "dcadata.h"
#include "dca_exss.h" #include "dca_exss.h"
#include "dca_syncwords.h" #include "dca_syncwords.h"
#include "get_bits.h" #include "get_bits.h"

9
libavcodec/dcadata.c
View File

@ -8725,15 +8725,6 @@ const int32_t ff_dca_xll_band_coeff[20] = {
3259333, -5074941, 6928550, -8204883 3259333, -5074941, 6928550, -8204883
}; };
const uint32_t ff_dca_sampling_freqs[16] = {
8000, 16000, 32000, 64000, 128000, 22050, 44100, 88200,
176400, 352800, 12000, 24000, 48000, 96000, 192000, 384000,
};
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 uint16_t ff_dca_avg_g3_freqs[3] = { 16000, 18000, 24000 }; const uint16_t ff_dca_avg_g3_freqs[3] = { 16000, 18000, 24000 };
const uint16_t ff_dca_fst_amp[44] = { const uint16_t ff_dca_fst_amp[44] = {

3
libavcodec/dcadata.h
View File

@ -71,9 +71,6 @@ extern const uint16_t ff_dca_xll_refl_coeff[128];
extern const int32_t ff_dca_xll_band_coeff[20]; extern const int32_t ff_dca_xll_band_coeff[20];
extern const uint32_t ff_dca_sampling_freqs[16];
extern const uint8_t ff_dca_freq_ranges[16];
extern const uint16_t ff_dca_avg_g3_freqs[3]; extern const uint16_t ff_dca_avg_g3_freqs[3];
extern const uint16_t ff_dca_fst_amp[44]; extern const uint16_t ff_dca_fst_amp[44];