Changeset 44cb59eadc7ddcfd23ec9621e9d374c093261ff2

Timestamp:

14/04/07 01:50:47 (2 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1176508247 +0000

git-parent:

[7149e064c3172d1e0c5b45bfb36807003f1f00f7]

git-author:

Gildas Bazin <gbazin@videolan.org> 1176508247 +0000

Message:

* modules/demux/asf/* use index for seeking if available and if there's a video track.

Files:

• modules/demux/asf/asf.c (modified) (15 diffs)

modules/demux/asf/asf.c

@@ -92 +92 @@
-    int64_t             i_data_end;
-
+    vlc_bool_t          b_index;
-    vlc_meta_t          *meta;
-};
@@ -146 +147 @@
-        int i_result;
-
-
-
-
-
+
-
-        /* Check if we have concatenated files */
@@ -187 +185 @@
-        {
-            i_length = GetMoviePTS( p_sys ) - i_time_begin;
-
-
-
-
+
-        }
-    }
@@ -217 +212 @@
-
-/*****************************************************************************
+ * SeekIndex: goto to i_date or i_percent
+ *****************************************************************************/
+static int SeekIndex( demux_t *p_demux, mtime_t i_date, float f_pos )
+{
+    demux_sys_t *p_sys = p_demux->p_sys;
+    asf_object_index_t *p_index;
+    int64_t i_pos;
+
+    msg_Dbg( p_demux, "seek with index: %i seconds, position %f",
+             (int)(i_date/1000000), f_pos );
+
+    p_index = ASF_FindObject( p_sys->p_root, &asf_object_index_guid, 0 );
+
+    if( i_date < 0 ) i_date = p_sys->i_length * f_pos;
+
+    i_pos = i_date * 10 / p_index->i_index_entry_time_interval;
+    i_pos = p_index->index_entry[i_pos].i_packet_number *
+        p_sys->p_fp->i_min_data_packet_size;
+
+    return stream_Seek( p_demux->s, p_sys->i_data_begin + i_pos );
+}
+
+/*****************************************************************************
- * Control:
- *****************************************************************************/
@@ -222 +240 @@
-{
-    demux_sys_t *p_sys = p_demux->p_sys;
-
+
+
+
-    int         i;
-    vlc_meta_t *p_meta;
-
-    switch( i_query )
-    {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            return VLC_SUCCESS;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                           i_query, args );
+        }
+
+    case DEMUX_GET_META:
+        p_meta = (vlc_meta_t*)va_arg( args, vlc_meta_t* );
+        vlc_meta_Merge( p_meta, p_sys->meta );
+        return VLC_SUCCESS;
+
+    default:
+        return demux2_vaControlHelper( p_demux->s, p_sys->i_data_begin,
+                                       p_sys->i_data_end, p_sys->i_bitrate,
+                                       p_sys->p_fp->i_min_data_packet_size,
+                                       i_query, args );
-    }
-}
@@ -262 +325 @@
-static mtime_t GetMoviePTS( demux_sys_t *p_sys )
-{
-
+ = -1
-    int     i;
-
-    i_time = -1;
-    for( i = 0; i < 128 ; i++ )
-    {
@@ -272 +334 @@
-        if( tk && tk->p_es && tk->i_time > 0)
-        {
-
-
-
-
-
-
-
-
+
+
-        }
-    }
@@ -391 +447 @@
-        asf_track_t   *tk;
-
+        int i_packet_keyframe;
-        int i_stream_number;
-        int i_media_object_number;
@@ -409 +466 @@
-        }
-
-stream_number = p_peek[i_skip] & 0x7f
-kip++
+packet_keyframe = p_peek[i_skip] >> 7
+tream_number = p_peek[i_skip++] & 0x7f
-
-        GETVALUE2b( i_packet_property >> 4, i_media_object_number, 0 );
@@ -585 +642 @@
-{
-    demux_sys_t *p_sys = p_demux->p_sys;
-
-
-
-
+
+
-    asf_object_content_description_t *p_cd;
+    asf_object_index_t *p_index;
+    vlc_bool_t b_index;
-
-    /* init context */
@@ -597 +654 @@
-    p_sys->p_root   = NULL;
-    p_sys->p_fp     = NULL;
+    p_sys->b_index  = 0;
-    p_sys->i_track  = 0;
-    for( i = 0; i < 128; i++ )
@@ -608 +666 @@
-    /* Now load all object ( except raw data ) */
-    stream_Control( p_demux->s, STREAM_CAN_FASTSEEK, &b_seekable );
-(p_sys->p_root = ASF_ReadObjectRoot( p_demux->s, b_seekable )) == NULL
+!(p_sys->p_root = ASF_ReadObjectRoot(p_demux->s, b_seekable))
-    {
-        msg_Warn( p_demux, "ASF plugin discarded (not a valid file)" );
@@ -628 +686 @@
-        goto error;
-    }
+
+    /* check if index is available */
+    p_index = ASF_FindObject( p_sys->p_root, &asf_object_index_guid, 0 );
+    b_index = p_index && p_index->i_index_entry_count;
-
-    msg_Dbg( p_demux, "found %d streams", p_sys->i_track );
@@ -765 +827 @@
-            es_format_Clean( &fmt );
-
+            /* If there is a video track then use the index for seeking */
+            p_sys->b_index = b_index;
+
-            msg_Dbg( p_demux, "added new video stream(ID:%d)",
-                     p_sp->i_stream_number );
@@ -834 +899 @@
-    }
-
-
-    /* go to first packet */
-    stream_Seek( p_demux->s, p_sys->i_data_begin );