Ticket #1532: vlc-http-seek.patch

a/modules/access/http.c

@@ -58 +58 @@
-static int  Open ( vlc_object_t * );
-static void Close( vlc_object_t * );
-
+/*
+ *  The minimum amount of data to read in a single request.  This should be
+ *  on the order of 60ms worth of data for medium quality 480p divx video.
+ */
+#define HTTP_MIN_BLOCKSIZE 0x4000L
+/*
+ *  The maximum amount of data to read in a 'fast seek' request.
+ *  This corresponds to about half a second of medium quality
+ *  480p divx video.
+ */
+#define HTTP_SEEK_BLOCKSIZE 0x20000L
+/*
+ * The maximum amount of data to read in a single request.  This corresponds
+ * to about 8 seconds medium quality 480p divx video.
+ */
+#define HTTP_MAX_BLOCKSIZE 0x200000L
+
-#define PROXY_TEXT N_("HTTP proxy")
-#define PROXY_LONGTEXT N_( \
-    "HTTP proxy to be used It must be of the form " \
@@ -178 +195 @@
-    char       *psz_icy_genre;
-    char       *psz_icy_title;
-
-
+
+
-
-    bool b_seekable;
-    bool b_reconnect;
@@ -195 +213 @@
-static ssize_t Read( access_t *, uint8_t *, size_t );
-static ssize_t ReadCompressed( access_t *, uint8_t *, size_t );
-static int Seek( access_t *, int64_t );
+static int SkipForward( access_t *, int64_t );
-static int Control( access_t *, int, va_list );
-
-/* */
@@ -268 +287 @@
-    p_sys->psz_icy_genre = NULL;
-    p_sys->psz_icy_title = NULL;
-    p_sys->i_remaining = 0;
-
+
-    p_sys->cookies = saved_cookies;
-
-    /* Parse URI - remove spaces */
@@ -588 +607 @@
-    }
-
-    if( p_access->info.i_size > 0 &&
-i_len + p_access->info.i_pos > 
+(int64_t)(i_len + p_access->info.i_pos) > (int64_t)
-    {
-        if( ( i_len = p_access->info.i_size - p_access->info.i_pos ) == 0 )
-        {
@@ -626 +645 @@
-            }
-        }
-
-
+(int64_t)
-        {
-
+(size_t)
-        }
-    }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    {
-        /* Only ask for the remaining length */
-        int i_new_len = p_sys->i_remaining;
-        if( i_new_len == 0 )
-        {
-
-
-
+
+
+
+
+
-        }
-        i_len = i_new_len;
-    }
@@ -658 +697 @@
-                return -1;
-            }
-        }
-
-
+(int64_t)
+(size_t)
-    }
-
-    i_read = net_Read( p_access, p_sys->fd, p_sys->p_vs, p_buffer, i_len, false );
@@ -713 +752 @@
-        if( i_read == 0 ) p_access->info.b_eof = true;
-    }
-
-
-
-
-
+
-
-    return i_read;
-}
@@ -822 +858 @@
-#endif
-
-/*****************************************************************************
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- *****************************************************************************/
-static int Seek( access_t *p_access, int64_t i_pos )
-{
-, i_pos
+"/"PRId64, i_pos, p_access->info.i_size
-
+    if( i_pos < 0 )
+    {
+        msg_Err( p_access, "seeking too early" );
+        return Seek( p_access, 0);
+    }
+    if( i_pos > p_access->info.i_size )
+    {
+        msg_Err( p_access, "seeking too far" );
+        // Fix me: This replicates the file.c behavior of returning
+        // success even when seeking too far.
+        return Seek( p_access, p_access->info.i_size );
+    }
+    // we can use the skip data to seek forward
+    access_sys_t *p_sys = p_access->p_sys;
+    if( i_pos > p_access->info.i_pos) {
+        int64_t i_needed = i_pos - p_access->info.i_pos;
+        if( (i_needed <= HTTP_SEEK_BLOCKSIZE)||(p_sys->i_remaining <= HTTP_SEEK_BLOCKSIZE) ) {
+            SkipForward(p_access, i_needed );
+        }
+    }
+    if ( i_pos == p_access->info.i_pos ) {
+        return VLC_SUCCESS;
+    }
+    // Now we try skipping the remaining bytes and then making the next
+    // request with our desired offset.
+    if( (p_sys->i_remaining > 0)  && (p_sys->i_remaining <= HTTP_SEEK_BLOCKSIZE)) {
+        if ( SkipForward( p_access, p_sys->i_remaining) == VLC_SUCCESS ) {
+            p_sys->i_blocksize = HTTP_MIN_BLOCKSIZE;
+            if (Request(p_access, i_pos) == VLC_SUCCESS) {
+                return VLC_SUCCESS;
+            }
+        }
+    }
+    // Since the server does not have to honour our keep-alive request
+    // we could end-up here.
-    Disconnect( p_access );
-
-( Connect( p_access, i_pos )
+
+ (retval != VLC_SUCCESS
-    {
-        msg_Err( p_access, "seek failed" );
-        p_access->info.b_eof = true;
-        return VLC_EGENERIC;
-    }
-VLC_SUCCESS
+retval
-}
-
-/*****************************************************************************
@@ -859 +957 @@
-            break;
-        case ACCESS_CAN_FASTSEEK:
-            pb_bool = (bool*)va_arg( args, bool* );
-
+
+
-            break;
-        case ACCESS_CAN_PAUSE:
-        case ACCESS_CAN_CONTROL_PACE:
@@ -945 +1044 @@
-    p_sys->psz_icy_name = NULL;
-    p_sys->psz_icy_genre = NULL;
-    p_sys->psz_icy_title = NULL;
+    p_sys->i_blocksize = HTTP_MIN_BLOCKSIZE;
-
-    p_access->info.i_size = 0;
-    p_access->info.i_pos  = i_tell;
@@ -1086 +1186 @@
-    /* User Agent */
-    net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "User-Agent: %s\r\n",
-                p_sys->psz_user_agent );
+    p_access->info.i_pos = i_tell;
-    /* Offset */
-    if( p_sys->i_version == 1 )
-    {
+        int64_t i_end=i_tell+(int64_t)(p_sys->i_blocksize-1);
+        if((p_access->info.i_size > 0) && (i_end >= p_access->info.i_size)) {
+            i_end = p_access->info.i_size-1;
+        }
+        else if ((p_sys->i_blocksize *= 2) > HTTP_MAX_BLOCKSIZE) {
+           p_sys->i_blocksize = HTTP_MAX_BLOCKSIZE;
+        }
-        net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs,
-\r\n", i_tell
+%"PRId64"\r\n", i_tell, i_end
-    }
-
-    /* Cookies */
@@ -1131 +1239 @@
-    net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "Icy-MetaData: 1\r\n" );
-
-
-
-
-
+
-                    "Connection: Keep-Alive\r\n" );
-    }
-    else if( p_sys->i_version == 1 )
-    {
-        net_Printf( VLC_OBJECT( p_access ), p_sys->fd, pvs,
-                    "Connection: Close\r\n");
-    }
-
-    if( net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "\r\n" ) < 0 )
-    {
@@ -1196 +1296 @@
-    }
-    free( psz );
-
+    p_sys->i_remaining = 0;
-    for( ;; )
-    {
-        char *psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd, pvs );
@@ -1236 +1337 @@
-                p_access->info.i_size = -1;
-                msg_Dbg( p_access, "this frame size=%lld", atoll(p ) );
-                p_sys->i_remaining = atoll( p );
+                p_access->info.i_pos = 0;
-            }
-            else
-            {
-
-
+
+
+
+
+
+
-            }
-        }
+        else if(! strcasecmp( psz, "Content-Range") ) {
+            int64_t j_tell = i_tell;
+            int64_t j_end = (i_tell + p_sys->i_remaining - 1);
+            int64_t j_size = p_access->info.i_size;
+            sscanf(p,"bytes %"PRId64"-%"PRId64"/%"PRId64,&j_tell,&j_end,&j_size);
+            p_access->info.i_size = j_size;
+            p_access->info.i_pos = j_tell;
+            p_sys->i_remaining = j_end+1-j_tell;
+            msg_Dbg( p_access, "stream size=%"PRId64",position=%"PRId64",remaining=%"PRId64,j_size,j_tell,p_sys->i_remaining);
+        }
-        else if( !strcasecmp( psz, "Location" ) )
-        {
-            char * psz_new_loc;