From 0eeeb9647e9c92c9edfd0b18c7cb5da7ac666f85 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 19 Nov 2013 21:47:39 +0100 Subject: [PATCH] mpegaudiodec: Consistently handle fixed/float templating --- libavcodec/Makefile | 12 +- libavcodec/mpegaudiodec_fixed.c | 120 ++++++++++++++++++ libavcodec/mpegaudiodec_float.c | 18 ++- ...mpegaudiodec.c => mpegaudiodec_template.c} | 108 ---------------- 4 files changed, 143 insertions(+), 115 deletions(-) create mode 100644 libavcodec/mpegaudiodec_fixed.c rename libavcodec/{mpegaudiodec.c => mpegaudiodec_template.c} (93%) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 1674d4740f..51ccbde673 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -237,17 +237,17 @@ OBJS-$(CONFIG_MJPEGB_DECODER) += mjpegbdec.o mjpegdec.o mjpeg.o OBJS-$(CONFIG_MLP_DECODER) += mlpdec.o mlpdsp.o OBJS-$(CONFIG_MMVIDEO_DECODER) += mmvideo.o OBJS-$(CONFIG_MOTIONPIXELS_DECODER) += motionpixels.o -OBJS-$(CONFIG_MP1_DECODER) += mpegaudiodec.o +OBJS-$(CONFIG_MP1_DECODER) += mpegaudiodec_fixed.o OBJS-$(CONFIG_MP1FLOAT_DECODER) += mpegaudiodec_float.o -OBJS-$(CONFIG_MP2_DECODER) += mpegaudiodec.o +OBJS-$(CONFIG_MP2_DECODER) += mpegaudiodec_fixed.o OBJS-$(CONFIG_MP2_ENCODER) += mpegaudioenc.o mpegaudio.o \ mpegaudiodata.o mpegaudiodsp_data.o OBJS-$(CONFIG_MP2FLOAT_DECODER) += mpegaudiodec_float.o -OBJS-$(CONFIG_MP3_DECODER) += mpegaudiodec.o -OBJS-$(CONFIG_MP3ADU_DECODER) += mpegaudiodec.o +OBJS-$(CONFIG_MP3_DECODER) += mpegaudiodec_fixed.o +OBJS-$(CONFIG_MP3ADU_DECODER) += mpegaudiodec_fixed.o OBJS-$(CONFIG_MP3ADUFLOAT_DECODER) += mpegaudiodec_float.o OBJS-$(CONFIG_MP3FLOAT_DECODER) += mpegaudiodec_float.o -OBJS-$(CONFIG_MP3ON4_DECODER) += mpegaudiodec.o mpeg4audio.o +OBJS-$(CONFIG_MP3ON4_DECODER) += mpegaudiodec_fixed.o mpeg4audio.o OBJS-$(CONFIG_MP3ON4FLOAT_DECODER) += mpegaudiodec_float.o mpeg4audio.o OBJS-$(CONFIG_MPC7_DECODER) += mpc7.o mpc.o OBJS-$(CONFIG_MPC8_DECODER) += mpc8.o mpc.o @@ -749,7 +749,7 @@ $(SUBDIR)aacps.o: $(SUBDIR)aacps_tables.h $(SUBDIR)aactab.o: $(SUBDIR)aac_tables.h $(SUBDIR)dv.o: $(SUBDIR)dv_tables.h $(SUBDIR)sinewin.o: $(SUBDIR)sinewin_tables.h -$(SUBDIR)mpegaudiodec.o: $(SUBDIR)mpegaudio_tables.h +$(SUBDIR)mpegaudiodec_fixed.o: $(SUBDIR)mpegaudio_tables.h $(SUBDIR)mpegaudiodec_float.o: $(SUBDIR)mpegaudio_tables.h $(SUBDIR)motionpixels.o: $(SUBDIR)motionpixels_tables.h $(SUBDIR)pcm.o: $(SUBDIR)pcm_tables.h diff --git a/libavcodec/mpegaudiodec_fixed.c b/libavcodec/mpegaudiodec_fixed.c new file mode 100644 index 0000000000..6f21b0c61b --- /dev/null +++ b/libavcodec/mpegaudiodec_fixed.c @@ -0,0 +1,120 @@ +/* + * Fixed-point MPEG audio decoder + * + * 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 + */ + +#include "config.h" +#include "libavutil/samplefmt.h" + +#define CONFIG_FLOAT 0 + +#include "mpegaudio.h" + +#define SHR(a,b) ((a)>>(b)) +/* WARNING: only correct for positive numbers */ +#define FIXR_OLD(a) ((int)((a) * FRAC_ONE + 0.5)) +#define FIXR(a) ((int)((a) * FRAC_ONE + 0.5)) +#define FIXHR(a) ((int)((a) * (1LL<<32) + 0.5)) +#define MULH3(x, y, s) MULH((s)*(x), y) +#define MULLx(x, y, s) MULL(x,y,s) +#define RENAME(a) a ## _fixed +#define OUT_FMT AV_SAMPLE_FMT_S16 +#define OUT_FMT_P AV_SAMPLE_FMT_S16P + +#include "mpegaudiodec_template.c" + +#if CONFIG_MP1_DECODER +AVCodec ff_mp1_decoder = { + .name = "mp1", + .long_name = NULL_IF_CONFIG_SMALL("MP1 (MPEG audio layer 1)"), + .type = AVMEDIA_TYPE_AUDIO, + .id = AV_CODEC_ID_MP1, + .priv_data_size = sizeof(MPADecodeContext), + .init = decode_init, + .decode = decode_frame, + .capabilities = CODEC_CAP_DR1, + .flush = flush, + .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, + AV_SAMPLE_FMT_S16, + AV_SAMPLE_FMT_NONE }, +}; +#endif +#if CONFIG_MP2_DECODER +AVCodec ff_mp2_decoder = { + .name = "mp2", + .long_name = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"), + .type = AVMEDIA_TYPE_AUDIO, + .id = AV_CODEC_ID_MP2, + .priv_data_size = sizeof(MPADecodeContext), + .init = decode_init, + .decode = decode_frame, + .capabilities = CODEC_CAP_DR1, + .flush = flush, + .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, + AV_SAMPLE_FMT_S16, + AV_SAMPLE_FMT_NONE }, +}; +#endif +#if CONFIG_MP3_DECODER +AVCodec ff_mp3_decoder = { + .name = "mp3", + .long_name = NULL_IF_CONFIG_SMALL("MP3 (MPEG audio layer 3)"), + .type = AVMEDIA_TYPE_AUDIO, + .id = AV_CODEC_ID_MP3, + .priv_data_size = sizeof(MPADecodeContext), + .init = decode_init, + .decode = decode_frame, + .capabilities = CODEC_CAP_DR1, + .flush = flush, + .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, + AV_SAMPLE_FMT_S16, + AV_SAMPLE_FMT_NONE }, +}; +#endif +#if CONFIG_MP3ADU_DECODER +AVCodec ff_mp3adu_decoder = { + .name = "mp3adu", + .long_name = NULL_IF_CONFIG_SMALL("ADU (Application Data Unit) MP3 (MPEG audio layer 3)"), + .type = AVMEDIA_TYPE_AUDIO, + .id = AV_CODEC_ID_MP3ADU, + .priv_data_size = sizeof(MPADecodeContext), + .init = decode_init, + .decode = decode_frame_adu, + .capabilities = CODEC_CAP_DR1, + .flush = flush, + .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, + AV_SAMPLE_FMT_S16, + AV_SAMPLE_FMT_NONE }, +}; +#endif +#if CONFIG_MP3ON4_DECODER +AVCodec ff_mp3on4_decoder = { + .name = "mp3on4", + .long_name = NULL_IF_CONFIG_SMALL("MP3onMP4"), + .type = AVMEDIA_TYPE_AUDIO, + .id = AV_CODEC_ID_MP3ON4, + .priv_data_size = sizeof(MP3On4DecodeContext), + .init = decode_init_mp3on4, + .close = decode_close_mp3on4, + .decode = decode_frame_mp3on4, + .capabilities = CODEC_CAP_DR1, + .flush = flush_mp3on4, + .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, + AV_SAMPLE_FMT_NONE }, +}; +#endif diff --git a/libavcodec/mpegaudiodec_float.c b/libavcodec/mpegaudiodec_float.c index b5c82231df..3a76055522 100644 --- a/libavcodec/mpegaudiodec_float.c +++ b/libavcodec/mpegaudiodec_float.c @@ -19,8 +19,24 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" +#include "libavutil/samplefmt.h" + #define CONFIG_FLOAT 1 -#include "mpegaudiodec.c" + +#include "mpegaudio.h" + +#define SHR(a,b) ((a)*(1.0f/(1<<(b)))) +#define FIXR_OLD(a) ((int)((a) * FRAC_ONE + 0.5)) +#define FIXR(x) ((float)(x)) +#define FIXHR(x) ((float)(x)) +#define MULH3(x, y, s) ((s)*(y)*(x)) +#define MULLx(x, y, s) ((y)*(x)) +#define RENAME(a) a ## _float +#define OUT_FMT AV_SAMPLE_FMT_FLT +#define OUT_FMT_P AV_SAMPLE_FMT_FLTP + +#include "mpegaudiodec_template.c" #if CONFIG_MP1FLOAT_DECODER AVCodec ff_mp1float_decoder = { diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec_template.c similarity index 93% rename from libavcodec/mpegaudiodec.c rename to libavcodec/mpegaudiodec_template.c index 0c702b054f..9427dbfc55 100644 --- a/libavcodec/mpegaudiodec.c +++ b/libavcodec/mpegaudiodec_template.c @@ -88,31 +88,6 @@ typedef struct MPADecodeContext { AVFrame *frame; } MPADecodeContext; -#if CONFIG_FLOAT -# define SHR(a,b) ((a)*(1.0f/(1<<(b)))) -# define FIXR_OLD(a) ((int)((a) * FRAC_ONE + 0.5)) -# define FIXR(x) ((float)(x)) -# define FIXHR(x) ((float)(x)) -# define MULH3(x, y, s) ((s)*(y)*(x)) -# define MULLx(x, y, s) ((y)*(x)) -# define RENAME(a) a ## _float -# define OUT_FMT AV_SAMPLE_FMT_FLT -# define OUT_FMT_P AV_SAMPLE_FMT_FLTP -#else -# define SHR(a,b) ((a)>>(b)) -/* WARNING: only correct for positive numbers */ -# define FIXR_OLD(a) ((int)((a) * FRAC_ONE + 0.5)) -# define FIXR(a) ((int)((a) * FRAC_ONE + 0.5)) -# define FIXHR(a) ((int)((a) * (1LL<<32) + 0.5)) -# define MULH3(x, y, s) MULH((s)*(x), y) -# define MULLx(x, y, s) MULL(x,y,s) -# define RENAME(a) a ## _fixed -# define OUT_FMT AV_SAMPLE_FMT_S16 -# define OUT_FMT_P AV_SAMPLE_FMT_S16P -#endif - -/****************/ - #define HEADER_SIZE 4 #include "mpegaudiodata.h" @@ -1970,86 +1945,3 @@ static int decode_frame_mp3on4(AVCodecContext *avctx, void *data, return buf_size; } #endif /* CONFIG_MP3ON4_DECODER || CONFIG_MP3ON4FLOAT_DECODER */ - -#if !CONFIG_FLOAT -#if CONFIG_MP1_DECODER -AVCodec ff_mp1_decoder = { - .name = "mp1", - .long_name = NULL_IF_CONFIG_SMALL("MP1 (MPEG audio layer 1)"), - .type = AVMEDIA_TYPE_AUDIO, - .id = AV_CODEC_ID_MP1, - .priv_data_size = sizeof(MPADecodeContext), - .init = decode_init, - .decode = decode_frame, - .capabilities = CODEC_CAP_DR1, - .flush = flush, - .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, - AV_SAMPLE_FMT_S16, - AV_SAMPLE_FMT_NONE }, -}; -#endif -#if CONFIG_MP2_DECODER -AVCodec ff_mp2_decoder = { - .name = "mp2", - .long_name = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"), - .type = AVMEDIA_TYPE_AUDIO, - .id = AV_CODEC_ID_MP2, - .priv_data_size = sizeof(MPADecodeContext), - .init = decode_init, - .decode = decode_frame, - .capabilities = CODEC_CAP_DR1, - .flush = flush, - .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, - AV_SAMPLE_FMT_S16, - AV_SAMPLE_FMT_NONE }, -}; -#endif -#if CONFIG_MP3_DECODER -AVCodec ff_mp3_decoder = { - .name = "mp3", - .long_name = NULL_IF_CONFIG_SMALL("MP3 (MPEG audio layer 3)"), - .type = AVMEDIA_TYPE_AUDIO, - .id = AV_CODEC_ID_MP3, - .priv_data_size = sizeof(MPADecodeContext), - .init = decode_init, - .decode = decode_frame, - .capabilities = CODEC_CAP_DR1, - .flush = flush, - .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, - AV_SAMPLE_FMT_S16, - AV_SAMPLE_FMT_NONE }, -}; -#endif -#if CONFIG_MP3ADU_DECODER -AVCodec ff_mp3adu_decoder = { - .name = "mp3adu", - .long_name = NULL_IF_CONFIG_SMALL("ADU (Application Data Unit) MP3 (MPEG audio layer 3)"), - .type = AVMEDIA_TYPE_AUDIO, - .id = AV_CODEC_ID_MP3ADU, - .priv_data_size = sizeof(MPADecodeContext), - .init = decode_init, - .decode = decode_frame_adu, - .capabilities = CODEC_CAP_DR1, - .flush = flush, - .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, - AV_SAMPLE_FMT_S16, - AV_SAMPLE_FMT_NONE }, -}; -#endif -#if CONFIG_MP3ON4_DECODER -AVCodec ff_mp3on4_decoder = { - .name = "mp3on4", - .long_name = NULL_IF_CONFIG_SMALL("MP3onMP4"), - .type = AVMEDIA_TYPE_AUDIO, - .id = AV_CODEC_ID_MP3ON4, - .priv_data_size = sizeof(MP3On4DecodeContext), - .init = decode_init_mp3on4, - .close = decode_close_mp3on4, - .decode = decode_frame_mp3on4, - .capabilities = CODEC_CAP_DR1, - .flush = flush_mp3on4, - .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, - AV_SAMPLE_FMT_NONE }, -}; -#endif -#endif