[FFmpeg-cvslog] r16581 - in trunk/libavcodec: Makefile allcodecs.c mpegaudio_parser.c mpegaudiodec.c

[michael]

Author: michael
Date: Tue Jan 13 20:32:08 2009
New Revision: 16581

Log:
Add dummy mp1_decoder to complement the existing dummy mp2/mp3 decoders.

Modified:
   trunk/libavcodec/Makefile
   trunk/libavcodec/allcodecs.c
   trunk/libavcodec/mpegaudio_parser.c
   trunk/libavcodec/mpegaudiodec.c

Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile	Tue Jan 13 20:13:08 2009	(r16580)
+++ trunk/libavcodec/Makefile	Tue Jan 13 20:32:08 2009	(r16581)
@@ -124,6 +124,7 @@ OBJS-$(CONFIG_MJPEGB_DECODER)          +
 OBJS-$(CONFIG_MLP_DECODER)             += mlpdec.o mlp_parser.o mlp.o
 OBJS-$(CONFIG_MMVIDEO_DECODER)         += mmvideo.o
 OBJS-$(CONFIG_MOTIONPIXELS_DECODER)    += motionpixels.o
+OBJS-$(CONFIG_MP1_DECODER)             += mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o
 OBJS-$(CONFIG_MP2_DECODER)             += mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o
 OBJS-$(CONFIG_MP2_ENCODER)             += mpegaudioenc.o mpegaudio.o mpegaudiodata.o
 OBJS-$(CONFIG_MP3_DECODER)             += mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o

Modified: trunk/libavcodec/allcodecs.c
==============================================================================
--- trunk/libavcodec/allcodecs.c	Tue Jan 13 20:13:08 2009	(r16580)
+++ trunk/libavcodec/allcodecs.c	Tue Jan 13 20:32:08 2009	(r16581)
@@ -189,6 +189,7 @@ void avcodec_register_all(void)
     REGISTER_DECODER (MACE3, mace3);
     REGISTER_DECODER (MACE6, mace6);
     REGISTER_DECODER (MLP, mlp);
+    REGISTER_DECODER (MP1, mp1);
     REGISTER_ENCDEC  (MP2, mp2);
     REGISTER_DECODER (MP3, mp3);
     REGISTER_DECODER (MP3ADU, mp3adu);

Modified: trunk/libavcodec/mpegaudio_parser.c
==============================================================================
--- trunk/libavcodec/mpegaudio_parser.c	Tue Jan 13 20:13:08 2009	(r16580)
+++ trunk/libavcodec/mpegaudio_parser.c	Tue Jan 13 20:32:08 2009	(r16581)
@@ -248,7 +248,7 @@ static int mpegaudio_parse(AVCodecParser
 
 
 AVCodecParser mpegaudio_parser = {
-    { CODEC_ID_MP2, CODEC_ID_MP3 },
+    { CODEC_ID_MP1, CODEC_ID_MP2, CODEC_ID_MP3 },
     sizeof(MpegAudioParseContext),
     mpegaudio_parse_init,
     mpegaudio_parse,

Modified: trunk/libavcodec/mpegaudiodec.c
==============================================================================
--- trunk/libavcodec/mpegaudiodec.c	Tue Jan 13 20:13:08 2009	(r16580)
+++ trunk/libavcodec/mpegaudiodec.c	Tue Jan 13 20:32:08 2009	(r16581)
@@ -2534,6 +2534,22 @@ static int decode_frame_mp3on4(AVCodecCo
 }
 #endif /* CONFIG_MP3ON4_DECODER */
 
+#ifdef CONFIG_MP1_DECODER
+AVCodec mp1_decoder =
+{
+    "mp1",
+    CODEC_TYPE_AUDIO,
+    CODEC_ID_MP1,
+    sizeof(MPADecodeContext),
+    decode_init,
+    NULL,
+    NULL,
+    decode_frame,
+    CODEC_CAP_PARSE_ONLY,
+    .flush= flush,
+    .long_name= NULL_IF_CONFIG_SMALL("MP1 (MPEG audio layer 1)"),
+};
+#endif
 #ifdef CONFIG_MP2_DECODER
 AVCodec mp2_decoder =
 {