dd3ca3ea15
* qatar/master: fate: Add tests for more AAC features. aacps: Add missing newline in error message. fate: Add tests for vc1/wmapro in ism. aacdec: Add a fate test for 5.1 channel SBR. aacdec: Turn off PS for multichannel files that use PCE based configs. cabac: remove put_cabac_u/ueg from cabac-test. swscale: RGB4444 and BGR444 input FATE: add test for xWMA demuxer. FATE: add test for SMJPEG demuxer and associated IMA ADPCM audio decoder. mpegaudiodec: optimized iMDCT transform mpegaudiodec: change imdct window arrangment for better pointer alignment mpegaudiodec: move imdct and windowing function to mpegaudiodsp mpegaudiodec: interleave iMDCT buffer to simplify future SIMD implementations swscale: convert yuy2/uyvy/nv12/nv21ToY/UV from inline asm to yasm. FATE: test to exercise WTV demuxer. mjpegdec: K&R formatting cosmetics swscale: K&R formatting cosmetics for code examples swscale: K&R reformatting cosmetics for header files FATE test: cvid-grayscale; ensures that the grayscale Cinepak variant is exercised. Conflicts: libavcodec/cabac.c libavcodec/mjpegdec.c libavcodec/mpegaudiodec.c libavcodec/mpegaudiodsp.c libavcodec/mpegaudiodsp.h libavcodec/mpegaudiodsp_template.c libavcodec/x86/Makefile libavcodec/x86/imdct36_sse.asm libavcodec/x86/mpegaudiodec_mmx.c libswscale/swscale-test.c libswscale/swscale.c libswscale/swscale_internal.h libswscale/x86/swscale_template.c tests/fate/demux.mak tests/fate/microsoft.mak tests/fate/video.mak tests/fate/wma.mak tests/ref/lavfi/pixfmts_scale Merged-by: Michael Niedermayer <michaelni@gmx.at>
86 lines
3.5 KiB
C
86 lines
3.5 KiB
C
/*
|
|
* This file is part of Libav.
|
|
*
|
|
* Libav is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* Libav is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with Libav; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#ifndef AVCODEC_MPEGAUDIODSP_H
|
|
#define AVCODEC_MPEGAUDIODSP_H
|
|
|
|
#include <stdint.h>
|
|
#include "libavutil/common.h"
|
|
|
|
typedef struct MPADSPContext {
|
|
void (*apply_window_float)(float *synth_buf, float *window,
|
|
int *dither_state, float *samples, int incr);
|
|
void (*apply_window_fixed)(int32_t *synth_buf, int32_t *window,
|
|
int *dither_state, int16_t *samples, int incr);
|
|
void (*dct32_float)(float *dst, const float *src);
|
|
void (*dct32_fixed)(int *dst, const int *src);
|
|
|
|
void (*imdct36_blocks_float)(float *out, float *buf, float *in,
|
|
int count, int switch_point, int block_type);
|
|
void (*imdct36_blocks_fixed)(int *out, int *buf, int *in,
|
|
int count, int switch_point, int block_type);
|
|
} MPADSPContext;
|
|
|
|
void ff_mpadsp_init(MPADSPContext *s);
|
|
|
|
extern int32_t ff_mpa_synth_window_fixed[];
|
|
extern float ff_mpa_synth_window_float[];
|
|
|
|
void ff_mpa_synth_filter_fixed(MPADSPContext *s,
|
|
int32_t *synth_buf_ptr, int *synth_buf_offset,
|
|
int32_t *window, int *dither_state,
|
|
int16_t *samples, int incr,
|
|
int32_t *sb_samples);
|
|
|
|
void ff_mpa_synth_filter_float(MPADSPContext *s,
|
|
float *synth_buf_ptr, int *synth_buf_offset,
|
|
float *window, int *dither_state,
|
|
float *samples, int incr,
|
|
float *sb_samples);
|
|
|
|
void ff_mpadsp_init_arm(MPADSPContext *s);
|
|
void ff_mpadsp_init_mmx(MPADSPContext *s);
|
|
void ff_mpadsp_init_altivec(MPADSPContext *s);
|
|
|
|
void ff_mpa_synth_init_float(float *window);
|
|
void ff_mpa_synth_init_fixed(int32_t *window);
|
|
|
|
void ff_mpadsp_apply_window_float(float *synth_buf, float *window,
|
|
int *dither_state, float *samples,
|
|
int incr);
|
|
void ff_mpadsp_apply_window_fixed(int32_t *synth_buf, int32_t *window,
|
|
int *dither_state, int16_t *samples,
|
|
int incr);
|
|
|
|
void ff_imdct36_blocks_float(float *out, float *buf, float *in,
|
|
int count, int switch_point, int block_type);
|
|
|
|
void ff_imdct36_blocks_fixed(int *out, int *buf, int *in,
|
|
int count, int switch_point, int block_type);
|
|
|
|
void ff_init_mpadsp_tabs_float(void);
|
|
void ff_init_mpadsp_tabs_fixed(void);
|
|
|
|
/** For SSE implementation, MDCT_BUF_SIZE/2 should be 128-bit aligned */
|
|
#define MDCT_BUF_SIZE FFALIGN(36, 2*4)
|
|
|
|
extern int ff_mdct_win_fixed[8][MDCT_BUF_SIZE];
|
|
extern float ff_mdct_win_float[8][MDCT_BUF_SIZE];
|
|
|
|
#endif /* AVCODEC_MPEGAUDIODSP_H */
|