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

mxfdemux: remove unneeded values

Browse Source 
No need to store the GstFlowReturn when we can check if it is not OK directly
This commit is contained in:
Luis de Bethencourt 2015-02-18 19:07:42 +00:00
parent 4d43472c2b
commit 9909d1f770
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gst/mxf/mxfdemux.c
View File

@ -1898,16 +1898,14 @@ out:
static void static void
read_partition_header (GstMXFDemux * demux, guint64 offset) read_partition_header (GstMXFDemux * demux, guint64 offset)
{ {
GstFlowReturn flow;
GstBuffer *buf; GstBuffer *buf;
MXFUL key; MXFUL key;
guint read; guint read;
flow = gst_mxf_demux_pull_klv_packet (demux, offset, &key, &buf, &read); if (gst_mxf_demux_pull_klv_packet (demux, offset, &key, &buf, &read)
offset += read; != GST_FLOW_OK)
if (flow != GST_FLOW_OK)
return; return;
offset += read;
if (!mxf_is_partition_pack (&key)) { if (!mxf_is_partition_pack (&key)) {
gst_buffer_unref (buf); gst_buffer_unref (buf);
@ -1916,8 +1914,8 @@ read_partition_header (GstMXFDemux * demux, guint64 offset)
do { do {
gst_buffer_unref (buf); gst_buffer_unref (buf);
flow = gst_mxf_demux_pull_klv_packet (demux, offset, &key, &buf, &read); if (gst_mxf_demux_pull_klv_packet (demux, offset, &key, &buf, &read)
if (flow != GST_FLOW_OK) != GST_FLOW_OK)
return; return;
offset += read; offset += read;
} }
@ -2160,7 +2158,6 @@ static void
gst_mxf_demux_pull_random_index_pack (GstMXFDemux * demux) gst_mxf_demux_pull_random_index_pack (GstMXFDemux * demux)
{ {
GstBuffer *buffer; GstBuffer *buffer;
GstFlowReturn flow;
gint64 filesize = -1; gint64 filesize = -1;
GstFormat fmt = GST_FORMAT_BYTES; GstFormat fmt = GST_FORMAT_BYTES;
guint32 pack_size; guint32 pack_size;
@ -2177,9 +2174,7 @@ gst_mxf_demux_pull_random_index_pack (GstMXFDemux * demux)
g_assert (filesize > 4); g_assert (filesize > 4);
buffer = NULL; buffer = NULL;
if ((flow = if (gst_mxf_demux_pull_range (demux, filesize - 4, 4, &buffer) != GST_FLOW_OK) {
gst_mxf_demux_pull_range (demux, filesize - 4, 4,
&buffer)) != GST_FLOW_OK) {
GST_DEBUG_OBJECT (demux, "Failed pulling last 4 bytes"); GST_DEBUG_OBJECT (demux, "Failed pulling last 4 bytes");
return; return;
} }
@ -2199,9 +2194,8 @@ gst_mxf_demux_pull_random_index_pack (GstMXFDemux * demux)
} }
buffer = NULL; buffer = NULL;
if ((flow = if (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; return;
} }
@ -2217,9 +2211,8 @@ gst_mxf_demux_pull_random_index_pack (GstMXFDemux * demux)
} }
demux->offset = filesize - pack_size; demux->offset = filesize - pack_size;
if ((flow = if (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; return;
} }