index b56c81a7982eca293c8688eb9ea987185a80f9fb..4eb4d06f421826e5a7d8d7fbf4353cfff7698c51 100644 (file)
--- a/gst/asfdemux/asfpacket.c
+++ b/gst/asfdemux/asfpacket.c
GST_LOG_OBJECT (demux, "payload length: %u", payload_len);
- if ((stream = gst_asf_demux_get_stream (demux, stream_num))) {
+ if (payload_len == 0) {
+ GST_DEBUG_OBJECT (demux, "skipping empty payload");
+ } else if (payload.mo_offset == 0 && payload.mo_size == payload_len) {
+ /* if the media object is not fragmented, just create a sub-buffer */
+ GST_LOG_OBJECT (demux, "unfragmented media object size %u", payload_len);
payload.buf = asf_packet_create_payload_buffer (packet, p_data, p_size,
payload_len);
+ payload.buf_filled = payload_len;
+ gst_asf_payload_queue_for_stream (demux, &payload, stream);
+ } else {
+ const guint8 *payload_data = *p_data;
+
+ g_assert (payload_len <= *p_size);
+
+ *p_data += payload_len;
+ *p_size -= payload_len;
/* n-th fragment of a fragmented media object? */
if (payload.mo_offset != 0) {
AsfPayload *prev;
if ((prev = asf_payload_find_previous_fragment (&payload, stream))) {
- if (payload.mo_offset != GST_BUFFER_SIZE (prev->buf)) {
+ if (prev->buf == NULL || payload.mo_size != prev->mo_size ||
+ payload.mo_offset >= GST_BUFFER_SIZE (prev->buf) ||
+ payload.mo_offset + payload_len > GST_BUFFER_SIZE (prev->buf)) {
GST_WARNING_OBJECT (demux, "Offset doesn't match previous data?!");
+ } else {
+ /* we assume fragments are payloaded with increasing mo_offset */
+ if (payload.mo_offset != prev->buf_filled) {
+ GST_WARNING_OBJECT (demux, "media object payload discontinuity: "
+ "offset=%u vs buf_filled=%u", payload.mo_offset,
+ prev->buf_filled);
+ }
+ memcpy (GST_BUFFER_DATA (prev->buf) + payload.mo_offset,
+ payload_data, payload_len);
+ prev->buf_filled =
+ MAX (prev->buf_filled, payload.mo_offset + payload_len);
+ GST_LOG_OBJECT (demux, "Merged media object fragments, size now %u",
+ prev->buf_filled);
}
- /* note: buffer join/merge might not preserve buffer flags */
- prev->buf = gst_buffer_join (prev->buf, payload.buf);
- GST_LOG_OBJECT (demux, "Merged fragments, merged size: %u",
- GST_BUFFER_SIZE (prev->buf));
} else {
- gst_buffer_unref (payload.buf);
+ GST_DEBUG_OBJECT (demux, "n-th payload fragment, but don't have "
+ "any previous fragment, ignoring payload");
}
- payload.buf = NULL;
} else {
+ GST_LOG_OBJECT (demux, "allocating buffer of size %u for fragmented "
+ "media object", payload.mo_size);
+ payload.buf = gst_buffer_new_and_alloc (payload.mo_size);
+ memcpy (GST_BUFFER_DATA (payload.buf), payload_data, payload_len);
+ payload.buf_filled = payload_len;
+
gst_asf_payload_queue_for_stream (demux, &payload, stream);
}
}
if (G_LIKELY (sub_payload_len > 0)) {
payload.buf = asf_packet_create_payload_buffer (packet,
&payload_data, &payload_len, sub_payload_len);
+ payload.buf_filled = sub_payload_len;
payload.ts = ts;
if (G_LIKELY (ts_delta))