mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-02 14:36:41 +00:00
Code Issues 1 Projects Releases Wiki Activity

isomp4: Make 'gmhd' atom usage more generic

Browse source 
Only the 'gmin' atom is required. Any other entry within it are
optional.

https://bugzilla.gnome.org/show_bug.cgi?id=606643
This commit is contained in:
Edward Hervey 2018-02-06 15:38:00 +01:00 committed by Edward Hervey
parent 1914b9d4e2
commit 76e32ef414
2 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
gst/isomp4/atoms.c
View file

@ -422,18 +422,23 @@ atom_tcmi_clear (AtomTCMI * tcmi)
tcmi->font_name = NULL; tcmi->font_name = NULL;
} }
static void static AtomTMCD *
atom_tmcd_init (AtomTMCD * tmcd) atom_tmcd_new (void)
{ {
AtomTMCD *tmcd = g_new0 (AtomTMCD, 1);
atom_header_set (&tmcd->header, FOURCC_tmcd, 0, 0); atom_header_set (&tmcd->header, FOURCC_tmcd, 0, 0);
atom_tcmi_init (&tmcd->tcmi); atom_tcmi_init (&tmcd->tcmi);
return tmcd;
} }
static void static void
atom_tmcd_clear (AtomTMCD * tmcd) atom_tmcd_free (AtomTMCD * tmcd)
{ {
atom_clear (&tmcd->header); atom_clear (&tmcd->header);
atom_tcmi_clear (&tmcd->tcmi); atom_tcmi_clear (&tmcd->tcmi);
g_free (tmcd);
} }
static void static void
@ -461,7 +466,6 @@ atom_gmhd_init (AtomGMHD * gmhd)
{ {
atom_header_set (&gmhd->header, FOURCC_gmhd, 0, 0); atom_header_set (&gmhd->header, FOURCC_gmhd, 0, 0);
atom_gmin_init (&gmhd->gmin); atom_gmin_init (&gmhd->gmin);
atom_tmcd_init (&gmhd->tmcd);
} }
static void static void
@ -469,7 +473,10 @@ atom_gmhd_clear (AtomGMHD * gmhd)
{ {
atom_clear (&gmhd->header); atom_clear (&gmhd->header);
atom_gmin_clear (&gmhd->gmin); atom_gmin_clear (&gmhd->gmin);
atom_tmcd_clear (&gmhd->tmcd); if (gmhd->tmcd) {
atom_tmcd_free (gmhd->tmcd);
gmhd->tmcd = NULL;
}
} }
static AtomGMHD * static AtomGMHD *
@ -1941,7 +1948,7 @@ atom_gmhd_copy_data (AtomGMHD * gmhd, guint8 ** buffer, guint64 * size,
if (!atom_gmin_copy_data (&gmhd->gmin, buffer, size, offset)) { if (!atom_gmin_copy_data (&gmhd->gmin, buffer, size, offset)) {
return 0; return 0;
} }
if (!atom_tmcd_copy_data (&gmhd->tmcd, buffer, size, offset)) { if (gmhd->tmcd && !atom_tmcd_copy_data (gmhd->tmcd, buffer, size, offset)) {
return 0; return 0;
} }
@ -3315,7 +3322,7 @@ atom_moov_update_duration (AtomMOOV * moov)
AtomTRAK *trak = (AtomTRAK *) traks->data; AtomTRAK *trak = (AtomTRAK *) traks->data;
/* Skip timecodes for now: they have a placeholder duration */ /* Skip timecodes for now: they have a placeholder duration */
if (trak->mdia.minf.gmhd == NULL) { if (trak->mdia.minf.gmhd == NULL || trak->mdia.minf.gmhd->tmcd == NULL) {
atom_trak_update_duration (trak, atom_moov_get_timescale (moov)); atom_trak_update_duration (trak, atom_moov_get_timescale (moov));
dur = atom_trak_get_duration (trak); dur = atom_trak_get_duration (trak);
if (dur > duration) if (dur > duration)
@ -3328,7 +3335,7 @@ atom_moov_update_duration (AtomMOOV * moov)
while (traks) { while (traks) {
AtomTRAK *trak = (AtomTRAK *) traks->data; AtomTRAK *trak = (AtomTRAK *) traks->data;
if (trak->mdia.minf.gmhd != NULL) if (trak->mdia.minf.gmhd != NULL && trak->mdia.minf.gmhd->tmcd != NULL)
timecode_atom_trak_set_duration (trak, duration, timecode_atom_trak_set_duration (trak, duration,
atom_moov_get_timescale (moov)); atom_moov_get_timescale (moov));
traks = g_list_next (traks); traks = g_list_next (traks);
@ -4064,8 +4071,9 @@ atom_trak_set_timecode_type (AtomTRAK * trak, AtomsContext * context,
gmhd->gmin.opcolor[0] = 0x8000; gmhd->gmin.opcolor[0] = 0x8000;
gmhd->gmin.opcolor[1] = 0x8000; gmhd->gmin.opcolor[1] = 0x8000;
gmhd->gmin.opcolor[2] = 0x8000; gmhd->gmin.opcolor[2] = 0x8000;
gmhd->tmcd.tcmi.text_size = 12; gmhd->tmcd = atom_tmcd_new ();
gmhd->tmcd.tcmi.font_name = g_strdup ("Chicago"); /* Pascal string */ gmhd->tmcd->tcmi.text_size = 12;
gmhd->tmcd->tcmi.font_name = g_strdup ("Chicago"); /* Pascal string */
trak->mdia.minf.gmhd = gmhd; trak->mdia.minf.gmhd = gmhd;
trak->is_video = FALSE; trak->is_video = FALSE;

4
gst/isomp4/atoms.h
View file

@ -318,8 +318,10 @@ typedef struct _AtomGMHD
{ {
Atom header; Atom header;
/* Only gmin is required in a gmhd atom
* The other fields are optional */
AtomGMIN gmin; AtomGMIN gmin;
AtomTMCD tmcd; AtomTMCD *tmcd;
} AtomGMHD; } AtomGMHD;