diff options
| author | Lyubomir Marinov <lyubomir.marinov@jitsi.org> | 2010-05-16 22:00:14 +0000 |
|---|---|---|
| committer | Lyubomir Marinov <lyubomir.marinov@jitsi.org> | 2010-05-16 22:00:14 +0000 |
| commit | fd5c3ed8b6840eae1b14341b85db613226733178 (patch) | |
| tree | 1e3a97948e065a077d4b9bbd24ddc9f5580dd569 /src/net/java | |
| parent | 2bf12e9a07991abff47f02d3d50e3197a3bc8e51 (diff) | |
| download | jitsi-fd5c3ed8b6840eae1b14341b85db613226733178.zip jitsi-fd5c3ed8b6840eae1b14341b85db613226733178.tar.gz jitsi-fd5c3ed8b6840eae1b14341b85db613226733178.tar.bz2 | |
Disables the local video display for PullBufferDataSources until its problem with cloning by JMF is resolved. Provides timestamps for the captured data of the Video for Linux Two API Specification CaptureDevice.
Diffstat (limited to 'src/net/java')
2 files changed, 8 insertions, 3 deletions
diff --git a/src/net/java/sip/communicator/impl/neomedia/device/VideoMediaDeviceSession.java b/src/net/java/sip/communicator/impl/neomedia/device/VideoMediaDeviceSession.java index 4547629..2b76534 100644 --- a/src/net/java/sip/communicator/impl/neomedia/device/VideoMediaDeviceSession.java +++ b/src/net/java/sip/communicator/impl/neomedia/device/VideoMediaDeviceSession.java @@ -186,10 +186,10 @@ public class VideoMediaDeviceSession } /* - * FIXME AbstractPullBufferCaptureDevice (or PullBufferDataSource?) - * does not seem to be correctly cloned by JMF. + * FIXME PullBufferDataSource does not seem to be correctly cloned + * by JMF. */ - if (!(captureDevice instanceof AbstractPullBufferCaptureDevice)) + if (!(captureDevice instanceof PullBufferDataSource)) { DataSource cloneableDataSource = Manager.createCloneableDataSource(captureDevice); diff --git a/src/net/java/sip/communicator/impl/neomedia/jmfext/media/protocol/video4linux2/Video4Linux2Stream.java b/src/net/java/sip/communicator/impl/neomedia/jmfext/media/protocol/video4linux2/Video4Linux2Stream.java index 025f990..cbe4796 100644 --- a/src/net/java/sip/communicator/impl/neomedia/jmfext/media/protocol/video4linux2/Video4Linux2Stream.java +++ b/src/net/java/sip/communicator/impl/neomedia/jmfext/media/protocol/video4linux2/Video4Linux2Stream.java @@ -423,6 +423,8 @@ public class Video4Linux2Stream == -1) throw new IOException("ioctl: request= VIDIOC_DQBUF"); + long timeStamp = System.nanoTime(); + try { int bytesused = Video4Linux2.v4l2_buffer_getBytesused(v4l2_buffer); @@ -444,6 +446,9 @@ public class Video4Linux2Stream == -1) throw new IOException("ioctl: request= VIDIOC_QBUF"); } + + buffer.setFlags(Buffer.FLAG_LIVE_DATA | Buffer.FLAG_SYSTEM_TIME); + buffer.setTimeStamp(timeStamp); } /** |