From: <en...@ke...> - 2007-02-13 11:57:35
|
CVS Root: /cvs/gstreamer Module: gst-plugins-good Changes by: ensonic Date: Tue Feb 13 2007 11:57:30 UTC Log message: * gst/avi/gstavidemux.c: (gst_avi_demux_handle_src_query), (gst_avi_demux_parse_index), (gst_avi_demux_stream_index), (gst_avi_demux_sync), (gst_avi_demux_massage_index), (gst_avi_demux_calculate_durations_from_index), (gst_avi_demux_push_event), (gst_avi_demux_stream_header_pull), (gst_avi_demux_process_next_entry), (gst_avi_demux_stream_data), (gst_avi_demux_loop): Put debug stuff into #ifndef GST_DISABLE_DEBUG #endif Modified files: . : ChangeLog gst/avi : gstavidemux.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ChangeLog.diff?r1=1.2734&r2=1.2735 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/gst/avi/gstavidemux.c.diff?r1=1.207&r2=1.208 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-good/ChangeLog,v retrieving revision 1.2734 retrieving revision 1.2735 diff -u -d -r1.2734 -r1.2735 --- ChangeLog 13 Feb 2007 09:46:25 -0000 1.2734 +++ ChangeLog 13 Feb 2007 11:57:18 -0000 1.2735 @@ -1,5 +1,16 @@ 2007-02-13 Stefan Kost <en...@us...> + * gst/avi/gstavidemux.c: (gst_avi_demux_handle_src_query), + (gst_avi_demux_parse_index), (gst_avi_demux_stream_index), + (gst_avi_demux_sync), (gst_avi_demux_massage_index), + (gst_avi_demux_calculate_durations_from_index), + (gst_avi_demux_push_event), (gst_avi_demux_stream_header_pull), + (gst_avi_demux_process_next_entry), (gst_avi_demux_stream_data), + (gst_avi_demux_loop): + Put debug stuff into #ifndef GST_DISABLE_DEBUG #endif + +2007-02-13 Stefan Kost <en...@us...> * configure.ac: * docs/plugins/Makefile.am: Add crossreferences to glib/gobject/gstream docs. Index: gstavidemux.c RCS file: /cvs/gstreamer/gst-plugins-good/gst/avi/gstavidemux.c,v retrieving revision 1.207 retrieving revision 1.208 diff -u -d -r1.207 -r1.208 --- gstavidemux.c 12 Feb 2007 15:29:44 -0000 1.207 +++ gstavidemux.c 13 Feb 2007 11:57:18 -0000 1.208 @@ -1496,10 +1496,9 @@ GList *entries_list = NULL; guint i, num, n; - /* DEBUG */ +#ifndef GST_DISABLE_DEBUG gulong _nr_keyframes = 0; - +#endif if (!buf || !GST_BUFFER_SIZE (buf)) { *_entries_list = NULL; @@ -1565,10 +1564,10 @@ /* all audio frames are keyframes */ target->flags |= GST_AVI_INDEX_ENTRY_FLAG_KEYFRAME; } - /* DEBUG */ if (target->flags & GST_AVI_INDEX_ENTRY_FLAG_KEYFRAME) _nr_keyframes++; /* stream duration unknown, now we can calculate it */ if (stream->idx_duration == -1) @@ -2179,7 +2178,9 @@ g_list_length (list)); if (list) { + guint num_added_total = 0; GST_LOG_OBJECT (avi, "I'm now going to cut large chunks into smaller pieces"); @@ -2206,7 +2207,7 @@ && stream->strh->type == GST_RIFF_FCC_auds) { guint32 ideal_size; gst_avi_index_entry *entries; - gint old_size, num_added; + guint old_size, num_added; GList *node2; /* cut in 1/10th of a second */ @@ -2260,9 +2261,16 @@ entry2->frames_before++; } } + num_added_total += num_added; } } + if (num_added_total) + GST_LOG ("added %u new index entries", num_added_total); GST_LOG_OBJECT (avi, "I'm now going to reorder the index entries for time"); |