FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Remove some checks that will always be TRUE

Browse Source
This commit is contained in:
Sebastian Dröge 2009-02-03 17:47:10 +01:00
parent 837a4012b0
commit c4a0bc9887
1 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
gst/mxf/mxfdemux.c
View File

@ -132,12 +132,9 @@ gst_mxf_demux_remove_pad (GstMXFDemuxPad * pad, GstMXFDemux * demux)
static void static void
gst_mxf_demux_remove_pads (GstMXFDemux * demux) gst_mxf_demux_remove_pads (GstMXFDemux * demux)
{ {
if (demux->src) { g_ptr_array_foreach (demux->src, (GFunc) gst_mxf_demux_remove_pad, demux);
g_ptr_array_foreach (demux->src, (GFunc) gst_mxf_demux_remove_pad, demux); g_ptr_array_foreach (demux->src, (GFunc) gst_object_unref, NULL);
g_ptr_array_foreach (demux->src, (GFunc) gst_object_unref, NULL); g_ptr_array_set_size (demux->src, 0);
g_ptr_array_free (demux->src, TRUE);
demux->src = NULL;
}
} }
static void static void
@ -189,14 +186,12 @@ gst_mxf_demux_reset_linked_metadata (GstMXFDemux * demux)
{ {
guint i; guint i;
if (demux->src) { for (i = 0; i < demux->src->len; i++) {
for (i = 0; i < demux->src->len; i++) { GstMXFDemuxPad *pad = g_ptr_array_index (demux->src, i);
GstMXFDemuxPad *pad = g_ptr_array_index (demux->src, i);
pad->material_track = NULL; pad->material_track = NULL;
pad->material_package = NULL; pad->material_package = NULL;
pad->current_component = NULL; pad->current_component = NULL;
}
} }
if (demux->essence_tracks) { if (demux->essence_tracks) {
@ -350,7 +345,7 @@ gst_mxf_demux_push_src_event (GstMXFDemux * demux, GstEvent * event)
GST_DEBUG_OBJECT (demux, "Pushing '%s' event downstream", GST_DEBUG_OBJECT (demux, "Pushing '%s' event downstream",
GST_EVENT_TYPE_NAME (event)); GST_EVENT_TYPE_NAME (event));
if (!demux->src) if (demux->src->len == 0)
return ret; return ret;
for (i = 0; i < demux->src->len; i++) { for (i = 0; i < demux->src->len; i++) {
@ -374,9 +369,6 @@ gst_mxf_demux_get_earliest_pad (GstMXFDemux * demux)
GstClockTime earliest = GST_CLOCK_TIME_NONE; GstClockTime earliest = GST_CLOCK_TIME_NONE;
GstMXFDemuxPad *pad = NULL; GstMXFDemuxPad *pad = NULL;
if (!demux->src)
return NULL;
for (i = 0; i < demux->src->len; i++) { for (i = 0; i < demux->src->len; i++) {
GstMXFDemuxPad *p = g_ptr_array_index (demux->src, i); GstMXFDemuxPad *p = g_ptr_array_index (demux->src, i);
@ -859,7 +851,7 @@ gst_mxf_demux_update_tracks (GstMXFDemux * demux)
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }
first_run = (demux->src == NULL); first_run = (demux->src->len == 0);
for (i = 0; i < current_package->n_tracks; i++) { for (i = 0; i < current_package->n_tracks; i++) {
MXFMetadataTimelineTrack *track = NULL; MXFMetadataTimelineTrack *track = NULL;
@ -884,7 +876,7 @@ gst_mxf_demux_update_tracks (GstMXFDemux * demux)
track = MXF_METADATA_TIMELINE_TRACK (current_package->tracks[i]); track = MXF_METADATA_TIMELINE_TRACK (current_package->tracks[i]);
if (demux->src && demux->src->len > 0) { if (demux->src->len > 0) {
/* Find pad from track_id */ /* Find pad from track_id */
for (j = 0; j < demux->src->len; j++) { for (j = 0; j < demux->src->len; j++) {
GstMXFDemuxPad *tmp = g_ptr_array_index (demux->src, j); GstMXFDemuxPad *tmp = g_ptr_array_index (demux->src, j);
@ -1095,8 +1087,6 @@ gst_mxf_demux_update_tracks (GstMXFDemux * demux)
gst_element_add_pad (GST_ELEMENT_CAST (demux), gst_object_ref (pad)); gst_element_add_pad (GST_ELEMENT_CAST (demux), gst_object_ref (pad));
if (!demux->src)
demux->src = g_ptr_array_new ();
g_ptr_array_add (demux->src, pad); g_ptr_array_add (demux->src, pad);
pad->discont = TRUE; pad->discont = TRUE;
} }
@ -1105,7 +1095,7 @@ gst_mxf_demux_update_tracks (GstMXFDemux * demux)
if (first_run) if (first_run)
gst_element_no_more_pads (GST_ELEMENT_CAST (demux)); gst_element_no_more_pads (GST_ELEMENT_CAST (demux));
if (demux->src) { if (demux->src->len > 0) {
for (i = 0; i < demux->src->len; i++) { for (i = 0; i < demux->src->len; i++) {
GstMXFDemuxPad *pad = g_ptr_array_index (demux->src, i); GstMXFDemuxPad *pad = g_ptr_array_index (demux->src, i);
@ -1463,7 +1453,7 @@ gst_mxf_demux_handle_generic_container_essence_element (GstMXFDemux * demux,
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }
if (!demux->src || demux->src->len == 0) { if (demux->src->len == 0) {
GST_ERROR_OBJECT (demux, "No streams created yet"); GST_ERROR_OBJECT (demux, "No streams created yet");
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }
@ -2421,7 +2411,7 @@ gst_mxf_demux_pull_and_handle_klv_packet (GstMXFDemux * demux)
GstFlowReturn ret = GST_FLOW_OK; GstFlowReturn ret = GST_FLOW_OK;
guint read = 0; guint read = 0;
if (demux->src) { if (demux->src->len > 0) {
if (!gst_mxf_demux_get_earliest_pad (demux)) { if (!gst_mxf_demux_get_earliest_pad (demux)) {
ret = GST_FLOW_UNEXPECTED; ret = GST_FLOW_UNEXPECTED;
GST_DEBUG_OBJECT (demux, "All tracks are EOS"); GST_DEBUG_OBJECT (demux, "All tracks are EOS");
@ -2670,7 +2660,7 @@ gst_mxf_demux_chain (GstPad * pad, GstBuffer * inbuf)
GST_LOG_OBJECT (demux, "received buffer of %u bytes at offset %" GST_LOG_OBJECT (demux, "received buffer of %u bytes at offset %"
G_GUINT64_FORMAT, GST_BUFFER_SIZE (inbuf), GST_BUFFER_OFFSET (inbuf)); G_GUINT64_FORMAT, GST_BUFFER_SIZE (inbuf), GST_BUFFER_OFFSET (inbuf));
if (demux->src) { if (demux->src->len > 0) {
if (!gst_mxf_demux_get_earliest_pad (demux)) { if (!gst_mxf_demux_get_earliest_pad (demux)) {
ret = GST_FLOW_UNEXPECTED; ret = GST_FLOW_UNEXPECTED;
GST_DEBUG_OBJECT (demux, "All tracks are EOS"); GST_DEBUG_OBJECT (demux, "All tracks are EOS");
@ -3454,7 +3444,7 @@ gst_mxf_demux_query (GstElement * element, GstQuery * query)
if (format != GST_FORMAT_TIME) if (format != GST_FORMAT_TIME)
goto error; goto error;
if (!demux->src) if (demux->src->len == 0)
goto done; goto done;
for (i = 0; i < demux->src->len; i++) { for (i = 0; i < demux->src->len; i++) {
@ -3589,6 +3579,9 @@ gst_mxf_demux_finalize (GObject * object)
g_free (demux->requested_package_string); g_free (demux->requested_package_string);
demux->requested_package_string = NULL; demux->requested_package_string = NULL;
g_ptr_array_free (demux->src, TRUE);
demux->src = NULL;
G_OBJECT_CLASS (parent_class)->finalize (object); G_OBJECT_CLASS (parent_class)->finalize (object);
} }