Changeset 5bdef1c76ad3d3e6ef9601265362dc49bc05ee0c

Timestamp:

17/10/04 15:38:22 (4 years ago)

Author:

Derk-Jan Hartman <hartman@videolan.org>

git-committer:

Derk-Jan Hartman <hartman@videolan.org> 1098020302 +0000

git-parent:

[a95e32965feec730866b90d0ab544d05a69b1d50]

git-author:

Derk-Jan Hartman <hartman@videolan.org> 1098020302 +0000

Message:

* vobsub.c: implemented vobsub seeking support.

Files:

• modules/demux/vobsub.c (modified) (11 diffs)

modules/demux/vobsub.c

@@ -70 +70 @@
-typedef struct
-{
-mtime
+int64
-    int     i_vobsub_location;
-} subtitle_t;
@@ -166 +166 @@
-            {
-                if( p_sys->track[i].p_subtitles[p_sys->track[i].i_subtitles-1].i_start > p_sys->i_length )
-mtime_t) p_sys->track[i].p_subtitles[p_sys->track[i].i_subtitles-1].i_start + 1 * 1000 * 1000
+int64_t) p_sys->track[i].p_subtitles[p_sys->track[i].i_subtitles-1].i_start + ( 1 *1000 *1000 )
-            }
-        }
@@ -215 +215 @@
-    demux_sys_t *p_sys = p_demux->p_sys;
-    int64_t *pi64, i64;
+    int i;
-    double *pf, f;
-
@@ -221 +222 @@
-        case DEMUX_GET_LENGTH:
-            pi64 = (int64_t*)va_arg( args, int64_t * );
-
+(int64_t) 
-            return VLC_SUCCESS;
-
-        case DEMUX_GET_TIME:
-            pi64 = (int64_t*)va_arg( args, int64_t * );
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                return VLC_SUCCESS;
-*/
+
-            return VLC_EGENERIC;
-
-        case DEMUX_SET_TIME:
-            i64 = (int64_t)va_arg( args, int64_t );
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-            return VLC_SUCCESS;
-
-        case DEMUX_GET_POSITION:
-            pf = (double*)va_arg( args, double * );
-
+
+
+
+
+
+
+
+
+
-            {
-                *pf = 1.0;
-            }
-
-
-subtitle[p_sys->
+track[i].
+
+track[i].p_subtitles[p_sys->track[i].
-                      (double)p_sys->i_length;
-            }
@@ -260 +280 @@
-            {
-                *pf = 0.0;
-*/
+
-            return VLC_SUCCESS;
-
-        case DEMUX_SET_POSITION:
-            f = (double)va_arg( args, double );
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-            return VLC_SUCCESS;
-
@@ -305 +328 @@
-#define tk p_sys->track[i]
-        if( tk.i_current_subtitle >= tk.i_subtitles )
-return 0
-
-
+continue
+
+(int64_t) 
-        if( i_maxdate <= 0 && tk.i_current_subtitle < tk.i_subtitles )
-        {
-            /* Should not happen */
-
+(int64_t) 
-        }
-
@@ -496 +519 @@
-             *
-             */
-unsigned 
-
+
+64_t
-            
-            vobsub_track_t *current_tk = &p_sys->track[p_sys->i_tracks - 1];
@@ -506 +529 @@
-                subtitle_t *current_sub;
-                
- (mtime_t)
-(mtime_t)
-(mtime_t)
-(mtime_t)
+int64_t) ( 
+
+
+
-                i_location = loc;
-                
@@ -516 +539 @@
-                current_sub = &current_tk->p_subtitles[current_tk->i_subtitles - 1];
-                
-
+(int64_t) 
-                current_sub->i_vobsub_location = i_location;
-            }
@@ -550 +573 @@
-        if( p[3] != 0xbd )
-        {
-msg_Dbg( p_demux, "we don't need these ps packets (id=0x1%2.2x)", p[3] );
+/* msg_Dbg( p_demux, "we don't need these ps packets (id=0x1%2.2x)", p[3] ); */
-            p += i_size;
-            continue;
@@ -568 +591 @@
-        }
-        i_spu = i_id&0x1f;
-
-
-
+
+
-        for( i = 0; i < p_sys->i_tracks; i++ )
-        {