From: <bi...@ke...> - 2006-04-19 15:35:25
|
CVS Root: /cvs/gstreamer Module: gst-ffmpeg Changes by: bilboed Date: Wed Apr 19 2006 15:35:24 UTC Log message: reviewed by: Edward Hervey <ed...@fl...> * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps), (gst_ffmpeg_formatid_to_caps), (gst_ffmpeg_formatid_get_codecids), (gst_ffmpeg_get_codecid_longname): Added proper GstCaps <==> CodecId for Apple QDRaw. Fixed up proper wrapping for GstCaps <==> FormatId. Modified files: . : ChangeLog ext/ffmpeg : gstffmpegcodecmap.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ChangeLog.diff?r1=1.288&r2=1.289 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegcodecmap.c.diff?r1=1.115&r2=1.116 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-ffmpeg/ChangeLog,v retrieving revision 1.288 retrieving revision 1.289 diff -u -d -r1.288 -r1.289 --- ChangeLog 18 Apr 2006 11:02:04 -0000 1.288 +++ ChangeLog 19 Apr 2006 15:35:12 -0000 1.289 @@ -1,3 +1,13 @@ +2006-04-19 J^ <j...@bo...> + + reviewed by: Edward Hervey <ed...@fl...> + * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps), + (gst_ffmpeg_formatid_to_caps), (gst_ffmpeg_formatid_get_codecids), + (gst_ffmpeg_get_codecid_longname): + Added proper GstCaps <==> CodecId for Apple QDRaw. + Fixed up proper wrapping for GstCaps <==> FormatId. 2006-04-18 Wim Taymans <wi...@fl...> * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_perform_seek), @@ -128,6 +138,25 @@ 2006-03-01 Michal Benes <michal dot benes at xeris dot cz> + * ext/ffmpeg/Makefile.am: + * ext/ffmpeg/gstffmpeg.c: (plugin_init): + * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_formatid_to_caps), + (gst_ffmpeg_formatid_get_codecids): + * ext/ffmpeg/gstffmpegmux.c: (gst_ffmpegmux_base_init), + (gst_ffmpegmux_init), (gst_ffmpegmux_finalize), + (gst_ffmpegmux_request_new_pad), (gst_ffmpegmux_setcaps), + (gst_ffmpegmux_collected), (gst_ffmpegmux_change_state), + (gst_ffmpegmux_register): + Port of FFMpeg muxers to 0.10. + Still needs some loving in gstffmpegcodecmap to have them all supported + with correct input formats. + Closes #332339 + +2006-03-01 Michal Benes <michal dot benes at xeris dot cz> Reviewed by : Edward Hervey <ed...@fl...> * ext/ffmpeg/Makefile.am: Index: gstffmpegcodecmap.c RCS file: /cvs/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegcodecmap.c,v retrieving revision 1.115 retrieving revision 1.116 diff -u -d -r1.115 -r1.116 --- gstffmpegcodecmap.c 8 Apr 2006 10:51:32 -0000 1.115 +++ gstffmpegcodecmap.c 19 Apr 2006 15:35:12 -0000 1.116 @@ -533,6 +533,10 @@ caps = GST_FF_VID_CAPS_NEW ("video/x-smc", NULL); break; + case CODEC_ID_QDRAW: + caps = GST_FF_VID_CAPS_NEW ("video/x-qdrw", NULL); + break; case CODEC_ID_WS_VQA: case CODEC_ID_IDCIN: case CODEC_ID_8BPS: @@ -542,7 +546,6 @@ case CODEC_ID_SONIC: case CODEC_ID_SONIC_LS: case CODEC_ID_SNOW: - case CODEC_ID_QDRAW: case CODEC_ID_VIXL: case CODEC_ID_QPEG: case CODEC_ID_XVID: @@ -1510,6 +1513,12 @@ } else if (!strcmp (format_name, "mov_mp4_m4a_3gp_3g2")) { caps = gst_caps_from_string ( "application/x-3gp; video/quicktime; audio/x-m4a"); + } else if (!strcmp (format_name, "mov")) { + caps = gst_caps_new_simple ("video/quicktime", NULL); + } else if (!strcmp (format_name, "mp4")) { + } else if ((!strcmp (format_name, "3gp")) || (!strcmp (format_name, "3gp2"))) { + caps = gst_caps_new_simple ("application/x-3gp", NULL); } else if (!strcmp (format_name, "aac")) { caps = gst_caps_new_simple ("audio/mpeg", "mpegversion", G_TYPE_INT, 4, @@ -1538,6 +1547,9 @@ gst_ffmpeg_formatid_get_codecids (const gchar *format_name, enum CodecID ** video_codec_list, enum CodecID ** audio_codec_list) { + GST_LOG ("format_name : %s", format_name); if (!strcmp (format_name, "mp4")) { static enum CodecID mp4_video_list[] = { CODEC_ID_MPEG4, CODEC_ID_H264, CODEC_ID_NONE }; static enum CodecID mp4_audio_list[] = { CODEC_ID_AAC, CODEC_ID_NONE }; @@ -1545,11 +1557,29 @@ *video_codec_list = mp4_video_list; *audio_codec_list = mp4_audio_list; } else if (!strcmp (format_name, "mpeg")) { - static enum CodecID mpeg_video_list[] = { CODEC_ID_MPEG1VIDEO, CODEC_ID_NONE }; - static enum CodecID mpeg_audio_list[] = { CODEC_ID_MP2, CODEC_ID_NONE }; + static enum CodecID mpeg_video_list[] = { CODEC_ID_MPEG1VIDEO, + CODEC_ID_MPEG2VIDEO, + CODEC_ID_H264, + CODEC_ID_NONE }; + static enum CodecID mpeg_audio_list[] = { CODEC_ID_MP2, + CODEC_ID_MP3, *video_codec_list = mpeg_video_list; *audio_codec_list = mpeg_audio_list; + } else if (!strcmp (format_name, "mpegts")) { + static enum CodecID mpegts_video_list[] = { CODEC_ID_MPEG1VIDEO, + static enum CodecID mpegts_audio_list[] = { CODEC_ID_MP2, + CODEC_ID_AC3, + CODEC_ID_AAC, + *video_codec_list = mpegts_video_list; + *audio_codec_list = mpegts_audio_list; } else if (!strcmp (format_name, "vob")) { static enum CodecID vob_video_list[] = { CODEC_ID_MPEG2VIDEO, CODEC_ID_NONE }; static enum CodecID vob_audio_list[] = { CODEC_ID_MP2, CODEC_ID_AC3, CODEC_ID_NONE }; @@ -2278,7 +2308,7 @@ name = "Ultimotion video"; case CODEC_ID_QDRAW: - name = "Applet Quickdraw video"; + name = "Apple Quickdraw video"; name = "Miro VideoXL"; |