git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
a6d3a3d
)
flush PVR
author
Felix Domke
<tmbinc@elitedvb.net>
Sun, 13 Nov 2005 18:25:50 +0000
(18:25 +0000)
committer
Felix Domke
<tmbinc@elitedvb.net>
Sun, 13 Nov 2005 18:25:50 +0000
(18:25 +0000)
lib/dvb/dvb.cpp
patch
|
blob
|
history
diff --git
a/lib/dvb/dvb.cpp
b/lib/dvb/dvb.cpp
index a2a37758c37cdda449bf5f14a4cced62503e4fdf..31cf7720722a31229de0bdf304498c1ef69ca22b 100644
(file)
--- a/
lib/dvb/dvb.cpp
+++ b/
lib/dvb/dvb.cpp
@@
-9,6
+9,7
@@
#include <sys/stat.h>
#include <unistd.h>
#include <fcntl.h>
#include <sys/stat.h>
#include <unistd.h>
#include <fcntl.h>
+#include <sys/ioctl.h>
DEFINE_REF(eDVBRegisteredFrontend);
DEFINE_REF(eDVBRegisteredDemux);
DEFINE_REF(eDVBRegisteredFrontend);
DEFINE_REF(eDVBRegisteredDemux);
@@
-638,10
+639,29
@@
RESULT eDVBChannel::seekTo(pts_t &pts)
RESULT eDVBChannel::seekToPosition(int relative, const off_t &r)
{
RESULT eDVBChannel::seekToPosition(int relative, const off_t &r)
{
+ /* when seeking, we have to ensure that all buffers are flushed.
+ there are basically 3 buffers:
+ a.) the filepush's internal buffer
+ b.) the PVR buffer (before demux)
+ c.) the ratebuffer (after demux)
+
+ it's important to clear them in the correct order, otherwise
+ the ratebuffer (for example) would immediately refill from
+ the not-yet-flushed PVR buffer.
+ */
eDebug("eDVBChannel: seekToPosition .. %llx", r);
m_pvr_thread->pause();
eDebug("eDVBChannel: seekToPosition .. %llx", r);
m_pvr_thread->pause();
+
+ /* flush internal filepush buffer */
+ m_pvr_thread->flush();
+
+ /* HACK: flush PVR buffer */
+ ::ioctl(m_pvr_fd_dst, 0);
+
+ /* flush ratebuffers (video, audio) */
if (m_decoder_demux)
m_decoder_demux->get().flush();
if (m_decoder_demux)
m_decoder_demux->get().flush();
+
/* demux will also flush all decoder.. */
m_pvr_thread->seek(relative ? SEEK_CUR : SEEK_SET, r);
m_pvr_thread->resume();
/* demux will also flush all decoder.. */
m_pvr_thread->seek(relative ? SEEK_CUR : SEEK_SET, r);
m_pvr_thread->resume();