summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog5
-rw-r--r--src/xine-engine/Makefile.am2
-rw-r--r--src/xine-engine/input_cache.c328
-rw-r--r--src/xine-engine/xine.c22
4 files changed, 353 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 032c90b11..a0d1de918 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,7 +34,10 @@
* Simple libsmbclient (samba) input plugin
* improved DVB plugin with support for A52, subtitles, teletext and
EIT (electronic program guide).
-
+ * new request optimizer (cache) layer for input plugins to avoid the
+ overhead of expensive system calls for reading just a couple of
+ bytes. may be disabled with MRL parameter "#nocache".
+
xine-lib (1-rc6)
* Moved win32 frontend into separate module.
* Fixed Xv initialization to enable multiple instances of the Xv plugin
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am
index ac4d3e2f5..d207c3e3e 100644
--- a/src/xine-engine/Makefile.am
+++ b/src/xine-engine/Makefile.am
@@ -25,7 +25,7 @@ libxine_la_SOURCES = xine.c metronom.c configfile.c buffer.c \
audio_decoder.c video_out.c audio_out.c resample.c events.c \
video_overlay.c osd.c scratch.c demux.c vo_scale.c \
xine_interface.c post.c tvmode.c broadcaster.c io_helper.c \
- input_rip.c info_helper.c refcounter.c
+ input_rip.c input_cache.c info_helper.c refcounter.c
# FIXME: these are currently unused:
EXTRA_DIST = lrb.c lrb.h accel_xvmc.h
diff --git a/src/xine-engine/input_cache.c b/src/xine-engine/input_cache.c
new file mode 100644
index 000000000..92ca9735d
--- /dev/null
+++ b/src/xine-engine/input_cache.c
@@ -0,0 +1,328 @@
+/*
+ * Copyright (C) 2000-2004 the xine project
+ *
+ * This file is part of xine, a free video player.
+ *
+ * xine is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * xine is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * Buffered Input Plugin (request optimizer).
+ *
+ * The goal of this input plugin is to reduce
+ * the number of calls to the real input plugin.
+ *
+ * $Id: input_cache.c,v 1.1 2004/10/27 13:09:07 miguelfreitas Exp $
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#define LOG_MODULE "input_cache"
+#define LOG_VERBOSE
+/*
+#define LOG
+*/
+
+#include "xine_internal.h"
+
+#define BUFFER_SIZE 1024
+
+typedef struct {
+ input_plugin_t input_plugin; /* inherited structure */
+
+ input_plugin_t *main_input_plugin; /* original input plugin */
+ xine_stream_t *stream;
+ off_t cur_pos;
+
+ uint8_t buf[BUFFER_SIZE];
+ int buf_len;
+ int buf_pos;
+
+ /* Statistics */
+ int read_call;
+ int main_read_call;
+ int seek_call;
+ int main_seek_call;
+
+} cache_input_plugin_t;
+
+
+/*
+ * read data from input plugin and write it into file
+ */
+static off_t cache_plugin_read(input_plugin_t *this_gen, char *buf, off_t len) {
+ cache_input_plugin_t *this = (cache_input_plugin_t *)this_gen;
+ off_t read_len = 0;
+ off_t main_read;
+
+ lprintf("cache_plugin_read: len=%lld\n", len);
+ this->read_call++;
+
+ /* optimized for common cases */
+ if (len <= (this->buf_len - this->buf_pos)) {
+ /* all bytes are in the buffer */
+ switch (len) {
+ case 8:
+ *((uint64_t *)buf) = *(uint64_t *)(&(this->buf[this->buf_pos]));
+ break;
+ case 7:
+ buf[6] = (char)this->buf[this->buf_pos + 6];
+ /* fallthru */
+ case 6:
+ *((uint32_t *)buf) = *(uint32_t *)(&(this->buf[this->buf_pos]));
+ *((uint16_t *)&buf[4]) = *(uint16_t *)(&(this->buf[this->buf_pos + 4]));
+ break;
+ case 5:
+ buf[4] = (char)this->buf[this->buf_pos + 4];
+ /* fallthru */
+ case 4:
+ *((uint32_t *)buf) = *(uint32_t *)(&(this->buf[this->buf_pos]));
+ break;
+ case 3:
+ buf[2] = (char)this->buf[this->buf_pos + 2];
+ /* fallthru */
+ case 2:
+ *((uint16_t *)buf) = *(uint16_t *)(&(this->buf[this->buf_pos]));
+ break;
+ case 1:
+ *buf = (char)this->buf[this->buf_pos];
+ break;
+ default:
+ xine_fast_memcpy(buf, this->buf + this->buf_pos, len);
+ }
+ this->buf_pos += len;
+ read_len += len;
+
+ } else {
+ int in_buf_len;
+
+ /* copy internal buffer bytes */
+ in_buf_len = this->buf_len - this->buf_pos;
+ if (in_buf_len > 0) {
+ xine_fast_memcpy(buf, this->buf + this->buf_pos, in_buf_len);
+ len -= in_buf_len;
+ read_len += in_buf_len;
+ }
+ this->buf_len = 0;
+ this->buf_pos = 0;
+
+ /* read the rest */
+ if (len < BUFFER_SIZE) {
+ /* readahead bytes */
+ main_read = this->main_input_plugin->read(this->main_input_plugin, this->buf, BUFFER_SIZE);
+ this->main_read_call++;
+
+ if( main_read >= 0 ) {
+ this->buf_len = main_read;
+
+ if (len > this->buf_len)
+ len = this->buf_len;
+
+ if (len) {
+ xine_fast_memcpy(buf + read_len, this->buf, len);
+ this->buf_pos = len;
+ read_len += len;
+ }
+ } else {
+ /* read error: report return value to caller */
+ read_len = main_read;
+ }
+ } else {
+ /* direct read */
+ main_read = this->main_input_plugin->read(this->main_input_plugin, buf + read_len, len);
+ this->main_read_call++;
+
+ if( main_read >= 0 )
+ read_len += main_read;
+ else
+ /* read error: report return value to caller */
+ read_len = main_read;
+ }
+ }
+
+ if( read_len > 0 )
+ this->cur_pos += read_len;
+ return read_len;
+}
+
+/*
+ * open should never be called
+ */
+static int cache_plugin_open(input_plugin_t *this_gen) {
+ cache_input_plugin_t *this = (cache_input_plugin_t *)this_gen;
+
+ xine_log(this->stream->xine, XINE_LOG_MSG,
+ _(LOG_MODULE": open() function should never be called\n"));
+ return 0;
+}
+
+static uint32_t cache_plugin_get_capabilities(input_plugin_t *this_gen) {
+ cache_input_plugin_t *this = (cache_input_plugin_t *)this_gen;
+
+ return this->main_input_plugin->get_capabilities(this->main_input_plugin);
+}
+
+static buf_element_t *cache_plugin_read_block(input_plugin_t *this_gen, fifo_buffer_t *fifo, off_t todo) {
+ cache_input_plugin_t *this = (cache_input_plugin_t *)this_gen;
+ buf_element_t *buf;
+ int in_buf_len;
+
+ in_buf_len = this->buf_len - this->buf_pos;
+ if (in_buf_len > 0) {
+ off_t read_len;
+
+ /* hmmm, the demuxer mixes read and read_block */
+ buf = fifo->buffer_pool_alloc (fifo);
+ if (buf) {
+ buf->type = BUF_DEMUX_BLOCK;
+
+ read_len = cache_plugin_read (this_gen, buf->content, todo);
+ buf->size = read_len;
+ }
+ } else {
+ buf = this->main_input_plugin->read_block(this->main_input_plugin, fifo, todo);
+ this->read_call++;
+ this->main_read_call++;
+ this->cur_pos += buf->size;
+ }
+ return buf;
+}
+
+static off_t cache_plugin_seek(input_plugin_t *this_gen, off_t offset, int origin) {
+ cache_input_plugin_t *this = (cache_input_plugin_t *)this_gen;
+ off_t abs_offset;
+ off_t rel_offset;
+ off_t new_buf_pos;
+
+ lprintf("offset: %lld, origin: %d\n", offset, origin);
+ this->seek_call++;
+
+ switch (origin) {
+ case SEEK_CUR:
+ abs_offset = this->cur_pos + offset;
+ rel_offset = offset;
+ break;
+
+ case SEEK_SET:
+ abs_offset = offset;
+ rel_offset = offset - this->cur_pos;
+ break;
+
+ default:
+ /* invalid origin */
+ return this->cur_pos;
+ }
+
+
+ new_buf_pos = (off_t)this->buf_pos + rel_offset;
+ lprintf("buf_len: %d, abs_offset=%lld, rel_offset=%lld, new_buf_pos=%lld\n",
+ this->buf_len, abs_offset, rel_offset, new_buf_pos);
+
+ if ((new_buf_pos < 0) || (new_buf_pos >= this->buf_len)) {
+ this->buf_len = this->buf_pos = 0;
+ this->cur_pos = this->main_input_plugin->seek(this->main_input_plugin, abs_offset, SEEK_SET);
+ this->main_seek_call++;
+ } else {
+ this->buf_pos = (int)new_buf_pos;
+ this->cur_pos = abs_offset;
+ }
+ return this->cur_pos;
+}
+
+static off_t cache_plugin_get_current_pos(input_plugin_t *this_gen) {
+ cache_input_plugin_t *this = (cache_input_plugin_t *)this_gen;
+
+ return this->cur_pos;
+}
+
+static off_t cache_plugin_get_length (input_plugin_t *this_gen) {
+ cache_input_plugin_t *this = (cache_input_plugin_t *)this_gen;
+
+ return this->main_input_plugin->get_length(this->main_input_plugin);
+}
+
+static uint32_t cache_plugin_get_blocksize(input_plugin_t *this_gen) {
+ cache_input_plugin_t *this = (cache_input_plugin_t *)this_gen;
+
+ return this->main_input_plugin->get_blocksize(this->main_input_plugin);
+}
+
+static char* cache_plugin_get_mrl (input_plugin_t *this_gen) {
+ cache_input_plugin_t *this = (cache_input_plugin_t *)this_gen;
+
+ return this->main_input_plugin->get_mrl(this->main_input_plugin);
+}
+
+static int cache_plugin_get_optional_data (input_plugin_t *this_gen,
+ void *data, int data_type) {
+ cache_input_plugin_t *this = (cache_input_plugin_t *)this_gen;
+
+ return this->main_input_plugin->get_optional_data(
+ this->main_input_plugin, data, data_type);
+}
+
+/*
+ * dispose main input plugin and self
+ */
+static void cache_plugin_dispose(input_plugin_t *this_gen) {
+ cache_input_plugin_t *this = (cache_input_plugin_t *)this_gen;
+
+ lprintf("cache_plugin_dispose\n");
+
+ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
+ LOG_MODULE": read calls: %d, main input read calls: %d\n", this->read_call, this->main_read_call);
+ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
+ LOG_MODULE": seek_calls: %d, main input seek calls: %d\n", this->seek_call, this->main_seek_call);
+
+ this->main_input_plugin->dispose(this->main_input_plugin);
+ free(this);
+}
+
+
+/*
+ * create self instance,
+ */
+input_plugin_t *_x_cache_plugin_get_instance (xine_stream_t *stream, int readahead_size) {
+ cache_input_plugin_t *this;
+ input_plugin_t *main_plugin = stream->input_plugin;
+
+ /* check given input plugin */
+ if (!stream->input_plugin) {
+ xine_log(stream->xine, XINE_LOG_MSG, _(LOG_MODULE": input plugin not defined!\n"));
+ return NULL;
+ }
+
+ lprintf("mrl: %s\n", main_plugin->get_mrl(main_plugin));
+
+ this = (cache_input_plugin_t *)xine_xmalloc(sizeof(cache_input_plugin_t));
+ this->main_input_plugin = main_plugin;
+ this->stream = stream;
+
+ this->input_plugin.open = cache_plugin_open;
+ this->input_plugin.get_capabilities = cache_plugin_get_capabilities;
+ this->input_plugin.read = cache_plugin_read;
+ this->input_plugin.read_block = cache_plugin_read_block;
+ this->input_plugin.seek = cache_plugin_seek;
+ this->input_plugin.get_current_pos = cache_plugin_get_current_pos;
+ this->input_plugin.get_length = cache_plugin_get_length;
+ this->input_plugin.get_blocksize = cache_plugin_get_blocksize;
+ this->input_plugin.get_mrl = cache_plugin_get_mrl;
+ this->input_plugin.get_optional_data = cache_plugin_get_optional_data;
+ this->input_plugin.dispose = cache_plugin_dispose;
+ this->input_plugin.input_class = main_plugin->input_class;
+
+ return &this->input_plugin;
+}
+
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index 40e0b5513..4baba394c 100644
--- a/src/xine-engine/xine.c
+++ b/src/xine-engine/xine.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: xine.c,v 1.299 2004/10/14 23:44:09 tmattern Exp $
+ * $Id: xine.c,v 1.300 2004/10/27 13:09:07 miguelfreitas Exp $
*/
/*
@@ -627,7 +627,8 @@ void _x_flush_events_queues (xine_stream_t *stream) {
static int __open_internal (xine_stream_t *stream, const char *mrl) {
const char *stream_setup;
-
+ int no_cache = 0;
+
if (!mrl) {
xprintf (stream->xine, XINE_VERBOSITY_LOG, _("xine: error while parsing mrl\n"));
stream->err = XINE_ERROR_MALFORMED_MRL;
@@ -844,6 +845,19 @@ static int __open_internal (xine_stream_t *stream, const char *mrl) {
xprintf (stream->xine, XINE_VERBOSITY_LOG, _("ignoring subpicture\n"));
continue;
}
+ if (strncasecmp(stream_setup, "nocache", 7) == 0) {
+ stream_setup += 7;
+ if (*stream_setup == ';' || *stream_setup == '\0') {
+ no_cache = 1;
+ } else {
+ xprintf(stream->xine, XINE_VERBOSITY_LOG, _("xine: error while parsing mrl\n"));
+ stream->err = XINE_ERROR_MALFORMED_MRL;
+ stream->status = XINE_STATUS_STOP;
+ return 0;
+ }
+ xprintf (stream->xine, XINE_VERBOSITY_LOG, _("input cache plugin disabled\n"));
+ continue;
+ }
if (strncasecmp(stream_setup, "volume", 6) == 0) {
if (*(stream_setup += 6) == ':') {
const char *tmp = ++stream_setup;
@@ -965,6 +979,10 @@ static int __open_internal (xine_stream_t *stream, const char *mrl) {
}
+ if( !no_cache )
+ /* enable buffered input plugin (request optimizer) */
+ stream->input_plugin = _x_cache_plugin_get_instance(stream, 0);
+
if (!stream->demux_plugin) {
/*
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-22 13:46:34 +0000