Commit 883bcdaf authored by Edward Hervey's avatar Edward Hervey 🤘

gst/qtdemux/qtdemux.c: More coherent framerate setting on caps.

Original commit message from CVS:
* gst/qtdemux/qtdemux.c: (gst_qtdemux_loop_header),
(gst_qtdemux_add_stream), (qtdemux_parse_trak):
More coherent framerate setting on caps.
If sample_size is available, use that for the samples' duration in
the index. This enables single frame streams to work (and I imagine
fixes some other cases).
Tested on testsuite, no regression.
parent 8d1719bd
2006-01-24 Edward Hervey <edward@fluendo.com>
* gst/qtdemux/qtdemux.c: (gst_qtdemux_loop_header),
(gst_qtdemux_add_stream), (qtdemux_parse_trak):
More coherent framerate setting on caps.
If sample_size is available, use that for the samples' duration in
the index. This enables single frame streams to work (and I imagine
fixes some other cases).
Tested on testsuite, no regression.
2006-01-23 Edward Hervey <edward@fluendo.com>
* gst/qtdemux/qtdemux.c: (qtdemux_parse_trak),
......
......@@ -644,8 +644,7 @@ gst_qtdemux_loop_header (GstPad * pad)
buf = NULL;
if (size > 0) {
GST_LOG_OBJECT (qtdemux, "reading %d bytes @ " G_GINT64_FORMAT,
size, offset);
GST_LOG_OBJECT (qtdemux, "reading %d bytes @ %lld", size, offset);
if (gst_pad_pull_range (qtdemux->sinkpad, offset,
size, &buf) != GST_FLOW_OK)
......@@ -744,12 +743,15 @@ gst_qtdemux_add_stream (GstQTDemux * qtdemux,
stream->pad = gst_pad_new_from_template (templ, name);
gst_object_unref (templ);
g_free (name);
if (stream->samples[0].duration == 0) {
if ((stream->n_samples == 1) && (stream->samples[0].duration == 0)) {
stream->fps_n = 0;
stream->fps_d = 1;
} else {
stream->fps_n = stream->timescale;
stream->fps_d = stream->samples[0].duration;
if (stream->samples[0].duration == 0)
stream->fps_d = 1;
else
stream->fps_d = stream->samples[0].duration;
}
if (stream->caps) {
......@@ -2336,8 +2338,10 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
samples[j].size =
samples_per_chunk * stream->bytes_per_frame /
stream->samples_per_packet / stream->compression;
else
else if (stream->bytes_per_frame)
samples[j].size = stream->bytes_per_frame;
else
samples[j].size = sample_size;
samples[j].duration =
samples_per_chunk * stream->timescale / (stream->rate / 2);
samples[j].timestamp = timestamp;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment