mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 02:31:03 +00:00
Code Issues 1 Projects Releases Wiki Activity

asfdemux: Ignore parsing errors from broken packets

Browse source 
We should instead be counting the number of errors and exiting if
they're too numerous. This makes a number of broken ASF files playable.

https://bugzilla.gnome.org/show_bug.cgi?id=678543

Conflicts:

	gst/asfdemux/asfpacket.c
	gst/asfdemux/gstasfdemux.c
This commit is contained in:
Bastien Nocera 2012-06-21 15:13:57 +01:00 committed by Wim Taymans
parent 8fd4a75f47
commit 53cfef3e0f
3 changed files with 70 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
gst/asfdemux/asfpacket.c
View file

@ -493,14 +493,14 @@ gst_asf_demux_parse_payload (GstASFDemux * demux, AsfPacket * packet,
return TRUE; return TRUE;
} }
gboolean GstAsfDemuxParsePacketError
gst_asf_demux_parse_packet (GstASFDemux * demux, GstBuffer * buf) gst_asf_demux_parse_packet (GstASFDemux * demux, GstBuffer * buf)
{ {
AsfPacket packet = { 0, }; AsfPacket packet = { 0, };
GstMapInfo map; GstMapInfo map;
const guint8 *data; const guint8 *data;
gboolean has_multiple_payloads; gboolean has_multiple_payloads;
gboolean ret = TRUE; GstAsfDemuxParsePacketError ret = GST_ASF_DEMUX_PARSE_PACKET_ERROR_NONE;
guint8 ec_flags, flags1; guint8 ec_flags, flags1;
guint size; guint size;
@ -510,8 +510,10 @@ gst_asf_demux_parse_packet (GstASFDemux * demux, GstBuffer * buf)
GST_LOG_OBJECT (demux, "Buffer size: %u", size); GST_LOG_OBJECT (demux, "Buffer size: %u", size);
/* need at least two payload flag bytes, send time, and duration */ /* need at least two payload flag bytes, send time, and duration */
if (G_UNLIKELY (size < 2 + 4 + 2)) if (G_UNLIKELY (size < 2 + 4 + 2)) {
goto short_packet; GST_WARNING_OBJECT (demux, "Packet size is < 8");
return GST_ASF_DEMUX_PARSE_PACKET_ERROR_RECOVERABLE;
}
packet.buf = buf; packet.buf = buf;
/* evidently transient */ /* evidently transient */
@ -534,8 +536,10 @@ gst_asf_demux_parse_packet (GstASFDemux * demux, GstBuffer * buf)
GST_LOG_OBJECT (demux, "packet has error correction (%u bytes)", ec_len); GST_LOG_OBJECT (demux, "packet has error correction (%u bytes)", ec_len);
/* still need at least two payload flag bytes, send time, and duration */ /* still need at least two payload flag bytes, send time, and duration */
if (size <= (1 + ec_len) + 2 + 4 + 2) if (size <= (1 + ec_len) + 2 + 4 + 2) {
goto short_packet; GST_WARNING_OBJECT (demux, "Packet size is < 8 with Error Correction");
return GST_ASF_DEMUX_PARSE_PACKET_ERROR_FATAL;
}
data += 1 + ec_len; data += 1 + ec_len;
size -= 1 + ec_len; size -= 1 + ec_len;
@ -556,8 +560,10 @@ gst_asf_demux_parse_packet (GstASFDemux * demux, GstBuffer * buf)
packet.padding = asf_packet_read_varlen_int (flags1, 3, &data, &size); packet.padding = asf_packet_read_varlen_int (flags1, 3, &data, &size);
if (G_UNLIKELY (size < 6)) if (G_UNLIKELY (size < 6)) {
goto short_packet; GST_WARNING_OBJECT (demux, "Packet size is < 6");
return GST_ASF_DEMUX_PARSE_PACKET_ERROR_FATAL;
}
packet.send_time = GST_READ_UINT32_LE (data) * GST_MSECOND; packet.send_time = GST_READ_UINT32_LE (data) * GST_MSECOND;
packet.duration = GST_READ_UINT16_LE (data + 4) * GST_MSECOND; packet.duration = GST_READ_UINT16_LE (data + 4) * GST_MSECOND;
@ -575,8 +581,10 @@ gst_asf_demux_parse_packet (GstASFDemux * demux, GstBuffer * buf)
GST_LOG_OBJECT (demux, "duration : %" GST_TIME_FORMAT, GST_LOG_OBJECT (demux, "duration : %" GST_TIME_FORMAT,
GST_TIME_ARGS (packet.duration)); GST_TIME_ARGS (packet.duration));
if (G_UNLIKELY (packet.padding == (guint) - 1 || size < packet.padding)) if (G_UNLIKELY (packet.padding == (guint) - 1 || size < packet.padding)) {
goto short_packet; GST_WARNING_OBJECT (demux, "No padding, or padding bigger than buffer");
return GST_ASF_DEMUX_PARSE_PACKET_ERROR_RECOVERABLE;
}
size -= packet.padding; size -= packet.padding;
@ -588,7 +596,8 @@ gst_asf_demux_parse_packet (GstASFDemux * demux, GstBuffer * buf)
"adjusting available data size"); "adjusting available data size");
if (size < demux->packet_size - packet.length) { if (size < demux->packet_size - packet.length) {
/* the buffer is smaller than the implicit padding */ /* the buffer is smaller than the implicit padding */
goto short_packet; GST_WARNING_OBJECT (demux, "Buffer is smaller than the implicit padding");
return GST_ASF_DEMUX_PARSE_PACKET_ERROR_RECOVERABLE;
} else { } else {
/* subtract the implicit padding */ /* subtract the implicit padding */
size -= (demux->packet_size - packet.length); size -= (demux->packet_size - packet.length);
@ -598,8 +607,10 @@ gst_asf_demux_parse_packet (GstASFDemux * demux, GstBuffer * buf)
if (has_multiple_payloads) { if (has_multiple_payloads) {
guint i, num, lentype; guint i, num, lentype;
if (G_UNLIKELY (size < 1)) if (G_UNLIKELY (size < 1)) {
goto short_packet; GST_WARNING_OBJECT (demux, "No room more in buffer");
return GST_ASF_DEMUX_PARSE_PACKET_ERROR_RECOVERABLE;
}
num = (GST_READ_UINT8 (data) & 0x3F) >> 0; num = (GST_READ_UINT8 (data) & 0x3F) >> 0;
lentype = (GST_READ_UINT8 (data) & 0xC0) >> 6; lentype = (GST_READ_UINT8 (data) & 0xC0) >> 6;
@ -613,26 +624,22 @@ gst_asf_demux_parse_packet (GstASFDemux * demux, GstBuffer * buf)
GST_LOG_OBJECT (demux, "Parsing payload %u/%u, size left: %u", i + 1, num, GST_LOG_OBJECT (demux, "Parsing payload %u/%u, size left: %u", i + 1, num,
size); size);
ret = gst_asf_demux_parse_payload (demux, &packet, lentype, &data, &size); if (G_UNLIKELY (!gst_asf_demux_parse_payload (demux, &packet, lentype,
&data, &size))) {
if (G_UNLIKELY (!ret)) {
GST_WARNING_OBJECT (demux, "Failed to parse payload %u/%u", i + 1, num); GST_WARNING_OBJECT (demux, "Failed to parse payload %u/%u", i + 1, num);
ret = GST_ASF_DEMUX_PARSE_PACKET_ERROR_FATAL;
break; break;
} }
} }
} else { } else {
GST_LOG_OBJECT (demux, "Parsing single payload"); GST_LOG_OBJECT (demux, "Parsing single payload");
ret = gst_asf_demux_parse_payload (demux, &packet, -1, &data, &size); if (G_UNLIKELY (!gst_asf_demux_parse_payload (demux, &packet, -1, &data,
&size))) {
GST_WARNING_OBJECT (demux, "Failed to parse payload");
ret = GST_ASF_DEMUX_PARSE_PACKET_ERROR_RECOVERABLE;
}
} }
gst_buffer_unmap (buf, &map); gst_buffer_unmap (buf, &map);
return ret; return ret;
/* ERRORS */
short_packet:
{
gst_buffer_unmap (buf, &map);
GST_WARNING_OBJECT (demux, "Short packet!");
return FALSE;
}
} }

8
gst/asfdemux/asfpacket.h
View file

@ -57,7 +57,13 @@ typedef struct {
guint8 prop_flags; /* payload length types */ guint8 prop_flags; /* payload length types */
} AsfPacket; } AsfPacket;
gboolean gst_asf_demux_parse_packet (GstASFDemux * demux, GstBuffer * buf); typedef enum {
GST_ASF_DEMUX_PARSE_PACKET_ERROR_NONE,
GST_ASF_DEMUX_PARSE_PACKET_ERROR_RECOVERABLE,
GST_ASF_DEMUX_PARSE_PACKET_ERROR_FATAL
} GstAsfDemuxParsePacketError;
GstAsfDemuxParsePacketError gst_asf_demux_parse_packet (GstASFDemux * demux, GstBuffer * buf);
#define gst_asf_payload_is_complete(payload) \ #define gst_asf_payload_is_complete(payload) \
((payload)->buf_filled >= (payload)->mo_size) ((payload)->buf_filled >= (payload)->mo_size)

46
gst/asfdemux/gstasfdemux.c
View file

@ -1621,9 +1621,9 @@ gst_asf_demux_loop (GstASFDemux * demux)
} }
if (G_LIKELY (demux->speed_packets == 1)) { if (G_LIKELY (demux->speed_packets == 1)) {
/* FIXME: maybe we should just skip broken packets and error out only GstAsfDemuxParsePacketError err;
* after a few broken packets in a row? */ err = gst_asf_demux_parse_packet (demux, buf);
if (G_UNLIKELY (!gst_asf_demux_parse_packet (demux, buf))) { if (G_UNLIKELY (err != GST_ASF_DEMUX_PARSE_PACKET_ERROR_NONE)) {
/* when we don't know when the data object ends, we should check /* when we don't know when the data object ends, we should check
* for a chained asf */ * for a chained asf */
if (demux->num_packets == 0) { if (demux->num_packets == 0) {
@ -1635,7 +1635,13 @@ gst_asf_demux_loop (GstASFDemux * demux)
return; return;
} }
} }
goto parse_error; /* FIXME: We should tally up fatal errors and error out only
* after a few broken packets in a row? */
GST_INFO_OBJECT (demux, "Ignoring recoverable parse error");
gst_buffer_unref (buf);
++demux->packet;
return;
} }
flow = gst_asf_demux_push_complete_payloads (demux, FALSE); flow = gst_asf_demux_push_complete_payloads (demux, FALSE);
@ -1646,13 +1652,13 @@ gst_asf_demux_loop (GstASFDemux * demux)
guint n; guint n;
for (n = 0; n < demux->speed_packets; n++) { for (n = 0; n < demux->speed_packets; n++) {
GstBuffer *sub; GstBuffer *sub;
GstAsfDemuxParsePacketError err;
sub = sub =
gst_buffer_copy_region (buf, GST_BUFFER_COPY_NONE, gst_buffer_copy_region (buf, GST_BUFFER_COPY_ALL,
n * demux->packet_size, demux->packet_size); n * demux->packet_size, demux->packet_size);
/* FIXME: maybe we should just skip broken packets and error out only err = gst_asf_demux_parse_packet (demux, sub);
* after a few broken packets in a row? */ if (G_UNLIKELY (err != GST_ASF_DEMUX_PARSE_PACKET_ERROR_NONE)) {
if (G_UNLIKELY (!gst_asf_demux_parse_packet (demux, sub))) {
/* when we don't know when the data object ends, we should check /* when we don't know when the data object ends, we should check
* for a chained asf */ * for a chained asf */
if (demux->num_packets == 0) { if (demux->num_packets == 0) {
@ -1665,12 +1671,17 @@ gst_asf_demux_loop (GstASFDemux * demux)
return; return;
} }
} }
goto parse_error; /* FIXME: We should tally up fatal errors and error out only
* after a few broken packets in a row? */
GST_INFO_OBJECT (demux, "Ignoring recoverable parse error");
flow = GST_FLOW_OK;
} }
gst_buffer_unref (sub); gst_buffer_unref (sub);
flow = gst_asf_demux_push_complete_payloads (demux, FALSE); if (err == GST_ASF_DEMUX_PARSE_PACKET_ERROR_NONE)
flow = gst_asf_demux_push_complete_payloads (demux, FALSE);
++demux->packet; ++demux->packet;
@ -1762,6 +1773,8 @@ read_failed:
flow = GST_FLOW_EOS; flow = GST_FLOW_EOS;
goto pause; goto pause;
} }
#if 0
/* See FIXMEs above */
parse_error: parse_error:
{ {
gst_buffer_unref (buf); gst_buffer_unref (buf);
@ -1771,6 +1784,7 @@ parse_error:
flow = GST_FLOW_ERROR; flow = GST_FLOW_ERROR;
goto pause; goto pause;
} }
#endif
} }
#define GST_ASF_DEMUX_CHECK_HEADER_YES 0 #define GST_ASF_DEMUX_CHECK_HEADER_YES 0
@ -1855,6 +1869,7 @@ gst_asf_demux_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
while (gst_adapter_available (demux->adapter) >= data_size) { while (gst_adapter_available (demux->adapter) >= data_size) {
GstBuffer *buf; GstBuffer *buf;
GstAsfDemuxParsePacketError err;
/* we don't know the length of the stream /* we don't know the length of the stream
* check for a chained asf everytime */ * check for a chained asf everytime */
@ -1875,15 +1890,16 @@ gst_asf_demux_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
buf = gst_adapter_take_buffer (demux->adapter, data_size); buf = gst_adapter_take_buffer (demux->adapter, data_size);
/* FIXME: maybe we should just skip broken packets and error out only /* FIXME: We should tally up fatal errors and error out only
* after a few broken packets in a row? */ * after a few broken packets in a row? */
if (G_UNLIKELY (!gst_asf_demux_parse_packet (demux, buf))) { err = gst_asf_demux_parse_packet (demux, buf);
GST_WARNING_OBJECT (demux, "Parse error");
}
gst_buffer_unref (buf); gst_buffer_unref (buf);
ret = gst_asf_demux_push_complete_payloads (demux, FALSE); if (G_LIKELY (err == GST_ASF_DEMUX_PARSE_PACKET_ERROR_NONE))
ret = gst_asf_demux_push_complete_payloads (demux, FALSE);
else
GST_WARNING_OBJECT (demux, "Parse error");
if (demux->packet >= 0) if (demux->packet >= 0)
++demux->packet; ++demux->packet;