CVS Root: /cvs/gstreamer
Module: gst-plugins-bad
Changes by: dolphy
Date: Mon Nov 24 2008 11:17:33 UTC
Log message:
2008-11-24 Julien Moutte <[email protected]>
* gst/flv/gstflvdemux.c: (gst_flv_demux_find_offset),
(gst_flv_demux_handle_seek_push),
(gst_flv_demux_handle_seek_pull):
Fix non key unit seeking by always going to the previous
keyframe. Mark
the discont flag when we've moved in the file.
* gst/flv/gstflvparse.c: (gst_flv_parse_audio_negotiate): MP3
streams
are parsed already, makes autoplugged pipelines shorter.
Modified files:
. : ChangeLog
gst/flv : gstflvdemux.c gstflvparse.c
Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.3735&r2=1.3736
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/flv/gstflvdemux.c.diff?r1=1.28&r2=1.29
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/flv/gstflvparse.c.diff?r1=1.28&r2=1.29
====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v
retrieving revision 1.3735
retrieving revision 1.3736
diff -u -d -r1.3735 -r1.3736
--- ChangeLog 24 Nov 2008 10:46:00 -0000 1.3735
+++ ChangeLog 24 Nov 2008 11:17:17 -0000 1.3736
@@ -1,3 +1,12 @@
+2008-11-24 Julien Moutte <[email protected]>
+
+ * gst/flv/gstflvdemux.c: (gst_flv_demux_find_offset),
+ (gst_flv_demux_handle_seek_push), (gst_flv_demux_handle_seek_pull):
+ Fix non key unit seeking by always going to the previous keyframe. Mark
+ the discont flag when we've moved in the file.
+ * gst/flv/gstflvparse.c: (gst_flv_parse_audio_negotiate): MP3 streams
+ are parsed already, makes autoplugged pipelines shorter.
2008-11-24 Sebastian Dröge <[email protected]>
Patch by: vanista <vanista at gmail dot com>
Index: gstflvdemux.c
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/flv/gstflvdemux.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- gstflvdemux.c 28 Oct 2008 18:44:44 -0000 1.28
+++ gstflvdemux.c 24 Nov 2008 11:17:19 -0000 1.29
@@ -612,9 +612,7 @@
if (demux->index) {
/* Let's check if we have an index entry for that seek time */
entry = gst_index_get_assoc_entry (demux->index, demux->index_id,
- GST_INDEX_LOOKUP_BEFORE,
- (segment->flags & GST_SEEK_FLAG_KEY_UNIT) ?
- GST_ASSOCIATION_FLAG_KEY_UNIT : GST_ASSOCIATION_FLAG_NONE,
+ GST_INDEX_LOOKUP_BEFORE, GST_ASSOCIATION_FLAG_KEY_UNIT,
GST_FORMAT_TIME, time);
if (entry) {
@@ -688,6 +686,10 @@
if (G_UNLIKELY (!ret)) {
GST_WARNING_OBJECT (demux, "upstream seek failed");
}
+ /* Tell all the stream we moved to a different position (discont) */
+ demux->audio_need_discont = TRUE;
+ demux->video_need_discont = TRUE;
} else {
ret = TRUE;
}
@@ -777,6 +779,10 @@
/* Do the actual seeking */
demux->offset = gst_flv_demux_find_offset (demux, &seeksegment);
/* If we seeked at the beginning of the file parse the header again */
if (G_UNLIKELY (!demux->offset)) {
demux->state = FLV_STATE_HEADER;
Index: gstflvparse.c
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/flv/gstflvparse.c,v
--- gstflvparse.c 28 Oct 2008 18:41:19 -0000 1.28
+++ gstflvparse.c 24 Nov 2008 11:17:19 -0000 1.29
@@ -393,7 +393,8 @@
case 2:
case 14:
caps = gst_caps_new_simple ("audio/mpeg",
- "mpegversion", G_TYPE_INT, 1, "layer", G_TYPE_INT, 3, NULL);
+ "mpegversion", G_TYPE_INT, 1, "layer", G_TYPE_INT, 3,
+ "parsed", G_TYPE_BOOLEAN, TRUE, NULL);
codec_name = "MPEG 1 Audio, Layer 3 (MP3)";
break;
case 0:
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
gstreamer-cvs-verbose mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gstreamer-cvs-verbose
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.