mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-02 14:36:41 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/mxf/mxfdemux.c: Only try to pull the random index pack at the end of file one time and not for every single packe...

Browse source 
Original commit message from CVS:
* gst/mxf/mxfdemux.c: (gst_mxf_demux_pull_random_index_pack):
Only try to pull the random index pack at the end of file one time
and not for every single packet if it fails.
This commit is contained in:
Sebastian Dröge 2008-11-28 18:55:01 +00:00
parent e268611ed8
commit 358b472aab
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2008-11-28 Sebastian Dröge <sebastian.droege@collabora.co.uk>
* gst/mxf/mxfdemux.c: (gst_mxf_demux_pull_random_index_pack):
Only try to pull the random index pack at the end of file one time
and not for every single packet if it fails.
2008-11-28 Sebastian Dröge <sebastian.droege@collabora.co.uk> 2008-11-28 Sebastian Dröge <sebastian.droege@collabora.co.uk>
* gst/mxf/Makefile.am: * gst/mxf/Makefile.am:

20
gst/mxf/mxfdemux.c
View file

@ -1292,9 +1292,8 @@ gst_mxf_demux_handle_header_metadata_resolve_references (GstMXFDemux * demux)
MXFMetadataEssenceContainerData, i); MXFMetadataEssenceContainerData, i);
for (j = 0; j < demux->content_storage.n_essence_container_data; j++) { for (j = 0; j < demux->content_storage.n_essence_container_data; j++) {
if (mxf_ul_is_equal (&demux-> if (mxf_ul_is_equal (&demux->content_storage.
content_storage.essence_container_data_uids[j], essence_container_data_uids[j], &data->instance_uid)) {
&data->instance_uid)) {
demux->content_storage.essence_container_data[j] = data; demux->content_storage.essence_container_data[j] = data;
break; break;
} }
@ -2301,7 +2300,7 @@ gst_mxf_demux_pull_random_index_pack (GstMXFDemux * demux)
if (!gst_pad_query_peer_duration (demux->sinkpad, &fmt, &filesize) || if (!gst_pad_query_peer_duration (demux->sinkpad, &fmt, &filesize) ||
fmt != GST_FORMAT_BYTES || filesize == -1) { fmt != GST_FORMAT_BYTES || filesize == -1) {
GST_DEBUG_OBJECT (demux, "Can't query upstream size"); GST_DEBUG_OBJECT (demux, "Can't query upstream size");
return; goto out;
} }
g_assert (filesize > 4); g_assert (filesize > 4);
@ -2310,7 +2309,7 @@ gst_mxf_demux_pull_random_index_pack (GstMXFDemux * demux)
gst_mxf_demux_pull_range (demux, filesize - 4, 4, gst_mxf_demux_pull_range (demux, filesize - 4, 4,
&buffer)) != GST_FLOW_OK) { &buffer)) != GST_FLOW_OK) {
GST_DEBUG_OBJECT (demux, "Failed pulling last 4 bytes"); GST_DEBUG_OBJECT (demux, "Failed pulling last 4 bytes");
return; goto out;
} }
pack_size = GST_READ_UINT32_BE (GST_BUFFER_DATA (buffer)); pack_size = GST_READ_UINT32_BE (GST_BUFFER_DATA (buffer));
@ -2319,17 +2318,17 @@ gst_mxf_demux_pull_random_index_pack (GstMXFDemux * demux)
if (pack_size < 20) { if (pack_size < 20) {
GST_DEBUG_OBJECT (demux, "Too small pack size"); GST_DEBUG_OBJECT (demux, "Too small pack size");
return; goto out;
} else if (pack_size > filesize - 20) { } else if (pack_size > filesize - 20) {
GST_DEBUG_OBJECT (demux, "Too large pack size"); GST_DEBUG_OBJECT (demux, "Too large pack size");
return; goto out;
} }
if ((ret = if ((ret =
gst_mxf_demux_pull_range (demux, filesize - pack_size, 16, gst_mxf_demux_pull_range (demux, filesize - pack_size, 16,
&buffer)) != GST_FLOW_OK) { &buffer)) != GST_FLOW_OK) {
GST_DEBUG_OBJECT (demux, "Failed pulling random index pack key"); GST_DEBUG_OBJECT (demux, "Failed pulling random index pack key");
return; goto out;
} }
memcpy (&key, GST_BUFFER_DATA (buffer), 16); memcpy (&key, GST_BUFFER_DATA (buffer), 16);
@ -2337,20 +2336,21 @@ gst_mxf_demux_pull_random_index_pack (GstMXFDemux * demux)
if (!mxf_is_random_index_pack (&key)) { if (!mxf_is_random_index_pack (&key)) {
GST_DEBUG_OBJECT (demux, "No random index pack"); GST_DEBUG_OBJECT (demux, "No random index pack");
return; goto out;
} }
if ((ret = if ((ret =
gst_mxf_demux_pull_klv_packet (demux, filesize - pack_size, &key, gst_mxf_demux_pull_klv_packet (demux, filesize - pack_size, &key,
&buffer, NULL)) != GST_FLOW_OK) { &buffer, NULL)) != GST_FLOW_OK) {
GST_DEBUG_OBJECT (demux, "Failed pulling random index pack"); GST_DEBUG_OBJECT (demux, "Failed pulling random index pack");
return; goto out;
} }
gst_mxf_demux_handle_random_index_pack (demux, &key, buffer); gst_mxf_demux_handle_random_index_pack (demux, &key, buffer);
gst_buffer_unref (buffer); gst_buffer_unref (buffer);
out:
if (!demux->partition_index) if (!demux->partition_index)
demux->partition_index = demux->partition_index =
g_array_new (FALSE, FALSE, sizeof (MXFRandomIndexPackEntry)); g_array_new (FALSE, FALSE, sizeof (MXFRandomIndexPackEntry));