From 04e06cdf7d35640466d6dcf88cb5bc86a7d0ee18 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 16 Nov 2013 13:15:35 +0100 Subject: [PATCH] avcodec: split mp2 encoder into float and fixed This makes the USE_FLOATS == 0 available to the end user More float optimizations can easily be added as well now common code should be factored out into a common file once all fixed point & floating point optimizations are done, this is to avoid having to move code back and forth between files. Signed-off-by: Michael Niedermayer --- libavcodec/Makefile | 4 +- libavcodec/allcodecs.c | 1 + libavcodec/mpegaudioenc_fixed.c | 41 ++++++++++++++++++ libavcodec/mpegaudioenc_float.c | 42 +++++++++++++++++++ ...mpegaudioenc.c => mpegaudioenc_template.c} | 21 ---------- libavcodec/version.h | 2 +- tests/fate/acodec.mak | 4 ++ tests/ref/acodec/mp2fixed | 4 ++ 8 files changed, 96 insertions(+), 23 deletions(-) create mode 100644 libavcodec/mpegaudioenc_fixed.c create mode 100644 libavcodec/mpegaudioenc_float.c rename libavcodec/{mpegaudioenc.c => mpegaudioenc_template.c} (96%) create mode 100644 tests/ref/acodec/mp2fixed diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 059789afff..6c6d84835e 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -284,7 +284,9 @@ OBJS-$(CONFIG_MOVTEXT_ENCODER) += movtextenc.o ass_split.o OBJS-$(CONFIG_MP1_DECODER) += mpegaudiodec_fixed.o OBJS-$(CONFIG_MP1FLOAT_DECODER) += mpegaudiodec_float.o OBJS-$(CONFIG_MP2_DECODER) += mpegaudiodec_fixed.o -OBJS-$(CONFIG_MP2_ENCODER) += mpegaudioenc.o mpegaudio.o \ +OBJS-$(CONFIG_MP2_ENCODER) += mpegaudioenc_float.o mpegaudio.o \ + mpegaudiodata.o mpegaudiodsp_data.o +OBJS-$(CONFIG_MP2FIXED_ENCODER) += mpegaudioenc_fixed.o mpegaudio.o \ mpegaudiodata.o mpegaudiodsp_data.o OBJS-$(CONFIG_MP2FLOAT_DECODER) += mpegaudiodec_float.o OBJS-$(CONFIG_MP3_DECODER) += mpegaudiodec_fixed.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index a47a85d421..6d084acb64 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -350,6 +350,7 @@ void avcodec_register_all(void) REGISTER_DECODER(MP1FLOAT, mp1float); REGISTER_ENCDEC (MP2, mp2); REGISTER_DECODER(MP2FLOAT, mp2float); + REGISTER_ENCODER(MP2FIXED, mp2fixed); REGISTER_DECODER(MP3, mp3); REGISTER_DECODER(MP3FLOAT, mp3float); REGISTER_DECODER(MP3ADU, mp3adu); diff --git a/libavcodec/mpegaudioenc_fixed.c b/libavcodec/mpegaudioenc_fixed.c new file mode 100644 index 0000000000..022b6fedd3 --- /dev/null +++ b/libavcodec/mpegaudioenc_fixed.c @@ -0,0 +1,41 @@ +/* + * The simplest mpeg audio layer 2 encoder + * Copyright (c) 2000, 2001 Fabrice Bellard + * + * 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 + */ + +#include "mpegaudioenc_template.c" + +AVCodec ff_mp2fixed_encoder = { + .name = "mp2fixed", + .long_name = NULL_IF_CONFIG_SMALL("MP2 fixed point (MPEG audio layer 2)"), + .type = AVMEDIA_TYPE_AUDIO, + .id = AV_CODEC_ID_MP2, + .priv_data_size = sizeof(MpegAudioContext), + .init = MPA_encode_init, + .encode2 = MPA_encode_frame, + .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, + AV_SAMPLE_FMT_NONE }, + .supported_samplerates = (const int[]){ + 44100, 48000, 32000, 22050, 24000, 16000, 0 + }, + .channel_layouts = (const uint64_t[]){ AV_CH_LAYOUT_MONO, + AV_CH_LAYOUT_STEREO, + 0 }, + .defaults = mp2_defaults, +}; diff --git a/libavcodec/mpegaudioenc_float.c b/libavcodec/mpegaudioenc_float.c new file mode 100644 index 0000000000..7712307584 --- /dev/null +++ b/libavcodec/mpegaudioenc_float.c @@ -0,0 +1,42 @@ +/* + * The simplest mpeg audio layer 2 encoder + * Copyright (c) 2000, 2001 Fabrice Bellard + * + * 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 USE_FLOATS +#include "mpegaudioenc_template.c" + +AVCodec ff_mp2_encoder = { + .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(MpegAudioContext), + .init = MPA_encode_init, + .encode2 = MPA_encode_frame, + .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, + AV_SAMPLE_FMT_NONE }, + .supported_samplerates = (const int[]){ + 44100, 48000, 32000, 22050, 24000, 16000, 0 + }, + .channel_layouts = (const uint64_t[]){ AV_CH_LAYOUT_MONO, + AV_CH_LAYOUT_STEREO, + 0 }, + .defaults = mp2_defaults, +}; diff --git a/libavcodec/mpegaudioenc.c b/libavcodec/mpegaudioenc_template.c similarity index 96% rename from libavcodec/mpegaudioenc.c rename to libavcodec/mpegaudioenc_template.c index 133c9dcc1d..a567dcdbb4 100644 --- a/libavcodec/mpegaudioenc.c +++ b/libavcodec/mpegaudioenc_template.c @@ -33,9 +33,6 @@ #define FRAC_BITS 15 /* fractional bits for sb_samples and dct */ #define WFRAC_BITS 14 /* fractional bits for window */ -/* define it to use floats in quantization (I don't like floats !) */ -#define USE_FLOATS - #include "mpegaudio.h" #include "mpegaudiodsp.h" #include "mpegaudiodata.h" @@ -780,21 +777,3 @@ static const AVCodecDefault mp2_defaults[] = { { NULL }, }; -AVCodec ff_mp2_encoder = { - .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(MpegAudioContext), - .init = MPA_encode_init, - .encode2 = MPA_encode_frame, - .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, - AV_SAMPLE_FMT_NONE }, - .supported_samplerates = (const int[]){ - 44100, 48000, 32000, 22050, 24000, 16000, 0 - }, - .channel_layouts = (const uint64_t[]){ AV_CH_LAYOUT_MONO, - AV_CH_LAYOUT_STEREO, - 0 }, - .defaults = mp2_defaults, -}; diff --git a/libavcodec/version.h b/libavcodec/version.h index 8f61301816..eab162284c 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "libavutil/avutil.h" #define LIBAVCODEC_VERSION_MAJOR 55 -#define LIBAVCODEC_VERSION_MINOR 44 +#define LIBAVCODEC_VERSION_MINOR 45 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ diff --git a/tests/fate/acodec.mak b/tests/fate/acodec.mak index 78508bcd4b..10d4392599 100644 --- a/tests/fate/acodec.mak +++ b/tests/fate/acodec.mak @@ -68,6 +68,10 @@ FATE_ACODEC-$(call ENCDEC, MP2, MP2 MP3) += fate-acodec-mp2 fate-acodec-mp2: FMT = mp2 fate-acodec-mp2: CMP_SHIFT = -1924 +FATE_ACODEC-$(call ENCDEC, MP2FIXED MP2 , MP2 MP3) += fate-acodec-mp2fixed +fate-acodec-mp2fixed: FMT = mp2 +fate-acodec-mp2fixed: CMP_SHIFT = -1924 + FATE_ACODEC-$(call ENCDEC, ALAC, MOV) += fate-acodec-alac fate-acodec-alac: FMT = mov fate-acodec-alac: CODEC = alac -compression_level 1 diff --git a/tests/ref/acodec/mp2fixed b/tests/ref/acodec/mp2fixed new file mode 100644 index 0000000000..0203014e67 --- /dev/null +++ b/tests/ref/acodec/mp2fixed @@ -0,0 +1,4 @@ +28fbc7485c7939f40368f79adccb3e3d *tests/data/fate/acodec-mp2fixed.mp2 +96130 tests/data/fate/acodec-mp2fixed.mp2 +87461bd4ce4b0e0cbbf6c43621baf261 *tests/data/fate/acodec-mp2fixed.out.wav +stddev: 4384.26 PSNR: 23.49 MAXDIFF:52632 bytes: 1058400/ 1057916