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

gstjpeg2000parse: no need for else after a goto

Browse Source 
else clause is redundant when the end of the if statement is a jump.
If we haven't gone to the beach, we are in the false branch.
This commit is contained in:
Luis de Bethencourt 2016-07-01 14:05:49 +01:00
parent 154698389d
commit 418e643b61
1 changed files with 36 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
gst/videoparsers/gstjpeg2000parse.c
View File

@ -235,49 +235,46 @@ gst_jpeg2000_parse_handle_frame (GstBaseParse * parse,
if (magic_offset == -1) { if (magic_offset == -1) {
*skipsize = gst_byte_reader_get_size (&reader) - num_prefix_bytes; *skipsize = gst_byte_reader_get_size (&reader) - num_prefix_bytes;
goto beach; goto beach;
} else { }
/* see if we need to skip any bytes at beginning of frame */ /* see if we need to skip any bytes at beginning of frame */
GST_DEBUG_OBJECT (jpeg2000parse, "Found magic at offset = %d", GST_DEBUG_OBJECT (jpeg2000parse, "Found magic at offset = %d", magic_offset);
magic_offset); if (magic_offset > 0) {
if (magic_offset > 0) { *skipsize = magic_offset;
*skipsize = magic_offset; /* J2C has 8 bytes preceding J2K magic */
/* J2C has 8 bytes preceding J2K magic */ if (is_j2c)
if (is_j2c) *skipsize -= GST_JPEG2000_PARSE_SIZE_OF_J2C_PREFIX_BYTES;
*skipsize -= GST_JPEG2000_PARSE_SIZE_OF_J2C_PREFIX_BYTES; if (*skipsize > 0)
if (*skipsize > 0) goto beach;
goto beach; }
if (is_j2c) {
/* sanity check on box id offset */
if (j2c_box_id_offset + GST_JPEG2000_JP2_SIZE_OF_BOX_ID != magic_offset) {
GST_ELEMENT_ERROR (jpeg2000parse, STREAM, DECODE, NULL,
("Corrupt contiguous code stream box for j2c stream"));
ret = GST_FLOW_ERROR;
goto beach;
} }
if (is_j2c) { /* check that we have enough bytes for the J2C box length */
if (j2c_box_id_offset < GST_JPEG2000_JP2_SIZE_OF_BOX_LEN) {
/* sanity check on box id offset */ *skipsize = gst_byte_reader_get_size (&reader) - num_prefix_bytes;
if (j2c_box_id_offset + GST_JPEG2000_JP2_SIZE_OF_BOX_ID != magic_offset) { goto beach;
GST_ELEMENT_ERROR (jpeg2000parse, STREAM, DECODE, NULL,
("Corrupt contiguous code stream box for j2c stream"));
ret = GST_FLOW_ERROR;
goto beach;
}
/* check that we have enough bytes for the J2C box length */
if (j2c_box_id_offset < GST_JPEG2000_JP2_SIZE_OF_BOX_LEN) {
*skipsize = gst_byte_reader_get_size (&reader) - num_prefix_bytes;
goto beach;
}
if (!gst_byte_reader_skip (&reader,
j2c_box_id_offset - GST_JPEG2000_JP2_SIZE_OF_BOX_LEN))
goto beach;
/* read the box length, and adjust num_prefix_bytes accordingly */
if (!gst_byte_reader_get_uint32_be (&reader, &frame_size))
goto beach;
num_prefix_bytes -= GST_JPEG2000_JP2_SIZE_OF_BOX_LEN;
/* bail out if not enough data for frame */
if ((gst_byte_reader_get_size (&reader) < frame_size))
goto beach;
} }
if (!gst_byte_reader_skip (&reader,
j2c_box_id_offset - GST_JPEG2000_JP2_SIZE_OF_BOX_LEN))
goto beach;
/* read the box length, and adjust num_prefix_bytes accordingly */
if (!gst_byte_reader_get_uint32_be (&reader, &frame_size))
goto beach;
num_prefix_bytes -= GST_JPEG2000_JP2_SIZE_OF_BOX_LEN;
/* bail out if not enough data for frame */
if ((gst_byte_reader_get_size (&reader) < frame_size))
goto beach;
} }
/* 2 to skip marker size, and another 2 to skip rsiz field */ /* 2 to skip marker size, and another 2 to skip rsiz field */