mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

videoaggregator: Don't update the ts-offset before updating the actual configured caps

Browse source
This commit is contained in:
Sebastian Dröge 2015-06-15 14:19:05 +02:00
parent 4f3adad607
commit 2f3735f3ec
1 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gst-libs/gst/video/gstvideoaggregator.c
View file

@ -692,14 +692,6 @@ gst_videoaggregator_update_src_caps (GstVideoAggregator * vagg)
GstVideoInfo info; GstVideoInfo info;
int i; int i;
if (GST_VIDEO_INFO_FPS_N (&vagg->info) != best_fps_n ||
GST_VIDEO_INFO_FPS_D (&vagg->info) != best_fps_d) {
if (agg->segment.position != -1) {
vagg->priv->ts_offset = agg->segment.position - agg->segment.start;
vagg->priv->nframes = 0;
}
}
/* Initialize the video info with our target format and /* Initialize the video info with our target format and
* the best width and height and framerate. Then copy over * the best width and height and framerate. Then copy over
* all other fields as we negotiated them before * all other fields as we negotiated them before
@ -746,7 +738,6 @@ gst_videoaggregator_update_src_caps (GstVideoAggregator * vagg)
if (peercaps) { if (peercaps) {
GstCaps *tmp; GstCaps *tmp;
tmp = gst_caps_intersect (caps, peercaps); tmp = gst_caps_intersect (caps, peercaps);
GST_DEBUG_OBJECT (vagg, "intersecting %" GST_PTR_FORMAT GST_DEBUG_OBJECT (vagg, "intersecting %" GST_PTR_FORMAT
" with peer caps %" GST_PTR_FORMAT " result %" GST_PTR_FORMAT, caps, " with peer caps %" GST_PTR_FORMAT " result %" GST_PTR_FORMAT, caps,