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

Avoids unwanted parser dependency on dcadata.

foo86 committed 10 years ago

Commit a0f76b81 parent d93495c7 files · +13 −15Browse files

Unified · Split

7 files

libavcodec/Makefile +1 −1
libavcodec/dca.c +9 −0
libavcodec/dca.h +3 −0
libavcodec/dca_exss.c +0 −1
libavcodec/dca_parser.c +0 −1
libavcodec/dcadata.c +0 −9
libavcodec/dcadata.h +0 −3

libavcodec/Makefile+1−1

@@ -900,7 +900,7 @@ OBJS-$(CONFIG_ADX_PARSER) += adx_parser.o adx.o · 899 unmodified lines
900	900	OBJS-$(CONFIG_BMP_PARSER) += bmp_parser.o
901	901	OBJS-$(CONFIG_CAVSVIDEO_PARSER) += cavs_parser.o
902	902	OBJS-$(CONFIG_COOK_PARSER) += cook_parser.o
903		−OBJS-$(CONFIG_DCA_PARSER) += dca_parser.o dca_exss.o dcadata.o dca.o
	903	+OBJS-$(CONFIG_DCA_PARSER) += dca_parser.o dca_exss.o dca.o
904	904	OBJS-$(CONFIG_DIRAC_PARSER) += dirac_parser.o
905	905	OBJS-$(CONFIG_DNXHD_PARSER) += dnxhd_parser.o
906	906	OBJS-$(CONFIG_DPX_PARSER) += dpx_parser.o

libavcodec/dca.c+9−0

@@ -36,6 +36,15 @@ const uint32_t avpriv_dca_sample_rates[16] = { · 35 unmodified lines
36	36	12000, 24000, 48000, 96000, 192000
37	37	};
38	38
	39	+const uint32_t ff_dca_sampling_freqs[16] = {
	40	+ 8000, 16000, 32000, 64000, 128000, 22050, 44100, 88200,
	41	+ 176400, 352800, 12000, 24000, 48000, 96000, 192000, 384000,
	42	+};
	43	+
	44	+const uint8_t ff_dca_freq_ranges[16] = {
	45	+ 0, 1, 2, 3, 4, 1, 2, 3, 4, 4, 0, 1, 2, 3, 4, 4
	46	+};
	47	+
39	48	int avpriv_dca_convert_bitstream(const uint8_t src, int src_size, uint8_t dst,
40	49	int max_size)
41	50	{

libavcodec/dca.h+3−0

@@ -154,6 +154,9 @@ enum DCADownMixType { · 153 unmodified lines
154	154
155	155	extern av_export const uint32_t avpriv_dca_sample_rates[16];
156	156
	157	+extern const uint32_t ff_dca_sampling_freqs[16];
	158	+extern const uint8_t ff_dca_freq_ranges[16];
	159	+
157	160	/**
158	161	* Convert bitstream to one representation based on sync marker
159	162	*/

libavcodec/dca_exss.c+0−1

@@ -19,7 +19,6 @@ · 18 unmodified lines
19	19	*/
20	20
21	21	#include "dcadec.h"
22		−#include "dcadata.h"
23	22
24	23	static void parse_xll_parameters(DCAExssParser s, DCAExssAsset asset)
25	24	{

libavcodec/dca_parser.c+0−1

@@ -23,7 +23,6 @@ · 22 unmodified lines
23	23	*/
24	24
25	25	#include "dca.h"
26		−#include "dcadata.h"
27	26	#include "dca_exss.h"
28	27	#include "dca_syncwords.h"
29	28	#include "get_bits.h"

libavcodec/dcadata.c+0−9

@@ -8725,15 +8725,6 @@ const int32_t ff_dca_xll_band_coeff[20] = { · 8724 unmodified lines
8725	8725	3259333, -5074941, 6928550, -8204883
8726	8726	};
8727	8727
8728		−const uint32_t ff_dca_sampling_freqs[16] = {
8729		− 8000, 16000, 32000, 64000, 128000, 22050, 44100, 88200,
8730		− 176400, 352800, 12000, 24000, 48000, 96000, 192000, 384000,
8731		−};
8732		−
8733		−const uint8_t ff_dca_freq_ranges[16] = {
8734		− 0, 1, 2, 3, 4, 1, 2, 3, 4, 4, 0, 1, 2, 3, 4, 4
8735		−};
8736		−
8737	8728	const uint16_t ff_dca_avg_g3_freqs[3] = { 16000, 18000, 24000 };
8738	8729
8739	8730	const uint16_t ff_dca_fst_amp[44] = {

libavcodec/dcadata.h+0−3

@@ -71,9 +71,6 @@ extern const uint16_t ff_dca_xll_refl_coeff[128]; · 70 unmodified lines
71	71
72	72	extern const int32_t ff_dca_xll_band_coeff[20];
73	73
74		−extern const uint32_t ff_dca_sampling_freqs[16];
75		−extern const uint8_t ff_dca_freq_ranges[16];
76		−
77	74	extern const uint16_t ff_dca_avg_g3_freqs[3];
78	75
79	76	extern const uint16_t ff_dca_fst_amp[44];