CVS Root: /cvs/gstreamer
Module: gst-plugins-bad
Changes by: slomo
Date: Sun Nov 30 2008 16:21:56 UTC
Log message:
* gst/mxf/mxfdemux.c: (gst_mxf_demux_pull_random_index_pack):
Make sure that demux->offset has the correct value before
calling any gst_mxf_demux_handle_* functions.
Modified files:
. : ChangeLog
gst/mxf : mxfdemux.c
Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.3767&r2=1.3768
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/mxf/mxfdemux.c.diff?r1=1.16&r2=1.17
====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v
retrieving revision 1.3767
retrieving revision 1.3768
diff -u -d -r1.3767 -r1.3768
--- ChangeLog 30 Nov 2008 14:12:02 -0000 1.3767
+++ ChangeLog 30 Nov 2008 16:21:40 -0000 1.3768
@@ -1,5 +1,11 @@
2008-11-30 Sebastian Dröge <[email protected]>
+ * gst/mxf/mxfdemux.c: (gst_mxf_demux_pull_random_index_pack):
+ Make sure that demux->offset has the correct value before
+ calling any gst_mxf_demux_handle_* functions.
+
+2008-11-30 Sebastian Dröge <[email protected]>
* gst/mxf/mxfjpeg2000.c: (mxf_jpeg2000_create_caps):
* gst/mxf/mxfmpeg.c: (mxf_mpeg_video_create_caps):
Set the correct MPEG video version if possible and add support
Index: mxfdemux.c
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/mxf/mxfdemux.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- mxfdemux.c 29 Nov 2008 20:25:05 -0000 1.16
+++ mxfdemux.c 30 Nov 2008 16:21:42 -0000 1.17
@@ -1293,9 +1293,8 @@
MXFMetadataEssenceContainerData, i);
for (j = 0; j < demux->content_storage.n_essence_container_data; j++) {
- if (mxf_ul_is_equal (&demux->
- content_storage.essence_container_data_uids[j],
- &data->instance_uid)) {
+ if (mxf_ul_is_equal (&demux->content_storage.
+ essence_container_data_uids[j], &data->instance_uid)) {
demux->content_storage.essence_container_data[j] = data;
break;
}
@@ -2301,6 +2300,7 @@
gint64 filesize = -1;
GstFormat fmt = GST_FORMAT_BYTES;
guint32 pack_size;
+ guint64 old_offset = demux->offset;
MXFUL key;
if (!gst_pad_query_peer_duration (demux->sinkpad, &fmt, &filesize) ||
@@ -2323,10 +2323,10 @@
gst_buffer_unref (buffer);
if (pack_size < 20) {
- GST_DEBUG_OBJECT (demux, "Too small pack size");
+ GST_DEBUG_OBJECT (demux, "Too small pack size (%u bytes)", pack_size);
goto out;
} else if (pack_size > filesize - 20) {
- GST_DEBUG_OBJECT (demux, "Too large pack size");
+ GST_DEBUG_OBJECT (demux, "Too large pack size (%u bytes)", pack_size);
}
@@ -2345,6 +2345,7 @@
+ demux->offset = filesize - pack_size;
if ((ret =
gst_mxf_demux_pull_klv_packet (demux, filesize - pack_size, &key,
&buffer, NULL)) != GST_FLOW_OK) {
@@ -2352,9 +2353,9 @@
-
gst_mxf_demux_handle_random_index_pack (demux, &key, buffer);
+ demux->offset = old_offset;
out:
if (!demux->partition_index)
-------------------------------------------------------------------------
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.