mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-25 00:32:31 +00: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>
90 lines
3.1 KiB
C
90 lines
3.1 KiB
C
/*
|
|
* Float MPEG Audio decoder
|
|
* Copyright (c) 2010 Michael Niedermayer
|
|
*
|
|
* 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
|
|
*/
|
|
|
|
#define CONFIG_FLOAT 1
|
|
#include "mpegaudiodec.c"
|
|
|
|
#if CONFIG_MP1FLOAT_DECODER
|
|
AVCodec ff_mp1float_decoder = {
|
|
.name = "mp1float",
|
|
.type = AVMEDIA_TYPE_AUDIO,
|
|
.id = CODEC_ID_MP1,
|
|
.priv_data_size = sizeof(MPADecodeContext),
|
|
.init = decode_init,
|
|
.decode = decode_frame,
|
|
.capabilities = CODEC_CAP_PARSE_ONLY,
|
|
.flush = flush,
|
|
.long_name = NULL_IF_CONFIG_SMALL("MP1 (MPEG audio layer 1)"),
|
|
};
|
|
#endif
|
|
#if CONFIG_MP2FLOAT_DECODER
|
|
AVCodec ff_mp2float_decoder = {
|
|
.name = "mp2float",
|
|
.type = AVMEDIA_TYPE_AUDIO,
|
|
.id = CODEC_ID_MP2,
|
|
.priv_data_size = sizeof(MPADecodeContext),
|
|
.init = decode_init,
|
|
.decode = decode_frame,
|
|
.capabilities = CODEC_CAP_PARSE_ONLY,
|
|
.flush = flush,
|
|
.long_name = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"),
|
|
};
|
|
#endif
|
|
#if CONFIG_MP3FLOAT_DECODER
|
|
AVCodec ff_mp3float_decoder = {
|
|
.name = "mp3float",
|
|
.type = AVMEDIA_TYPE_AUDIO,
|
|
.id = CODEC_ID_MP3,
|
|
.priv_data_size = sizeof(MPADecodeContext),
|
|
.init = decode_init,
|
|
.decode = decode_frame,
|
|
.capabilities = CODEC_CAP_PARSE_ONLY,
|
|
.flush = flush,
|
|
.long_name = NULL_IF_CONFIG_SMALL("MP3 (MPEG audio layer 3)"),
|
|
};
|
|
#endif
|
|
#if CONFIG_MP3ADUFLOAT_DECODER
|
|
AVCodec ff_mp3adufloat_decoder = {
|
|
.name = "mp3adufloat",
|
|
.type = AVMEDIA_TYPE_AUDIO,
|
|
.id = CODEC_ID_MP3ADU,
|
|
.priv_data_size = sizeof(MPADecodeContext),
|
|
.init = decode_init,
|
|
.decode = decode_frame_adu,
|
|
.capabilities = CODEC_CAP_PARSE_ONLY,
|
|
.flush = flush,
|
|
.long_name = NULL_IF_CONFIG_SMALL("ADU (Application Data Unit) MP3 (MPEG audio layer 3)"),
|
|
};
|
|
#endif
|
|
#if CONFIG_MP3ON4FLOAT_DECODER
|
|
AVCodec ff_mp3on4float_decoder = {
|
|
.name = "mp3on4float",
|
|
.type = AVMEDIA_TYPE_AUDIO,
|
|
.id = CODEC_ID_MP3ON4,
|
|
.priv_data_size = sizeof(MP3On4DecodeContext),
|
|
.init = decode_init_mp3on4,
|
|
.close = decode_close_mp3on4,
|
|
.decode = decode_frame_mp3on4,
|
|
.flush = flush_mp3on4,
|
|
.long_name = NULL_IF_CONFIG_SMALL("MP3onMP4"),
|
|
};
|
|
#endif
|