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

isomp4: atomsrecovery: handle common and large atom headers

Browse source 
Do not assume all files are large files. Check and use the short or
extended atom size field only if needed.

https://bugzilla.gnome.org/show_bug.cgi?id=784258
This commit is contained in:
Thiago Santos 2017-07-05 22:23:21 -07:00
parent 39785d9cc3
commit 69605b6c61
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gst/isomp4/atomsrecovery.c
View file

@ -1030,8 +1030,8 @@ moov_recov_write_file (MoovRecovFile * moovrf, MdatRecovFile * mdatrf,
/* add chunks offsets */ /* add chunks offsets */
for (i = 0; i < moovrf->num_traks; i++) { for (i = 0; i < moovrf->num_traks; i++) {
TrakRecovData *trak = &(moovrf->traks_rd[i]); TrakRecovData *trak = &(moovrf->traks_rd[i]);
/* 16 for the mdat header */ /* 8 or 16 for the mdat header */
gint64 offset = moov_size + ftell (outf) + 16; gint64 offset = moov_size + ftell (outf) + mdatrf->mdat_header_size;
atom_stco64_chunks_set_offset (&trak->stbl.stco64, offset); atom_stco64_chunks_set_offset (&trak->stbl.stco64, offset);
} }
@ -1135,10 +1135,21 @@ moov_recov_write_file (MoovRecovFile * moovrf, MdatRecovFile * mdatrf,
/* write the mdat */ /* write the mdat */
/* write the header first */ /* write the header first */
if (mdatrf->mdat_header_size == 16) {
GST_WRITE_UINT32_BE (auxdata, 1); GST_WRITE_UINT32_BE (auxdata, 1);
GST_WRITE_UINT32_LE (auxdata + 4, FOURCC_mdat); GST_WRITE_UINT32_LE (auxdata + 4, FOURCC_mdat);
GST_WRITE_UINT64_BE (auxdata + 8, mdatrf->mdat_size); GST_WRITE_UINT64_BE (auxdata + 8, mdatrf->mdat_size);
if (fwrite (auxdata, 1, 16, outf) != 16) { } else if (mdatrf->mdat_header_size == 8) {
GST_WRITE_UINT32_BE (auxdata, mdatrf->mdat_size);
GST_WRITE_UINT32_LE (auxdata + 4, FOURCC_mdat);
} else {
GST_ERROR ("Unexpected atom size: %u", mdatrf->mdat_header_size);
g_assert_not_reached ();
goto fail;
}
if (fwrite (auxdata, 1, mdatrf->mdat_header_size,
outf) != mdatrf->mdat_header_size) {
ATOMS_RECOV_OUTPUT_WRITE_ERROR (err); ATOMS_RECOV_OUTPUT_WRITE_ERROR (err);
goto fail; goto fail;
} }