From: <sl...@ke...> - 2008-04-19 19:44:08
|
CVS Root: /cvs/gstreamer Module: gst-ffmpeg Changes by: slomo Date: Sat Apr 19 2008 19:44:08 UTC Log message: * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps), (gst_ffmpeg_caps_with_codecid), (gst_ffmpeg_formatid_to_caps), (gst_ffmpeg_caps_to_codecid), (gst_ffmpeg_get_codecid_longname): * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_register): Add support for Monkey's Audio (APE). Fixes bug #518033. Modified files: . : ChangeLog ext/ffmpeg : gstffmpegcodecmap.c gstffmpegdemux.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ChangeLog.diff?r1=1.454&r2=1.455 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegcodecmap.c.diff?r1=1.152&r2=1.153 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegdemux.c.diff?r1=1.87&r2=1.88 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-ffmpeg/ChangeLog,v retrieving revision 1.454 retrieving revision 1.455 diff -u -d -r1.454 -r1.455 --- ChangeLog 15 Apr 2008 09:58:02 -0000 1.454 +++ ChangeLog 19 Apr 2008 19:43:54 -0000 1.455 @@ -1,3 +1,11 @@ +2008-04-19 Sebastian Dröge <sl...@ci...> + + * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps), + (gst_ffmpeg_caps_with_codecid), (gst_ffmpeg_formatid_to_caps), + (gst_ffmpeg_caps_to_codecid), (gst_ffmpeg_get_codecid_longname): + * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_register): + Add support for Monkey's Audio (APE). Fixes bug #518033. 2008-04-15 Andy Wingo <wi...@po...> * ext/libpostproc/gstpostproc.c (gst_post_proc_transform_ip): Fix Index: gstffmpegcodecmap.c RCS file: /cvs/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegcodecmap.c,v retrieving revision 1.152 retrieving revision 1.153 diff -u -d -r1.152 -r1.153 --- gstffmpegcodecmap.c 6 Mar 2008 12:18:48 -0000 1.152 +++ gstffmpegcodecmap.c 19 Apr 2008 19:43:54 -0000 1.153 @@ -317,6 +317,16 @@ caps = gst_ff_aud_caps_new (context, codec_id, "audio/x-dts", NULL); break; + case CODEC_ID_APE: + caps = + gst_ff_aud_caps_new (context, codec_id, "audio/x-ffmpeg-parsed-ape", + NULL); + if (context) { + gst_caps_set_simple (caps, + "depth", G_TYPE_INT, context->bits_per_sample, NULL); + } + break; /* MJPEG is normal JPEG, Motion-JPEG and Quicktime MJPEG-A. MJPEGB * is Quicktime's MJPEG-B. LJPEG is lossless JPEG. I don't know what * sp5x is, but it's apparently something JPEG... We don't separate @@ -1620,6 +1630,7 @@ case CODEC_ID_MSRLE: case CODEC_ID_QTRLE: case CODEC_ID_TSCC: { gint depth; @@ -1739,6 +1750,8 @@ caps = gst_caps_new_simple ("video/x-msvideo", NULL); } else if (!strcmp (format_name, "wav")) { caps = gst_caps_new_simple ("audio/x-wav", NULL); + } else if (!strcmp (format_name, "ape")) { + caps = gst_caps_new_simple ("application/x-ape", NULL); } else if (!strcmp (format_name, "swf")) { caps = gst_caps_new_simple ("application/x-shockwave-flash", NULL); } else if (!strcmp (format_name, "au")) { @@ -2135,6 +2148,9 @@ } else if (!strcmp (mimetype, "audio/x-dts")) { id = CODEC_ID_DTS; audio = TRUE; + } else if (!strcmp (mimetype, "application/x-ape")) { + id = CODEC_ID_APE; + audio = TRUE; } else if (!strcmp (mimetype, "video/x-msmpeg")) { gint msmpegversion = 0; @@ -2506,6 +2522,9 @@ case CODEC_ID_MP3: name = "MPEG-1 layer 3 audio"; + name = "Monkey's Audio"; case CODEC_ID_VORBIS: name = "Vorbis audio"; Index: gstffmpegdemux.c RCS file: /cvs/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegdemux.c,v retrieving revision 1.87 retrieving revision 1.88 diff -u -d -r1.87 -r1.88 --- gstffmpegdemux.c 8 Feb 2008 15:12:03 -0000 1.87 +++ gstffmpegdemux.c 19 Apr 2008 19:43:54 -0000 1.88 @@ -1577,6 +1577,7 @@ !strcmp (in_plugin->name, "mmf") || !strcmp (in_plugin->name, "mm") || !strcmp (in_plugin->name, "ipmovie") || + !strcmp (in_plugin->name, "ape") || !strcmp (in_plugin->name, "RoQ") || !strcmp (in_plugin->name, "idcin") || !strcmp (in_plugin->name, "gxf") || |