mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
aedc908601
* qatar/master: (35 commits) flvdec: Do not call parse_keyframes_index with a NULL stream libspeexdec: include system headers before local headers libspeexdec: return meaningful error codes libspeexdec: cosmetics: reindent libspeexdec: decode one frame at a time. swscale: fix signed shift overflows in ff_yuv2rgb_c_init_tables() Move timefilter code from lavf to lavd. mov: add support for hdvd and pgapmetadata atoms mov: rename function _stik, some indentation cosmetics mov: rename function _int8 to remove ambiguity, some indentation cosmetics mov: parse the gnre atom mp3on4: check for allocation failures in decode_init_mp3on4() mp3on4: create a separate flush function for MP3onMP4. mp3on4: ensure that the frame channel count does not exceed the codec channel count. mp3on4: set channel layout mp3on4: fix the output channel order mp3on4: allocate temp buffer with av_malloc() instead of on the stack. mp3on4: copy MPADSPContext from first context to all contexts. fmtconvert: port float_to_int16_interleave() 2-channel x86 inline asm to yasm fmtconvert: port int32_to_float_fmul_scalar() x86 inline asm to yasm ... Conflicts: libavcodec/arm/h264dsp_init_arm.c libavcodec/h264.c libavcodec/h264.h libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_ps.c libavcodec/h264dsp_template.c libavcodec/h264idct_template.c libavcodec/h264pred.c libavcodec/h264pred_template.c libavcodec/x86/h264dsp_mmx.c libavdevice/Makefile libavdevice/jack_audio.c libavformat/Makefile libavformat/flvdec.c libavformat/flvenc.c libavutil/pixfmt.h libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
101 lines
3.8 KiB
C
101 lines
3.8 KiB
C
/*
|
|
* Format Conversion Utils
|
|
* Copyright (c) 2000, 2001 Fabrice Bellard
|
|
* Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
|
|
*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* FFmpeg 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.
|
|
*
|
|
* FFmpeg 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 FFmpeg; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#ifndef AVCODEC_FMTCONVERT_H
|
|
#define AVCODEC_FMTCONVERT_H
|
|
|
|
#include "avcodec.h"
|
|
|
|
typedef struct FmtConvertContext {
|
|
/**
|
|
* Convert an array of int32_t to float and multiply by a float value.
|
|
* @param dst destination array of float.
|
|
* constraints: 16-byte aligned
|
|
* @param src source array of int32_t.
|
|
* constraints: 16-byte aligned
|
|
* @param len number of elements to convert.
|
|
* constraints: multiple of 8
|
|
*/
|
|
void (*int32_to_float_fmul_scalar)(float *dst, const int *src, float mul, int len);
|
|
|
|
/**
|
|
* Convert an array of float to an array of int16_t.
|
|
*
|
|
* Convert floats from in the range [-32768.0,32767.0] to ints
|
|
* without rescaling
|
|
*
|
|
* @param dst destination array of int16_t.
|
|
* constraints: 16-byte aligned
|
|
* @param src source array of float.
|
|
* constraints: 16-byte aligned
|
|
* @param len number of elements to convert.
|
|
* constraints: multiple of 8
|
|
*/
|
|
void (*float_to_int16)(int16_t *dst, const float *src, long len);
|
|
|
|
/**
|
|
* Convert multiple arrays of float to an interleaved array of int16_t.
|
|
*
|
|
* Convert floats from in the range [-32768.0,32767.0] to ints
|
|
* without rescaling
|
|
*
|
|
* @param dst destination array of interleaved int16_t.
|
|
* constraints: 16-byte aligned
|
|
* @param src source array of float arrays, one for each channel.
|
|
* constraints: 16-byte aligned
|
|
* @param len number of elements to convert.
|
|
* constraints: multiple of 8
|
|
* @param channels number of channels
|
|
*/
|
|
void (*float_to_int16_interleave)(int16_t *dst, const float **src,
|
|
long len, int channels);
|
|
|
|
/**
|
|
* Convert multiple arrays of float to an array of interleaved float.
|
|
*
|
|
* @param dst destination array of interleaved float.
|
|
* constraints: 16-byte aligned
|
|
* @param src source array of float arrays, one for each channel.
|
|
* constraints: 16-byte aligned
|
|
* @param len number of elements to convert.
|
|
* constraints: multiple of 8
|
|
* @param channels number of channels
|
|
*/
|
|
void (*float_interleave)(float *dst, const float **src, unsigned int len,
|
|
int channels);
|
|
} FmtConvertContext;
|
|
|
|
void ff_float_interleave_c(float *dst, const float **src, unsigned int len,
|
|
int channels);
|
|
|
|
void ff_fmt_convert_init(FmtConvertContext *c, AVCodecContext *avctx);
|
|
|
|
void ff_fmt_convert_init_arm(FmtConvertContext *c, AVCodecContext *avctx);
|
|
void ff_fmt_convert_init_altivec(FmtConvertContext *c, AVCodecContext *avctx);
|
|
void ff_fmt_convert_init_x86(FmtConvertContext *c, AVCodecContext *avctx);
|
|
|
|
/* ffdshow custom code */
|
|
void float_interleave(float *dst, const float **src, long len, int channels);
|
|
void float_interleave_noscale(float *dst, const float **src, long len, int channels);
|
|
|
|
#endif /* AVCODEC_FMTCONVERT_H */
|