RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cosmetics: rename some functions from *get_* to *decode_* 

Originally committed as revision 14952 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Justin Ruggles 2008-08-24 22:55:08 +00:00
parent 547ea47d4f
commit e23e4de3ae
3 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/Makefile
View File

@ -27,7 +27,7 @@ OBJS-$(CONFIG_ENCODERS) += faandct.o jfdctfst.o jfdctint.o
OBJS-$(CONFIG_AAC_DECODER) += aac.o aactab.o mdct.o fft.o OBJS-$(CONFIG_AAC_DECODER) += aac.o aactab.o mdct.o fft.o
OBJS-$(CONFIG_AASC_DECODER) += aasc.o OBJS-$(CONFIG_AASC_DECODER) += aasc.o
OBJS-$(CONFIG_AC3_DECODER) += ac3dec.o ac3tab.o ac3dec_data.o ac3.o mdct.o fft.o OBJS-$(CONFIG_AC3_DECODER) += eac3dec.o ac3dec.o ac3tab.o ac3dec_data.o ac3.o mdct.o fft.o
OBJS-$(CONFIG_AC3_ENCODER) += ac3enc.o ac3tab.o ac3.o OBJS-$(CONFIG_AC3_ENCODER) += ac3enc.o ac3tab.o ac3.o
OBJS-$(CONFIG_ALAC_DECODER) += alac.o OBJS-$(CONFIG_ALAC_DECODER) += alac.o
OBJS-$(CONFIG_ALAC_ENCODER) += alacenc.o lpc.o OBJS-$(CONFIG_ALAC_ENCODER) += alacenc.o lpc.o

14
libavcodec/ac3dec.h
View File

@ -82,7 +82,7 @@ typedef struct {
int phase_flags[18]; ///< phase flags (phsflg) int phase_flags[18]; ///< phase flags (phsflg)
int num_cpl_subbands; ///< number of coupling sub bands (ncplsubnd) int num_cpl_subbands; ///< number of coupling sub bands (ncplsubnd)
int num_cpl_bands; ///< number of coupling bands (ncplbnd) int num_cpl_bands; ///< number of coupling bands (ncplbnd)
int cpl_band_struct[18]; ///< coupling band structure (cplbndstrc) uint8_t cpl_band_struct[18]; ///< coupling band structure (cplbndstrc)
int firstchincpl; ///< first channel in coupling int firstchincpl; ///< first channel in coupling
int first_cpl_coords[AC3_MAX_CHANNELS]; ///< first coupling coordinates states (firstcplcos) int first_cpl_coords[AC3_MAX_CHANNELS]; ///< first coupling coordinates states (firstcplcos)
int cpl_coords[AC3_MAX_CHANNELS][18]; ///< coupling coordinates (cplco) int cpl_coords[AC3_MAX_CHANNELS][18]; ///< coupling coordinates (cplco)
@ -168,4 +168,16 @@ typedef struct {
///@} ///@}
} AC3DecodeContext; } AC3DecodeContext;
/**
* Parse the E-AC-3 frame header.
* This parses both the bit stream info and audio frame header.
*/
int ff_eac3_parse_header(AC3DecodeContext *s);
/**
* Decode mantissas in a single channel for the entire frame.
* This is used when AHT mode is enabled.
*/
void ff_eac3_decode_transform_coeffs_aht_ch(AC3DecodeContext *s, int ch);
#endif /* FFMPEG_AC3DEC_H */ #endif /* FFMPEG_AC3DEC_H */

19
libavcodec/ac3dec_data.c
View File

@ -87,18 +87,19 @@ const int16_t ff_eac3_gaq_remap_2_4_a[9][2] = {
/** /**
* Table E3.6, Gk=2 & Gk=4, B * Table E3.6, Gk=2 & Gk=4, B
* Large mantissa inverse quantization, negative mantissa remapping offsets * Large mantissa inverse quantization, negative mantissa remapping offsets
* Table values from the spec are right-shifted by 8 to simplify calculations.
* ff_eac3_gaq_remap_3_4_b[hebap-8][Gk=2,4] * ff_eac3_gaq_remap_3_4_b[hebap-8][Gk=2,4]
*/ */
const int16_t ff_eac3_gaq_remap_2_4_b[9][2] = { const int16_t ff_eac3_gaq_remap_2_4_b[9][2] = {
{ -5461, -1170}, { -22, -5 },
{ -11703, -4915}, { -46, -20 },
{ -14199, -6606}, { -56, -26 },
{ -15327, -7412}, { -60, -29 },
{ -15864, -7805}, { -62, -31 },
{ -16126, -7999}, { -63, -32 },
{ -16255, -8096}, { -64, -32 },
{ -16320, -8144}, { -64, -32 },
{ -16352, -8168} { -64, -32 },
}; };
static const int16_t vq_hebap1[4][6] = { static const int16_t vq_hebap1[4][6] = {