mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-08 21:28:45 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "matroskamux: Use the running time for container timestamps, not buffer timestamps"

Browse source 
This reverts commit b3aa8755fe.

We are already using the running-time because they were placed on the
buffers with gst_collect_pads_clip_running_time(). Arguably it would be
better to not modify the incomming buffers but collectpads seems to want
to use absolute timestamps from the buffers for finding the best buffer
(this can be changed with a custom compare function..).
This commit is contained in:
Wim Taymans 2014-01-08 11:28:04 +01:00
parent fc99287472
commit 7f8c4dceb4
1 changed files with 24 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
gst/matroska/matroska-mux.c
View file

@ -3263,7 +3263,6 @@ gst_matroska_mux_write_data (GstMatroskaMux * mux, GstMatroskaPad * collect_pad,
GstBuffer *hdr; GstBuffer *hdr;
guint64 blockgroup; guint64 blockgroup;
gboolean write_duration; gboolean write_duration;
GstClockTime timestamp;
gint16 relative_timestamp; gint16 relative_timestamp;
gint64 relative_timestamp64; gint64 relative_timestamp64;
guint64 block_duration; guint64 block_duration;
@ -3303,22 +3302,13 @@ gst_matroska_mux_write_data (GstMatroskaMux * mux, GstMatroskaPad * collect_pad,
return GST_FLOW_OK; return GST_FLOW_OK;
} }
timestamp = gst_segment_to_running_time (&collect_pad->collect.segment,
GST_FORMAT_TIME, GST_BUFFER_TIMESTAMP (buf));
if (!GST_CLOCK_TIME_IS_VALID (timestamp)) {
GST_WARNING_OBJECT (collect_pad->collect.pad,
"Invalid buffer running time; dropping buffer");
gst_buffer_unref (buf);
return GST_FLOW_OK;
}
/* set the timestamp for outgoing buffers */ /* set the timestamp for outgoing buffers */
ebml->timestamp = timestamp; ebml->timestamp = GST_BUFFER_TIMESTAMP (buf);
if (collect_pad->track->type == GST_MATROSKA_TRACK_TYPE_VIDEO) { if (collect_pad->track->type == GST_MATROSKA_TRACK_TYPE_VIDEO) {
if (!GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_DELTA_UNIT)) { if (!GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_DELTA_UNIT)) {
GST_LOG_OBJECT (mux, "have video keyframe, ts=%" GST_TIME_FORMAT, GST_LOG_OBJECT (mux, "have video keyframe, ts=%" GST_TIME_FORMAT,
GST_TIME_ARGS (timestamp)); GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf)));
is_video_keyframe = TRUE; is_video_keyframe = TRUE;
} else if (GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_DECODE_ONLY) && } else if (GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_DECODE_ONLY) &&
(!strcmp (collect_pad->track->codec_id, GST_MATROSKA_CODEC_ID_VIDEO_VP8) (!strcmp (collect_pad->track->codec_id, GST_MATROSKA_CODEC_ID_VIDEO_VP8)
@ -3326,7 +3316,7 @@ gst_matroska_mux_write_data (GstMatroskaMux * mux, GstMatroskaPad * collect_pad,
GST_MATROSKA_CODEC_ID_VIDEO_VP9))) { GST_MATROSKA_CODEC_ID_VIDEO_VP9))) {
GST_LOG_OBJECT (mux, GST_LOG_OBJECT (mux,
"have VP8 video invisible frame, " "ts=%" GST_TIME_FORMAT, "have VP8 video invisible frame, " "ts=%" GST_TIME_FORMAT,
GST_TIME_ARGS (timestamp)); GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf)));
is_video_invisible = TRUE; is_video_invisible = TRUE;
} }
} }
@ -3335,7 +3325,7 @@ gst_matroska_mux_write_data (GstMatroskaMux * mux, GstMatroskaPad * collect_pad,
/* start a new cluster at every keyframe, at every GstForceKeyUnit event, /* start a new cluster at every keyframe, at every GstForceKeyUnit event,
* or when we may be reaching the limit of the relative timestamp */ * or when we may be reaching the limit of the relative timestamp */
if (mux->cluster_time + if (mux->cluster_time +
mux->max_cluster_duration < timestamp mux->max_cluster_duration < GST_BUFFER_TIMESTAMP (buf)
|| is_video_keyframe || mux->force_key_unit_event) { || is_video_keyframe || mux->force_key_unit_event) {
if (!mux->streamable) if (!mux->streamable)
gst_ebml_write_master_finish (ebml, mux->cluster); gst_ebml_write_master_finish (ebml, mux->cluster);
@ -3352,11 +3342,13 @@ gst_matroska_mux_write_data (GstMatroskaMux * mux, GstMatroskaPad * collect_pad,
mux->cluster = mux->cluster =
gst_ebml_write_master_start (ebml, GST_MATROSKA_ID_CLUSTER); gst_ebml_write_master_start (ebml, GST_MATROSKA_ID_CLUSTER);
gst_ebml_write_uint (ebml, GST_MATROSKA_ID_CLUSTERTIMECODE, gst_ebml_write_uint (ebml, GST_MATROSKA_ID_CLUSTERTIMECODE,
gst_util_uint64_scale (timestamp, 1, mux->time_scale)); gst_util_uint64_scale (GST_BUFFER_TIMESTAMP (buf), 1,
mux->time_scale));
GST_LOG_OBJECT (mux, "cluster timestamp %" G_GUINT64_FORMAT, GST_LOG_OBJECT (mux, "cluster timestamp %" G_GUINT64_FORMAT,
gst_util_uint64_scale (timestamp, 1, mux->time_scale)); gst_util_uint64_scale (GST_BUFFER_TIMESTAMP (buf), 1,
gst_ebml_write_flush_cache (ebml, TRUE, timestamp); mux->time_scale));
mux->cluster_time = timestamp; gst_ebml_write_flush_cache (ebml, TRUE, GST_BUFFER_TIMESTAMP (buf));
mux->cluster_time = GST_BUFFER_TIMESTAMP (buf);
gst_ebml_write_uint (ebml, GST_MATROSKA_ID_PREVSIZE, gst_ebml_write_uint (ebml, GST_MATROSKA_ID_PREVSIZE,
mux->prev_cluster_size); mux->prev_cluster_size);
} }
@ -3367,21 +3359,14 @@ gst_matroska_mux_write_data (GstMatroskaMux * mux, GstMatroskaPad * collect_pad,
gst_ebml_write_set_cache (ebml, 0x20); gst_ebml_write_set_cache (ebml, 0x20);
mux->cluster = gst_ebml_write_master_start (ebml, GST_MATROSKA_ID_CLUSTER); mux->cluster = gst_ebml_write_master_start (ebml, GST_MATROSKA_ID_CLUSTER);
gst_ebml_write_uint (ebml, GST_MATROSKA_ID_CLUSTERTIMECODE, gst_ebml_write_uint (ebml, GST_MATROSKA_ID_CLUSTERTIMECODE,
gst_util_uint64_scale (timestamp, 1, mux->time_scale)); gst_util_uint64_scale (GST_BUFFER_TIMESTAMP (buf), 1, mux->time_scale));
gst_ebml_write_flush_cache (ebml, TRUE, timestamp); gst_ebml_write_flush_cache (ebml, TRUE, GST_BUFFER_TIMESTAMP (buf));
mux->cluster_time = timestamp; mux->cluster_time = GST_BUFFER_TIMESTAMP (buf);
} }
/* update duration of this track */ /* update duration of this track */
if (GST_BUFFER_DURATION_IS_VALID (buf)) { if (GST_BUFFER_DURATION_IS_VALID (buf))
GstClockTime end_time; collect_pad->duration += GST_BUFFER_DURATION (buf);
end_time = gst_segment_to_running_time (&collect_pad->collect.segment,
GST_FORMAT_TIME,
GST_BUFFER_TIMESTAMP (buf) + GST_BUFFER_DURATION (buf));
if (GST_CLOCK_TIME_IS_VALID (end_time))
collect_pad->duration += end_time - timestamp;
}
/* We currently write index entries for all video tracks or for the audio /* We currently write index entries for all video tracks or for the audio
* track in a single-track audio file. This could be improved by keeping the * track in a single-track audio file. This could be improved by keeping the
@ -3405,7 +3390,7 @@ gst_matroska_mux_write_data (GstMatroskaMux * mux, GstMatroskaPad * collect_pad,
} }
if (last_idx < 0 || mux->min_index_interval == 0 || if (last_idx < 0 || mux->min_index_interval == 0 ||
(GST_CLOCK_DIFF (mux->index[last_idx].time, timestamp) (GST_CLOCK_DIFF (mux->index[last_idx].time, GST_BUFFER_TIMESTAMP (buf))
>= mux->min_index_interval)) { >= mux->min_index_interval)) {
GstMatroskaIndex *idx; GstMatroskaIndex *idx;
@ -3416,7 +3401,7 @@ gst_matroska_mux_write_data (GstMatroskaMux * mux, GstMatroskaPad * collect_pad,
idx = &mux->index[mux->num_indexes++]; idx = &mux->index[mux->num_indexes++];
idx->pos = mux->cluster_pos; idx->pos = mux->cluster_pos;
idx->time = timestamp; idx->time = GST_BUFFER_TIMESTAMP (buf);
idx->track = collect_pad->track->num; idx->track = collect_pad->track->num;
} }
} }
@ -3438,7 +3423,7 @@ gst_matroska_mux_write_data (GstMatroskaMux * mux, GstMatroskaPad * collect_pad,
/* write the block, for doctype v2 use SimpleBlock if possible /* write the block, for doctype v2 use SimpleBlock if possible
* one slice (*breath*). * one slice (*breath*).
* FIXME: Need to do correct lacing! */ * FIXME: Need to do correct lacing! */
relative_timestamp64 = timestamp - mux->cluster_time; relative_timestamp64 = GST_BUFFER_TIMESTAMP (buf) - mux->cluster_time;
if (relative_timestamp64 >= 0) { if (relative_timestamp64 >= 0) {
/* round the timestamp */ /* round the timestamp */
relative_timestamp64 += gst_util_uint64_scale (mux->time_scale, 1, 2); relative_timestamp64 += gst_util_uint64_scale (mux->time_scale, 1, 2);
@ -3466,7 +3451,7 @@ gst_matroska_mux_write_data (GstMatroskaMux * mux, GstMatroskaPad * collect_pad,
gst_ebml_write_buffer_header (ebml, GST_MATROSKA_ID_SIMPLEBLOCK, gst_ebml_write_buffer_header (ebml, GST_MATROSKA_ID_SIMPLEBLOCK,
gst_buffer_get_size (buf) + gst_buffer_get_size (hdr)); gst_buffer_get_size (buf) + gst_buffer_get_size (hdr));
gst_ebml_write_buffer (ebml, hdr); gst_ebml_write_buffer (ebml, hdr);
gst_ebml_write_flush_cache (ebml, FALSE, timestamp); gst_ebml_write_flush_cache (ebml, FALSE, GST_BUFFER_TIMESTAMP (buf));
gst_ebml_write_buffer (ebml, buf); gst_ebml_write_buffer (ebml, buf);
return gst_ebml_last_write_result (ebml); return gst_ebml_last_write_result (ebml);
@ -3485,7 +3470,7 @@ gst_matroska_mux_write_data (GstMatroskaMux * mux, GstMatroskaPad * collect_pad,
gst_ebml_write_buffer (ebml, hdr); gst_ebml_write_buffer (ebml, hdr);
gst_ebml_write_master_finish_full (ebml, blockgroup, gst_ebml_write_master_finish_full (ebml, blockgroup,
gst_buffer_get_size (buf)); gst_buffer_get_size (buf));
gst_ebml_write_flush_cache (ebml, FALSE, timestamp); gst_ebml_write_flush_cache (ebml, FALSE, GST_BUFFER_TIMESTAMP (buf));
gst_ebml_write_buffer (ebml, buf); gst_ebml_write_buffer (ebml, buf);
return gst_ebml_last_write_result (ebml); return gst_ebml_last_write_result (ebml);
@ -3553,19 +3538,13 @@ gst_matroska_mux_handle_buffer (GstCollectPads * pads, GstCollectData * data,
/* make note of first and last encountered timestamps, so we can calculate /* make note of first and last encountered timestamps, so we can calculate
* the actual duration later when we send an updated header on eos */ * the actual duration later when we send an updated header on eos */
if (GST_BUFFER_TIMESTAMP_IS_VALID (buf)) { if (GST_BUFFER_TIMESTAMP_IS_VALID (buf)) {
GstClockTime start_ts = GstClockTime start_ts = GST_BUFFER_TIMESTAMP (buf);
gst_segment_to_running_time (&best->collect.segment, GST_FORMAT_TIME, GstClockTime end_ts = start_ts;
GST_BUFFER_TIMESTAMP (buf));
GstClockTime end_ts;
if (GST_BUFFER_DURATION_IS_VALID (buf)) if (GST_BUFFER_DURATION_IS_VALID (buf))
end_ts = end_ts += GST_BUFFER_DURATION (buf);
gst_segment_to_running_time (&best->collect.segment, GST_FORMAT_TIME,
GST_BUFFER_TIMESTAMP (buf) + GST_BUFFER_DURATION (buf));
else if (best->track->default_duration) else if (best->track->default_duration)
end_ts = start_ts + best->track->default_duration; end_ts += best->track->default_duration;
else
end_ts = start_ts;
if (!GST_CLOCK_TIME_IS_VALID (best->end_ts) || end_ts > best->end_ts) if (!GST_CLOCK_TIME_IS_VALID (best->end_ts) || end_ts > best->end_ts)
best->end_ts = end_ts; best->end_ts = end_ts;