diff options
| author | phintuka <phintuka> | 2010-05-12 10:45:00 +0000 |
|---|---|---|
| committer | phintuka <phintuka> | 2010-05-12 10:45:00 +0000 |
| commit | b84f1549c766645a28da98eb0e5a59ee67ced284 (patch) | |
| tree | 110f4c3170e64378212c54e9fa868459da78a0ea | |
| parent | af84e8bffa2450b60e921c248e0c39a236a87a14 (diff) | |
| download | xineliboutput-b84f1549c766645a28da98eb0e5a59ee67ced284.tar.gz xineliboutput-b84f1549c766645a28da98eb0e5a59ee67ced284.tar.bz2 | |
updates to 1.314:
- ensure that we make a channel switch at a scr buffer level of > 65,
even if we didn't reach the audio treshold
- more logging (Treshold plus free buffers and used buffers)
(Thanks to Dirk Brenken)
| -rw-r--r-- | xine_input_vdr.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/xine_input_vdr.c b/xine_input_vdr.c index 65d05833..a8238cbf 100644 --- a/xine_input_vdr.c +++ b/xine_input_vdr.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: xine_input_vdr.c,v 1.315 2010-04-16 09:33:17 phintuka Exp $ + * $Id: xine_input_vdr.c,v 1.316 2010-05-12 10:45:00 phintuka Exp $ * */ @@ -134,7 +134,7 @@ typedef struct { # include <linux/unistd.h> /* syscall(__NR_gettid) */ #endif -static const char module_revision[] = "$Id: xine_input_vdr.c,v 1.315 2010-04-16 09:33:17 phintuka Exp $"; +static const char module_revision[] = "$Id: xine_input_vdr.c,v 1.316 2010-05-12 10:45:00 phintuka Exp $"; static const char log_module_input_vdr[] = "[input_vdr] "; #define LOG_MODULENAME log_module_input_vdr #define SysLogLevel iSysLogLevel @@ -641,13 +641,14 @@ static void vdr_adjust_realtime_speed(vdr_input_plugin_t *this) if (scr_tuning == SCR_TUNING_PAUSED) { uint scr_treshold = 100 * num_used / (num_used + num_free); - LOGSCR("SCR-Treshold %2d%%", scr_treshold); + LOGSCR("SCR-T %2d%%, FB %d, UB %d", scr_treshold, num_free, num_used); uint audio_treshold = 100 * this->stream->audio_fifo->size (this->stream->audio_fifo) / (this->stream->audio_fifo->size (this->stream->audio_fifo) + 500); - LOGSCR("Audio-Treshold %2d%%", audio_treshold); - if ( (this->hd_stream && scr_treshold > this->class->scr_treshold_hd && audio_treshold > 0) - || (!this->hd_stream && scr_treshold > this->class->scr_treshold_sd && audio_treshold > 0) + LOGSCR("Audio-T %2d%%, UB %d", audio_treshold, this->stream->audio_fifo->size + (this->stream->audio_fifo)); + if ( (this->hd_stream && scr_treshold > this->class->scr_treshold_hd && (audio_treshold > 0 || scr_treshold > 65)) + || (!this->hd_stream && scr_treshold > this->class->scr_treshold_sd && (audio_treshold > 0 || scr_treshold > 65)) || (this->no_video && num_used > 5) || this->still_mode || this->is_trickspeed |