gppmux: Add support for 3gr6
Keep track of the chunk durations to be able to add 3gr6
brand if it is a faststart file and the longest chunk is
smaller than a sec. Implemented according to 3gpp
TS 26.244 v6.4.0 (2005-09)
Fixes #584361
diff --git a/gst/quicktime/gstqtmux.c b/gst/quicktime/gstqtmux.c
index 2ed0cea..b52b871 100644
--- a/gst/quicktime/gstqtmux.c
+++ b/gst/quicktime/gstqtmux.c
@@ -268,6 +268,7 @@
qtmux->header_size = 0;
qtmux->mdat_size = 0;
qtmux->mdat_pos = 0;
+ qtmux->longest_chunk = GST_CLOCK_TIME_NONE;
if (qtmux->ftyp) {
atom_ftyp_free (qtmux->ftyp);
@@ -1035,7 +1036,8 @@
if (qtmux->ftyp)
atom_ftyp_free (qtmux->ftyp);
gst_qt_mux_map_format_to_header (qtmux_klass->format, &prefix, &major,
- &version, &comp, qtmux->moov);
+ &version, &comp, qtmux->moov, qtmux->longest_chunk,
+ qtmux->fast_start_file != NULL);
qtmux->ftyp = atom_ftyp_new (qtmux->context, major, version, comp);
if (comp)
g_list_free (comp);
@@ -1357,6 +1359,17 @@
GST_PAD_NAME (pad->collect.pad), pts_offset);
}
+ /*
+ * Each buffer starts a new chunk, so we can assume the buffer
+ * duration is the chunk duration
+ */
+ if (GST_CLOCK_TIME_IS_VALID (duration) && (duration > qtmux->longest_chunk ||
+ !GST_CLOCK_TIME_IS_VALID (qtmux->longest_chunk))) {
+ GST_DEBUG_OBJECT (qtmux, "New longest chunk found: %" GST_TIME_FORMAT
+ ", pad %s", GST_TIME_ARGS (duration), GST_PAD_NAME (pad->collect.pad));
+ qtmux->longest_chunk = duration;
+ }
+
/* now we go and register this buffer/sample all over */
/* note that a new chunk is started each time (not fancy but works) */
atom_trak_add_samples (pad->trak, nsamples, scaled_duration, sample_size,
