commit b6945d4afec826ca52dfcd877c8e0146c5eb4486
author Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> Mon Jan 03 16:56:57 2011 +0100
committer Tim-Philipp Müller <tim.muller@collabora.co.uk> Tue Apr 12 20:32:20 2011 +0100
tree 479d1471a240bb3ba1ef66fd23927a6b2caeb8d1
parent b852dde2db0fa0c68bd53a8f0ae2e52377b147cd

qtmux: simplify and fix pts_offset storing

In particular, only write a ctts atom if and only if ever a non-zero offset.

gst/quicktime/atoms.h

diff --git a/gst/quicktime/atoms.h b/gst/quicktime/atoms.h
index b65be82..d124118 100644
--- a/gst/quicktime/atoms.h
+++ b/gst/quicktime/atoms.h
@@ -479,6 +479,7 @@
 
   /* also entry count here */
   ATOM_ARRAY (CTTSEntry) entries;
+  gboolean do_pts;
 } AtomCTTS;
 
 typedef struct _AtomSTBL
@@ -806,7 +807,7 @@
 AtomTRAK*  atom_trak_new               (AtomsContext *context);
 void       atom_trak_add_samples       (AtomTRAK * trak, guint32 nsamples, guint32 delta,
                                         guint32 size, guint64 chunk_offset, gboolean sync,
-                                        gboolean do_pts, gint64 pts_offset);
+                                        gint64 pts_offset);
 void       atom_trak_add_elst_entry    (AtomTRAK * trak, guint32 duration,
                                         guint32 media_time, guint32 rate);
 guint32    atom_trak_get_timescale     (AtomTRAK *trak);
@@ -814,7 +815,7 @@
 void       atom_stbl_add_samples       (AtomSTBL * stbl, guint32 nsamples,
                                         guint32 delta, guint32 size,
                                         guint64 chunk_offset, gboolean sync,
-                                        gboolean do_pts, gint64 pts_offset);
+                                        gint64 pts_offset);
 
 AtomMOOV*  atom_moov_new               (AtomsContext *context);
 void       atom_moov_free              (AtomMOOV *moov);
@@ -850,8 +851,7 @@
 AtomTRAF * atom_traf_new               (AtomsContext * context, guint32 track_ID);
 void       atom_traf_free              (AtomTRAF * traf);
 void       atom_traf_add_samples       (AtomTRAF * traf, guint32 delta,
-                                        guint32 size, gboolean sync,
-                                        gboolean do_pts, gint64 pts_offset,
+                                        guint32 size, gboolean sync, gint64 pts_offset,
                                         gboolean sdtp_sync);
 guint32    atom_traf_get_sample_num    (AtomTRAF * traf);
 void       atom_moof_add_traf          (AtomMOOF *moof, AtomTRAF *traf);