diff options
-rw-r--r-- | dxr3interface.c | 15 | ||||
-rw-r--r-- | dxr3interface.h | 3 |
2 files changed, 4 insertions, 14 deletions
diff --git a/dxr3interface.c b/dxr3interface.c index 339610b..c9d748c 100644 --- a/dxr3interface.c +++ b/dxr3interface.c @@ -57,23 +57,18 @@ int cDxr3Interface::OssSetPlayMode(uint32_t mode) // ================================== void cDxr3Interface::SetSysClock(uint32_t scr) { - uint32_t sc; - Lock(); - CHECK(ioctl(m_fdControl, EM8300_IOCTL_SCR_GET, &sc)); - m_offset = scr - sc; + CHECK(ioctl(m_fdControl, EM8300_IOCTL_SCR_SET, &scr)); Unlock(); } // ================================== uint32_t cDxr3Interface::GetSysClock() { - uint32_t sc; uint32_t retval; Lock(); - CHECK(ioctl(m_fdControl, EM8300_IOCTL_SCR_GET, &sc)); - retval = sc + m_offset; + CHECK(ioctl(m_fdControl, EM8300_IOCTL_SCR_GET, &retval)); Unlock(); return retval; @@ -82,11 +77,9 @@ uint32_t cDxr3Interface::GetSysClock() // ================================== void cDxr3Interface::SetPts(uint32_t pts) { - uint32_t newPts = 0; Lock(); - newPts = pts - m_offset; - CHECK(ioctl(m_fdVideo, EM8300_IOCTL_VIDEO_SETPTS, &newPts)); + CHECK(ioctl(m_fdVideo, EM8300_IOCTL_VIDEO_SETPTS, &pts)); Unlock(); } @@ -96,7 +89,7 @@ void cDxr3Interface::SetSpuPts(uint32_t pts) uint32_t newPts = 0; Lock(); - newPts = (pts - m_offset) << 1; // fix for DVD subtitles + newPts = pts << 1; // fix for DVD subtitles CHECK(ioctl(m_fdSpu, EM8300_IOCTL_SPU_SETPTS, &newPts)); Unlock(); } diff --git a/dxr3interface.h b/dxr3interface.h index 80fa7c5..345c9eb 100644 --- a/dxr3interface.h +++ b/dxr3interface.h @@ -128,9 +128,6 @@ private: int m_fdVideo; ///< filehandle for video fifo of dxr3 card int m_fdSpu; ///< filehandle for spu fifo of dxr3 card - // clock - uint32_t m_offset; - uint32_t m_aspectRatio; ///< current used aspect ratio uint32_t m_horizontal; ///< horizontal size of current videostream uint32_t m_vertical; ///< vertical size of current videostream |