Skip to content

Commit 0868270

Browse files
committed
Merge branch 'hotfix/compensate-ts-dts-none'
2 parents e73e3ab + 51993aa commit 0868270

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dnl please read gstreamer/docs/random/autotools before changing this file
66
dnl initialize autoconf
77
dnl releases only do -Wall, git and prerelease does -Werror too
88
dnl use a three digit version number for releases, and four for git/pre
9-
AC_INIT([GstInterpipe],[1.1.8],
9+
AC_INIT([GstInterpipe],[1.1.9],
1010
[http://www.github.com/RidgeRun/gst-interpipe-1.0],
1111
[gst-interpipe],
1212
[http://developer.ridgerun.com/wiki/index.php?title=GstInterpipe])

gst/interpipe/gstinterpipesrc.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -658,15 +658,19 @@ gst_inter_pipe_src_push_buffer (GstInterPipeIListener * iface,
658658
difftime = srcbasetime - basetime;
659659
if (GST_BUFFER_PTS (buffer) >= difftime) {
660660
GST_BUFFER_PTS (buffer) = GST_BUFFER_PTS (buffer) - difftime;
661-
GST_BUFFER_DTS (buffer) = GST_BUFFER_DTS (buffer) - difftime;
661+
if (GST_BUFFER_DTS (buffer) != GST_CLOCK_TIME_NONE ) {
662+
GST_BUFFER_DTS (buffer) = GST_BUFFER_DTS (buffer) - difftime;
663+
}
662664
} else {
663665
gst_buffer_unref (buffer);
664666
goto nosync;
665667
}
666668
} else {
667669
difftime = basetime - srcbasetime;
668670
GST_BUFFER_PTS (buffer) = GST_BUFFER_PTS (buffer) + difftime;
669-
GST_BUFFER_DTS (buffer) = GST_BUFFER_DTS (buffer) + difftime;
671+
if (GST_BUFFER_DTS (buffer) != GST_CLOCK_TIME_NONE ) {
672+
GST_BUFFER_DTS (buffer) = GST_BUFFER_DTS (buffer) + difftime;
673+
}
670674
}
671675
} else {
672676
/* srcbasetime is only valid when PLAYING, no adjustment can be done */

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
project('gst-interpipes', 'c',
2-
version : '1.1.8',
2+
version : '1.1.9',
33
meson_version : '>= 0.50',)
44

55
gst_interpipes_version = meson.project_version()

0 commit comments

Comments
 (0)