diff options
| author | Johns <johns98@gmx.net> | 2012-06-30 15:40:33 +0200 |
|---|---|---|
| committer | Johns <johns98@gmx.net> | 2012-06-30 15:40:33 +0200 |
| commit | b5162bae5c0afc83f70dcc4ce1eb6dd77bad8559 (patch) | |
| tree | 0da783170b38d6be207ba68dc57663be873e7ef8 | |
| parent | d486fb2ca1e27fa66a52dcf60506cba6d9d464d2 (diff) | |
| download | vdr-plugin-softhddevice-b5162bae5c0afc83f70dcc4ce1eb6dd77bad8559.tar.gz vdr-plugin-softhddevice-b5162bae5c0afc83f70dcc4ce1eb6dd77bad8559.tar.bz2 | |
Fix bug: 100% CPU use during playback.
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | softhddev.c | 13 |
2 files changed, 10 insertions, 4 deletions
@@ -2,6 +2,7 @@ User johns Date: Release Version 0.5.1 + Fix bug: 100% CPU use during playback. Fix bug: audio use 100% CPU during pause. Guard audio skip against old PTS values. Improved audio skip, after channel switch. diff --git a/softhddev.c b/softhddev.c index b45b198..57858ed 100644 --- a/softhddev.c +++ b/softhddev.c @@ -2181,10 +2181,15 @@ int Poll(int timeout) #else int full; int t; - - // one buffer is full - full = AudioFreeBytes() < AUDIO_MIN_BUFFER_FREE - || atomic_read(&VideoPacketsFilled) > VIDEO_PACKET_MAX - 3; + int used; + int filled; + + used = AudioUsedBytes(); + filled = atomic_read(&VideoPacketsFilled); + // soft limit + hard limit + full = (used > AUDIO_MIN_BUFFER_FREE && filled > 3) + || AudioFreeBytes() < AUDIO_MIN_BUFFER_FREE + || filled >= VIDEO_PACKET_MAX - 3; if (!full || !timeout) { return !full; |