diff options
| author | Edward Hervey <bilboed@bilboed.com> | 2008-12-28 15:28:40 +0000 |
|---|---|---|
| committer | Edward Hervey <bilboed@bilboed.com> | 2008-12-28 15:28:40 +0000 |
| commit | a9abce199c7bb10493955dc48657b3cfc04bb2a0 (patch) | |
| tree | 1ae9058c58f4d789d66e455a2e6c2481aa71f0c6 | |
| parent | 087bd20e247f131302ab53715494b4999404326c (diff) | |
gnl/gnlcomposition.c: Refine means "do not EXTEND the region" !
Original commit message from CVS:
* gnl/gnlcomposition.c: (refine_start_stop_in_region_above_priority):
Refine means "do not EXTEND the region" !
This should fix more issues with complex timelines.
| -rw-r--r-- | ChangeLog | 6 | ||||
| m--------- | common | 0 | ||||
| -rw-r--r-- | gnl/gnlcomposition.c | 6 |
3 files changed, 12 insertions, 0 deletions
@@ -1,3 +1,9 @@ +2008-12-28 Edward Hervey <edward.hervey@collabora.co.uk> + + * gnl/gnlcomposition.c: (refine_start_stop_in_region_above_priority): + Refine means "do not EXTEND the region" ! + This should fix more issues with complex timelines. + 2008-12-14 Edward Hervey <edward.hervey@collabora.co.uk> * gnl/gnlsource.c: (gnl_source_send_event): diff --git a/common b/common -Subproject 369b5ddf40b43dacff98fe63d25aac442377a1a +Subproject 5dc8ae302733ce1aae5b1aaa613ce77a8ae4b3d diff --git a/gnl/gnlcomposition.c b/gnl/gnlcomposition.c index e8c3b94..a002a55 100644 --- a/gnl/gnlcomposition.c +++ b/gnl/gnlcomposition.c @@ -1033,6 +1033,9 @@ refine_start_stop_in_region_above_priority (GnlComposition * composition, if (object->start <= timestamp) continue; + if (object->start >= nstop) + continue; + nstop = object->start; GST_DEBUG_OBJECT (composition, "START Found %s [prio:%u] at %" GST_TIME_FORMAT, @@ -1053,6 +1056,9 @@ refine_start_stop_in_region_above_priority (GnlComposition * composition, if (object->stop >= timestamp) continue; + if (object->stop <= nstart) + continue; + nstart = object->stop; GST_DEBUG_OBJECT (composition, "STOP Found %s [prio:%u] at %" GST_TIME_FORMAT, |