From: <ms...@ke...> - 2006-06-02 11:51:10
|
CVS Root: /cvs/gstreamer Module: gst-ffmpeg Changes by: msmith Date: Fri Jun 02 2006 11:50:57 UTC Log message: * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_register): One of the ffmpeg 'plugins' changed its name with the latest update of the snapshot. Change the blacklisted typefind list to match. Modified files: . : ChangeLog ext/ffmpeg : gstffmpegdemux.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ChangeLog.diff?r1=1.302&r2=1.303 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegdemux.c.diff?r1=1.61&r2=1.62 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-ffmpeg/ChangeLog,v retrieving revision 1.302 retrieving revision 1.303 diff -u -d -r1.302 -r1.303 --- ChangeLog 26 May 2006 12:42:06 -0000 1.302 +++ ChangeLog 2 Jun 2006 11:50:45 -0000 1.303 @@ -1,3 +1,16 @@ +2006-06-02 Michael Smith <ms...@fl...> + + * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_register): + One of the ffmpeg 'plugins' changed its name with the latest update + of the snapshot. Change the blacklisted typefind list to match. + reviewed by: <delete if not using a buddy> + * ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_chain_video): 2006-05-26 Edward Hervey <ed...@fl...> * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps), Index: gstffmpegdemux.c RCS file: /cvs/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegdemux.c,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- gstffmpegdemux.c 2 May 2006 13:53:57 -0000 1.61 +++ gstffmpegdemux.c 2 Jun 2006 11:50:45 -0000 1.62 @@ -1389,7 +1389,7 @@ rank = GST_RANK_NONE; } - if (!strcmp (in_plugin->name, "mov,mp4,m4a,3gp,3g2") || + if (!strcmp (in_plugin->name, "mov,mp4,m4a,3gp,3g2,mj2") || !strcmp (in_plugin->name, "avi") || !strcmp (in_plugin->name, "asf") || !strcmp (in_plugin->name, "mpegvideo") || |
From: <ms...@ke...> - 2006-11-14 12:34:33
|
CVS Root: /cvs/gstreamer Module: gst-ffmpeg Changes by: msmith Date: Tue Nov 14 2006 12:34:32 UTC Log message: * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_formatid_get_codecids), (gst_ffmpeg_caps_to_codecid): Add mmf to _get_codecids, so we can use the mmf muxer. Use "audio/x-adpcm" rather than the dubious looking "x-adpcm" as our caps type for the adpcm variants. * ext/ffmpeg/gstffmpegmux.c: (gst_ffmpegmux_base_init): Allow muxers that allow either only audio or only video, needed for mmf (audio only). Modified files: . : ChangeLog ext/ffmpeg : gstffmpegcodecmap.c gstffmpegmux.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ChangeLog.diff?r1=1.345&r2=1.346 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegcodecmap.c.diff?r1=1.130&r2=1.131 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegmux.c.diff?r1=1.41&r2=1.42 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-ffmpeg/ChangeLog,v retrieving revision 1.345 retrieving revision 1.346 diff -u -d -r1.345 -r1.346 --- ChangeLog 26 Oct 2006 11:41:45 -0000 1.345 +++ ChangeLog 14 Nov 2006 12:34:20 -0000 1.346 @@ -1,3 +1,15 @@ +2006-11-14 Michael Smith <ms...@fl...> + + * ext/ffmpeg/gstffmpegcodecmap.c: + (gst_ffmpeg_formatid_get_codecids), (gst_ffmpeg_caps_to_codecid): + Add mmf to _get_codecids, so we can use the mmf muxer. + Use "audio/x-adpcm" rather than the dubious looking "x-adpcm" as our + caps type for the adpcm variants. + * ext/ffmpeg/gstffmpegmux.c: (gst_ffmpegmux_base_init): + Allow muxers that allow either only audio or only video, needed for + mmf (audio only). 2006-10-26 Edward Hervey <ed...@fl...> * ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_getcaps), Index: gstffmpegcodecmap.c RCS file: /cvs/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegcodecmap.c,v retrieving revision 1.130 retrieving revision 1.131 diff -u -d -r1.130 -r1.131 --- gstffmpegcodecmap.c 25 Oct 2006 17:20:25 -0000 1.130 +++ gstffmpegcodecmap.c 14 Nov 2006 12:34:20 -0000 1.131 @@ -1779,6 +1779,11 @@ *video_codec_list = mov_video_list; *audio_codec_list = mov_audio_list; + } else if (!strcmp (format_name, "mmf")) { + static enum CodecID mmf_audio_list[] = { + CODEC_ID_ADPCM_YAMAHA}; + *video_codec_list = NULL; + *audio_codec_list = mmf_audio_list; } else { GST_LOG ("Format %s not found", format_name); return FALSE; @@ -2089,7 +2094,7 @@ id = CODEC_ID_FFV1; video = TRUE; } - } else if (!strcmp (mimetype, "x-adpcm")) { + } else if (!strcmp (mimetype, "audio/x-adpcm")) { const gchar *layout; layout = gst_structure_get_string (structure, "layout"); Index: gstffmpegmux.c RCS file: /cvs/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegmux.c,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- gstffmpegmux.c 24 Oct 2006 16:40:45 -0000 1.41 +++ gstffmpegmux.c 14 Nov 2006 12:34:20 -0000 1.42 @@ -156,14 +156,19 @@ /* pad templates */ srctempl = gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS, params->srccaps); - audiosinktempl = gst_pad_template_new ("audio_%d", - GST_PAD_SINK, GST_PAD_REQUEST, params->audiosinkcaps); - videosinktempl = gst_pad_template_new ("video_%d", - GST_PAD_SINK, GST_PAD_REQUEST, params->videosinkcaps); - gst_element_class_add_pad_template (element_class, srctempl); - gst_element_class_add_pad_template (element_class, videosinktempl); - gst_element_class_add_pad_template (element_class, audiosinktempl); + if (params->audiosinkcaps) { + audiosinktempl = gst_pad_template_new ("audio_%d", + GST_PAD_SINK, GST_PAD_REQUEST, params->audiosinkcaps); + gst_element_class_add_pad_template (element_class, audiosinktempl); + } + if (params->videosinkcaps) { + videosinktempl = gst_pad_template_new ("video_%d", + GST_PAD_SINK, GST_PAD_REQUEST, params->videosinkcaps); + gst_element_class_add_pad_template (element_class, videosinktempl); klass->in_plugin = params->in_plugin; } |
From: <ms...@ke...> - 2007-04-20 10:52:01
|
CVS Root: /cvs/gstreamer Module: gst-ffmpeg Changes by: msmith Date: Fri Apr 20 2007 10:51:49 UTC Log message: * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_type_find): Allow ffmpeg typefinders to try and typefind very short (<4kB) files. Modified files: . : ChangeLog ext/ffmpeg : gstffmpegdemux.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ChangeLog.diff?r1=1.381&r2=1.382 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegdemux.c.diff?r1=1.74&r2=1.75 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-ffmpeg/ChangeLog,v retrieving revision 1.381 retrieving revision 1.382 diff -u -d -r1.381 -r1.382 --- ChangeLog 12 Apr 2007 11:06:46 -0000 1.381 +++ ChangeLog 20 Apr 2007 10:51:37 -0000 1.382 @@ -1,3 +1,9 @@ +2007-04-20 Michael Smith <ms...@fl...> + + * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_type_find): + Allow ffmpeg typefinders to try and typefind very short (<4kB) + files. 2007-04-12 Wim Taymans <wi...@fl...> Patch by: Mark Nauwelaerts <manauw at skynet dot be> and Index: gstffmpegdemux.c RCS file: /cvs/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegdemux.c,v retrieving revision 1.74 retrieving revision 1.75 diff -u -d -r1.74 -r1.75 --- gstffmpegdemux.c 16 Feb 2007 11:48:15 -0000 1.74 +++ gstffmpegdemux.c 20 Apr 2007 10:51:37 -0000 1.75 @@ -1113,14 +1113,21 @@ GstFFMpegDemuxClassParams *params = (GstFFMpegDemuxClassParams *) priv; AVInputFormat *in_plugin = params->in_plugin; gint res = 0; + guint64 length; + /* We want GST_FFMPEG_TYPE_FIND_SIZE bytes, but if the file is shorter than + * that we'll give it a try... */ + length = gst_type_find_get_length (tf); + if (length == 0 || length > GST_FFMPEG_TYPE_FIND_SIZE) + length = GST_FFMPEG_TYPE_FIND_SIZE; if (in_plugin->read_probe && - (data = gst_type_find_peek (tf, 0, GST_FFMPEG_TYPE_FIND_SIZE)) != NULL) { + (data = gst_type_find_peek (tf, 0, length)) != NULL) { AVProbeData probe_data; probe_data.filename = ""; probe_data.buf = data; - probe_data.buf_size = GST_FFMPEG_TYPE_FIND_SIZE; + probe_data.buf_size = length; res = in_plugin->read_probe (&probe_data); if (res > 0) { |
From: <ms...@ke...> - 2008-03-06 12:18:59
|
CVS Root: /cvs/gstreamer Module: gst-ffmpeg Changes by: msmith Date: Thu Mar 06 2008 12:19:04 UTC Log message: * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_pixfmt_to_caps): Fix masks for RGBA32 caps. Fixes colours when decoding using ffdec_qtrle. Follows an identical fix in the ffmpegcolorspace copy of this code (revision 1.29). Modified files: . : ChangeLog ext/ffmpeg : gstffmpegcodecmap.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ChangeLog.diff?r1=1.444&r2=1.445 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegcodecmap.c.diff?r1=1.151&r2=1.152 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-ffmpeg/ChangeLog,v retrieving revision 1.444 retrieving revision 1.445 diff -u -d -r1.444 -r1.445 --- ChangeLog 5 Mar 2008 17:02:33 -0000 1.444 +++ ChangeLog 6 Mar 2008 12:18:46 -0000 1.445 @@ -1,3 +1,10 @@ +2008-03-06 Michael Smith <ms...@fl...> + + * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_pixfmt_to_caps): + Fix masks for RGBA32 caps. Fixes colours when decoding using + ffdec_qtrle. Follows an identical fix in the ffmpegcolorspace copy of + this code (revision 1.29). 2008-03-05 Wim Taymans <wim...@co...> * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_class_init), Index: gstffmpegcodecmap.c RCS file: /cvs/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegcodecmap.c,v retrieving revision 1.151 retrieving revision 1.152 diff -u -d -r1.151 -r1.152 --- gstffmpegcodecmap.c 25 Jan 2008 11:39:59 -0000 1.151 +++ gstffmpegcodecmap.c 6 Mar 2008 12:18:48 -0000 1.152 @@ -1146,14 +1146,14 @@ depth = 32; endianness = G_BIG_ENDIAN; #if (G_BYTE_ORDER == G_BIG_ENDIAN) - r_mask = 0x000000ff; + r_mask = 0x00ff0000; g_mask = 0x0000ff00; - b_mask = 0x00ff0000; + b_mask = 0x000000ff; a_mask = 0xff000000; #else - r_mask = 0xff000000; + r_mask = 0x0000ff00; g_mask = 0x00ff0000; - b_mask = 0x0000ff00; + b_mask = 0xff000000; a_mask = 0x000000ff; #endif break; |
From: <ms...@ke...> - 2008-08-29 00:27:32
|
CVS Root: /cvs/gstreamer Module: gst-ffmpeg Changes by: msmith Date: Fri Aug 29 2008 00:27:43 UTC Log message: * ext/ffmpeg/gstffmpegdemux.c: gst_pad_template_new() takes ownership of caps; ref them beforehand since we want to keep using them afterwards. Modified files: . : ChangeLog ext/ffmpeg : gstffmpegdemux.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ChangeLog.diff?r1=1.496&r2=1.497 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegdemux.c.diff?r1=1.94&r2=1.95 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-ffmpeg/ChangeLog,v retrieving revision 1.496 retrieving revision 1.497 diff -u -d -r1.496 -r1.497 --- ChangeLog 28 Aug 2008 18:03:25 -0000 1.496 +++ ChangeLog 29 Aug 2008 00:27:28 -0000 1.497 @@ -1,3 +1,9 @@ +2008-08-28 Michael Smith <ms...@so...> + + * ext/ffmpeg/gstffmpegdemux.c: + gst_pad_template_new() takes ownership of caps; ref them beforehand + since we want to keep using them afterwards. 2008-08-28 Edward Hervey <edw...@co...> * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ff_aud_caps_new): Index: gstffmpegdemux.c RCS file: /cvs/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegdemux.c,v retrieving revision 1.94 retrieving revision 1.95 diff -u -d -r1.94 -r1.95 --- gstffmpegdemux.c 26 May 2008 10:25:59 -0000 1.94 +++ gstffmpegdemux.c 29 Aug 2008 00:27:28 -0000 1.95 @@ -188,6 +188,7 @@ g_free (details.description); /* pad templates */ + gst_caps_ref (params->sinkcaps); sinktempl = gst_pad_template_new ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, params->sinkcaps); videosrctempl = gst_pad_template_new ("video_%02d", @@ -195,6 +196,9 @@ audiosrctempl = gst_pad_template_new ("audio_%02d", GST_PAD_SRC, GST_PAD_SOMETIMES, params->audiosrccaps); + params->videosrccaps = NULL; + params->audiosrccaps = NULL; gst_element_class_add_pad_template (element_class, videosrctempl); gst_element_class_add_pad_template (element_class, audiosrctempl); gst_element_class_add_pad_template (element_class, sinktempl); |