summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorcehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-06-20 10:39:57 +0000
committercehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-06-20 10:39:57 +0000
commit634dfcbed7891edf14c2eb620b02c2e75f83e527 (patch)
treec93bff743da32a36b0cdec016f8a67464f479c7c /libmpdemux
parentbe09bd1c047fc84c7ac73c93ba26fe6a8787341c (diff)
downloadmpv-634dfcbed7891edf14c2eb620b02c2e75f83e527.tar.bz2
mpv-634dfcbed7891edf14c2eb620b02c2e75f83e527.tar.xz
Simplify network timeout calculation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23589 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_rtp.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/libmpdemux/demux_rtp.cpp b/libmpdemux/demux_rtp.cpp
index f6b7b38829..5d2698394f 100644
--- a/libmpdemux/demux_rtp.cpp
+++ b/libmpdemux/demux_rtp.cpp
@@ -504,8 +504,9 @@ static demux_packet_t* getBuffer(demuxer_t* demuxer, demux_stream_t* ds,
// Block ourselves until data becomes available:
TaskScheduler& scheduler
= bufferQueue->readSource()->envir().taskScheduler();
- int delay = bufferQueue->prevPacketPTS * 1.05 >
- rtpState->mediaSession->playEndTime() ? 1000000 : 10000000;
+ int delay = 10000000;
+ if (bufferQueue->prevPacketPTS * 1.05 > rtpState->mediaSession->playEndTime())
+ delay /= 10;
task = scheduler.scheduleDelayedTask(delay, onSourceClosure, bufferQueue);
scheduler.doEventLoop(&bufferQueue->blockingFlag);
scheduler.unscheduleDelayedTask(task);