6faf0a21e1
* qatar/master: (53 commits) probe: Restore identification of files with very large id3 tags and no extension. probe: Remove id3 tag presence as a criteria to do file extension checking. mpegts: MP4 SL support mpegts: MP4 OD support mpegts: Add support for Sections in PMT mpegts: Replace the MP4 descriptor parser with a recursive parser. mpegts: Add support for multiple mp4 descriptors mpegts: Parse mpeg2 SL descriptors. isom: Add MPEG4SYSTEMS dummy object type indication. aacdec: allow output reconfiguration on channel changes nellymoserenc: take float input samples instead of int16 nellymoserdec: use dsp functions for overlap and windowing nellymoserdec: do not fail if there is extra data in the packet nellymoserdec: fail if output buffer is too small nellymoserdec: remove pointless buffer size check. lavf: add init_put_byte() to the list of visible symbols. seek-test: free options dictionary after use snow: do not draw_edge if emu_edge is set tools/pktdumper: update to recent avformat api seek-test: update to recent avformat api ... Conflicts: doc/APIchanges libavcodec/mpegaudiodec.c libavcodec/nellymoserdec.c libavcodec/snow.c libavcodec/version.h libavcodec/wmadec.c libavformat/avformat.h libavformat/mpegts.c libavformat/mxfdec.c libavformat/utils.c libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
98 lines
3.2 KiB
C
98 lines
3.2 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,
|
|
#if FF_API_PARSE_FRAME
|
|
.capabilities = CODEC_CAP_PARSE_ONLY,
|
|
#endif
|
|
.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,
|
|
#if FF_API_PARSE_FRAME
|
|
.capabilities = CODEC_CAP_PARSE_ONLY,
|
|
#endif
|
|
.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,
|
|
#if FF_API_PARSE_FRAME
|
|
.capabilities = CODEC_CAP_PARSE_ONLY,
|
|
#endif
|
|
.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,
|
|
#if FF_API_PARSE_FRAME
|
|
.capabilities = CODEC_CAP_PARSE_ONLY,
|
|
#endif
|
|
.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
|