mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-09-08 21:28:45 +00:00
qtdemux: fragmented support; compensate for ismv offset handling
... or lack thereof, which according to specs would put media data in unlikely position.
This commit is contained in:
parent
dfa54ed8cb
commit
283e2b1bcd
1 changed files with 21 additions and 4 deletions
|
@ -1978,7 +1978,8 @@ qtdemux_parse_trex (GstQTDemux * qtdemux, QtDemuxStream * stream,
|
||||||
static gboolean
|
static gboolean
|
||||||
qtdemux_parse_trun (GstQTDemux * qtdemux, GstByteReader * trun,
|
qtdemux_parse_trun (GstQTDemux * qtdemux, GstByteReader * trun,
|
||||||
QtDemuxStream * stream, guint32 d_sample_duration, guint32 d_sample_size,
|
QtDemuxStream * stream, guint32 d_sample_duration, guint32 d_sample_size,
|
||||||
guint32 d_sample_flags, gint64 * base_offset)
|
guint32 d_sample_flags, gint64 moof_offset, gint64 moof_length,
|
||||||
|
gint64 * base_offset)
|
||||||
{
|
{
|
||||||
guint64 timestamp;
|
guint64 timestamp;
|
||||||
gint32 data_offset;
|
gint32 data_offset;
|
||||||
|
@ -2004,8 +2005,24 @@ qtdemux_parse_trun (GstQTDemux * qtdemux, GstByteReader * trun,
|
||||||
/* note this is really signed */
|
/* note this is really signed */
|
||||||
if (!gst_byte_reader_get_int32_be (trun, &data_offset))
|
if (!gst_byte_reader_get_int32_be (trun, &data_offset))
|
||||||
goto fail;
|
goto fail;
|
||||||
*base_offset += data_offset;
|
GST_LOG_OBJECT (qtdemux, "trun data offset %d", data_offset);
|
||||||
|
/* default base offset = first byte of moof */
|
||||||
|
if (*base_offset == -1) {
|
||||||
|
GST_LOG_OBJECT (qtdemux, "base_offset at moof");
|
||||||
|
*base_offset = moof_offset;
|
||||||
}
|
}
|
||||||
|
*base_offset += data_offset;
|
||||||
|
} else {
|
||||||
|
/* if no offset at all, that would mean data starts at moof start,
|
||||||
|
* which is a bit wrong and is ismv crappy way, so compensate
|
||||||
|
* assuming data is in mdat following moof */
|
||||||
|
if (*base_offset == -1) {
|
||||||
|
*base_offset = moof_offset + moof_length + 8;
|
||||||
|
GST_LOG_OBJECT (qtdemux, "base_offset assumed in mdat after moof");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
GST_LOG_OBJECT (qtdemux, "base offset now %" G_GINT64_FORMAT, *base_offset);
|
||||||
|
|
||||||
GST_LOG_OBJECT (qtdemux, "trun offset %d, flags 0x%x, entries %d",
|
GST_LOG_OBJECT (qtdemux, "trun offset %d, flags 0x%x, entries %d",
|
||||||
data_offset, flags, samples_count);
|
data_offset, flags, samples_count);
|
||||||
|
@ -2249,8 +2266,8 @@ qtdemux_parse_moof (GstQTDemux * qtdemux, const guint8 * buffer, guint length,
|
||||||
qtdemux_parse_node (qtdemux, moof_node, buffer, length);
|
qtdemux_parse_node (qtdemux, moof_node, buffer, length);
|
||||||
qtdemux_node_dump (qtdemux, moof_node);
|
qtdemux_node_dump (qtdemux, moof_node);
|
||||||
|
|
||||||
/* default base offset = first byte of moof */
|
/* unknown base_offset to start with */
|
||||||
base_offset = moof_offset;
|
base_offset = -1;
|
||||||
traf_node = qtdemux_tree_get_child_by_type (moof_node, FOURCC_traf);
|
traf_node = qtdemux_tree_get_child_by_type (moof_node, FOURCC_traf);
|
||||||
while (traf_node) {
|
while (traf_node) {
|
||||||
/* Fragment Header node */
|
/* Fragment Header node */
|
||||||
|
@ -2268,7 +2285,7 @@ qtdemux_parse_moof (GstQTDemux * qtdemux, const guint8 * buffer, guint length,
|
||||||
&trun_data);
|
&trun_data);
|
||||||
while (trun_node) {
|
while (trun_node) {
|
||||||
qtdemux_parse_trun (qtdemux, &trun_data, stream,
|
qtdemux_parse_trun (qtdemux, &trun_data, stream,
|
||||||
ds_duration, ds_size, ds_flags, &base_offset);
|
ds_duration, ds_size, ds_flags, moof_offset, length, &base_offset);
|
||||||
/* iterate all siblings */
|
/* iterate all siblings */
|
||||||
trun_node = qtdemux_tree_get_sibling_by_type_full (trun_node, FOURCC_trun,
|
trun_node = qtdemux_tree_get_sibling_by_type_full (trun_node, FOURCC_trun,
|
||||||
&trun_data);
|
&trun_data);
|
||||||
|
|
Loading…
Reference in a new issue