From 33a7be006f5616af90db6deca50e81d71f0e6101 Mon Sep 17 00:00:00 2001
From: Guenter Bartsch <guenter@users.sourceforge.net>
Date: Sat, 23 Mar 2002 21:57:30 +0000
Subject: adding preview feature to http input plugin, make demux_ts use it

CVS patchset: 1622
CVS date: 2002/03/23 21:57:30
---
 src/demuxers/demux_ts.c | 15 ++++++++---
 src/input/input_http.c  | 67 ++++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 64 insertions(+), 18 deletions(-)

diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c
index ad8d31e39..183af37e2 100644
--- a/src/demuxers/demux_ts.c
+++ b/src/demuxers/demux_ts.c
@@ -1,7 +1,7 @@
 /*
- * Copyright (C) 2000, 2001 the xine project
+ * Copyright (C) 2000-2002 the xine project
  *
- * This file is part of xine, a unix video player.
+ * 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
@@ -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: demux_ts.c,v 1.38 2002/03/11 12:31:24 guenter Exp $
+ * $Id: demux_ts.c,v 1.39 2002/03/23 21:57:30 guenter Exp $
  *
  * Demultiplexer for MPEG2 Transport Streams.
  *
@@ -1209,6 +1209,15 @@ static int demux_ts_open(demux_plugin_t *this_gen, input_plugin_t *input,
        }
       }
     }
+
+    if (input->get_optional_data (input, buf, INPUT_OPTIONAL_DATA_PREVIEW)) {
+
+      if(buf[0] == 0x47) {
+	this->input = input;
+	return DEMUX_CAN_HANDLE;
+      }
+    }
+
     return DEMUX_CANNOT_HANDLE;
   }
   break;
diff --git a/src/input/input_http.c b/src/input/input_http.c
index 3c1c081c4..e0b09d1a4 100644
--- a/src/input/input_http.c
+++ b/src/input/input_http.c
@@ -43,6 +43,7 @@
 
 extern int errno;
 
+#define PREVIEW_SIZE            2200
 #define BUFSIZE 1024
 
 #define DEFAULT_HTTP_PORT 80
@@ -78,6 +79,11 @@ typedef struct {
   char            *proxypassword;
   char            *proxyhost;
   int              proxyport;
+
+  char             preview[PREVIEW_SIZE];
+  off_t            preview_size;
+  off_t            preview_pos;
+
 } http_input_plugin_t;
 
 
@@ -276,6 +282,9 @@ static int http_plugin_basicauth (const char *user, const char *password,
   return 0;
 }
 
+static off_t http_plugin_read (input_plugin_t *this_gen, 
+			       char *buf, off_t nlen) ;
+
 static int http_plugin_open (input_plugin_t *this_gen, char *mrl) {
 
   http_input_plugin_t *this = (http_input_plugin_t *) this_gen;
@@ -478,6 +487,14 @@ static int http_plugin_open (input_plugin_t *this_gen, char *mrl) {
 
   this->nbc    = nbc_init (this->xine);
 
+  /*
+   * fill preview buffer
+   */
+
+  this->preview_size = http_plugin_read (&this->input_plugin, this->preview,
+					 PREVIEW_SIZE);
+  this->preview_pos  = 0;
+
   return 1;
 }
 
@@ -492,7 +509,23 @@ static off_t http_plugin_read (input_plugin_t *this_gen,
 
   while (num_bytes < nlen) {
 
-    n = read (this->fh, &buf[num_bytes], nlen - num_bytes);
+    if (this->preview_pos < this->preview_size) {
+
+      n = this->preview_size - this->preview_pos;
+      if (n > (nlen - num_bytes)) 
+	n = nlen - num_bytes;
+
+#ifdef LOG
+      printf ("stdin: %lld bytes from preview (which has %lld bytes)\n",
+	      n, this->preview_size);
+#endif
+
+      memcpy (&buf[num_bytes], &this->preview[this->preview_pos], n);
+
+      this->preview_pos += n;
+
+    } else
+      n = read (this->fh, &buf[num_bytes], nlen - num_bytes);
 
     if (n <= 0) {
       
@@ -524,7 +557,7 @@ static void pool_release_buffer (void *arg) {
 
 static buf_element_t *http_plugin_read_block (input_plugin_t *this_gen, fifo_buffer_t *fifo, off_t todo) {
 
-  off_t                 num_bytes, total_bytes;
+  off_t                 total_bytes;
   http_input_plugin_t  *this = (http_input_plugin_t *) this_gen;
   buf_element_t        *buf = fifo->buffer_pool_alloc (fifo);
 
@@ -535,19 +568,12 @@ static buf_element_t *http_plugin_read_block (input_plugin_t *this_gen, fifo_buf
 
   buf->content = buf->mem;
   buf->type = BUF_DEMUX_BLOCK;
-  total_bytes = 0;
-
-  while (total_bytes < todo) {
-    pthread_testcancel();
-    num_bytes = read (this->fh, buf->mem + total_bytes, todo-total_bytes);
-    if (num_bytes < 0) {
-      xine_log (this->xine, XINE_LOG_MSG, _("input_http: read error (%s)\n"), strerror (errno));
-      buf->free_buffer (buf);
-      buf = NULL;
-      break;
-    }
-    total_bytes += num_bytes;
-    this->curpos += num_bytes;
+
+  total_bytes = http_plugin_read (this_gen, buf->content, todo);
+
+  if (total_bytes != todo) {
+    buf->free_buffer (buf);
+    buf = NULL;
   }
 
   if (buf != NULL)
@@ -619,6 +645,17 @@ static char* http_plugin_get_mrl (input_plugin_t *this_gen) {
 static int http_plugin_get_optional_data (input_plugin_t *this_gen, 
 					  void *data, int data_type) {
 
+  http_input_plugin_t *this = (http_input_plugin_t *) this_gen;
+
+  switch (data_type) {
+  case INPUT_OPTIONAL_DATA_PREVIEW:
+
+    memcpy (data, this->preview, this->preview_size);
+    return this->preview_size;
+
+    break;
+  }
+
   return INPUT_OPTIONAL_UNSUPPORTED;
 }
 
-- 
cgit v1.2.3