X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fmpegaudiodec_float.c;h=3a76055522ed2eaaf11f123878781da4aa55684d;hb=ed4b757177f9b563412cdbc8ee3405d82e10fc05;hp=ac8df326beade096fb59b2fd1f784a73aa8b5064;hpb=3ffed68c2afa6179e77afb61a80bdef6f5f0526e;p=ffmpeg

diff --git a/libavcodec/mpegaudiodec_float.c b/libavcodec/mpegaudiodec_float.c
index ac8df326bea..3a76055522e 100644
--- a/libavcodec/mpegaudiodec_float.c
+++ b/libavcodec/mpegaudiodec_float.c
@@ -19,12 +19,29 @@
  * 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 = {
     .name           = "mp1float",
+    .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),
@@ -32,7 +49,6 @@ AVCodec ff_mp1float_decoder = {
     .decode         = decode_frame,
     .capabilities   = CODEC_CAP_DR1,
     .flush          = flush,
-    .long_name      = NULL_IF_CONFIG_SMALL("MP1 (MPEG audio layer 1)"),
     .sample_fmts    = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
                                                       AV_SAMPLE_FMT_FLT,
                                                       AV_SAMPLE_FMT_NONE },
@@ -41,6 +57,7 @@ AVCodec ff_mp1float_decoder = {
 #if CONFIG_MP2FLOAT_DECODER
 AVCodec ff_mp2float_decoder = {
     .name           = "mp2float",
+    .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),
@@ -48,7 +65,6 @@ AVCodec ff_mp2float_decoder = {
     .decode         = decode_frame,
     .capabilities   = CODEC_CAP_DR1,
     .flush          = flush,
-    .long_name      = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"),
     .sample_fmts    = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
                                                       AV_SAMPLE_FMT_FLT,
                                                       AV_SAMPLE_FMT_NONE },
@@ -57,6 +73,7 @@ AVCodec ff_mp2float_decoder = {
 #if CONFIG_MP3FLOAT_DECODER
 AVCodec ff_mp3float_decoder = {
     .name           = "mp3float",
+    .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),
@@ -64,7 +81,6 @@ AVCodec ff_mp3float_decoder = {
     .decode         = decode_frame,
     .capabilities   = CODEC_CAP_DR1,
     .flush          = flush,
-    .long_name      = NULL_IF_CONFIG_SMALL("MP3 (MPEG audio layer 3)"),
     .sample_fmts    = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
                                                       AV_SAMPLE_FMT_FLT,
                                                       AV_SAMPLE_FMT_NONE },
@@ -73,6 +89,7 @@ AVCodec ff_mp3float_decoder = {
 #if CONFIG_MP3ADUFLOAT_DECODER
 AVCodec ff_mp3adufloat_decoder = {
     .name           = "mp3adufloat",
+    .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),
@@ -80,7 +97,6 @@ AVCodec ff_mp3adufloat_decoder = {
     .decode         = decode_frame_adu,
     .capabilities   = CODEC_CAP_DR1,
     .flush          = flush,
-    .long_name      = NULL_IF_CONFIG_SMALL("ADU (Application Data Unit) MP3 (MPEG audio layer 3)"),
     .sample_fmts    = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
                                                       AV_SAMPLE_FMT_FLT,
                                                       AV_SAMPLE_FMT_NONE },
@@ -89,6 +105,7 @@ AVCodec ff_mp3adufloat_decoder = {
 #if CONFIG_MP3ON4FLOAT_DECODER
 AVCodec ff_mp3on4float_decoder = {
     .name           = "mp3on4float",
+    .long_name      = NULL_IF_CONFIG_SMALL("MP3onMP4"),
     .type           = AVMEDIA_TYPE_AUDIO,
     .id             = AV_CODEC_ID_MP3ON4,
     .priv_data_size = sizeof(MP3On4DecodeContext),
@@ -97,7 +114,6 @@ AVCodec ff_mp3on4float_decoder = {
     .decode         = decode_frame_mp3on4,
     .capabilities   = CODEC_CAP_DR1,
     .flush          = flush_mp3on4,
-    .long_name      = NULL_IF_CONFIG_SMALL("MP3onMP4"),
     .sample_fmts    = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
                                                       AV_SAMPLE_FMT_NONE },
 };