Changeset 36bde12633aa3997e24a121db8cf1fb56f936f96

Timestamp:

24/05/08 00:49:22 (6 months ago)

Author:

Jean-Baptiste Kempf <jb@videolan.org>

git-committer:

Jean-Baptiste Kempf <jb@videolan.org> 1211582962 -0700

git-parent:

[93d9a388cab3b40a5361df3b779cbc5ff6e25140]

git-author:

Wang Bo <silencewang@msn.com> 1211546306 +0800

Message:

real file index and seek

Signed-off-by: Jean-Baptiste Kempf <jb@ambre.(none)>

Files:

• modules/demux/real.c (modified) (24 diffs)

modules/demux/real.c

@@ -96 +96 @@
-    int         i_subpackets;
-    block_t     **p_subpackets;
+    int64_t        *p_subpackets_timecode;
-    int         i_out_subpacket;
-
-} real_track_t;
+
+typedef struct
+{
+    uint32_t file_offset;
+    uint32_t time_offset;
+    uint32_t frame_index;
+} rm_index_t;
-
-struct demux_sys_t
@@ -122 +130 @@
-
-    int64_t     i_pcr;
+    vlc_meta_t *p_meta;
+
+    int64_t i_index_offset;
+    int        b_seek;
+    rm_index_t * p_index;
-};
-
@@ -164 +177 @@
-    p_sys->i_pcr   = 1;
-
+    p_sys->b_seek  = 0;
-
-    /* Parse the headers */
@@ -213 +227 @@
-                block_Release( tk->p_subpackets[ j ] );
-        }
-
+
+
+
+
+
-
-        free( tk );
@@ -222 +240 @@
-    free( p_sys->psz_copyright );
-    free( p_sys->psz_description );
+    free( p_sys->p_index );
-
-    if( p_sys->i_track > 0 ) free( p_sys->track );
@@ -517 +536 @@
-
-            /* Sanity check */
-
+
+
+
+
+
+
-
-            if( tk->fmt.i_codec == VLC_FOURCC( 'c', 'o', 'o', 'k' ) ||
-                tk->fmt.i_codec == VLC_FOURCC( 'a', 't', 'r', 'c' ))
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-                p_block->i_dts = p_block->i_pts = i_pts;
@@ -535 +585 @@
-            }
-
-            if( tk->fmt.i_codec == VLC_FOURCC( '2', '8', '_', '8' ) ||
-                tk->fmt.i_codec == VLC_FOURCC( 's', 'i', 'p', 'r' ) )
-            for( i = 0; i < tk->i_subpacket_h / 2; i++ )
-            {
-                block_t *p_block = block_New( p_demux, tk->i_coded_frame_size);
-                memcpy( p_block->p_buffer, p_buf, tk->i_coded_frame_size );
-                p_buf += tk->i_coded_frame_size;
-
-                i_index = (i * 2 * tk->i_frame_size) /
-                    tk->i_coded_frame_size + y;
-
-                p_block->i_dts = p_block->i_pts = i_pts;
-                tk->p_subpackets[i_index] = p_block;
-                tk->i_subpacket++;
-            }
-
-            while( tk->i_out_subpacket != tk->i_subpackets &&
-                   tk->p_subpackets[tk->i_out_subpacket] )
-            {
-                /* Set the PCR */
+#if 0
-                if (tk->i_out_subpacket == 0)
-                {
@@ -566 +601 @@
-
-                if( tk->i_out_subpacket ) p_block->i_dts = p_block->i_pts = 0;
+#endif
+
+                block_t *p_block = tk->p_subpackets[tk->i_out_subpacket];
+                tk->p_subpackets[tk->i_out_subpacket] = 0;
+                //if ( p_block->i_dts )
+                if ( tk->p_subpackets_timecode[tk->i_out_subpacket]  )
+                {
+                    p_block->i_dts = p_block->i_pts =
+                        tk->p_subpackets_timecode[tk->i_out_subpacket];
+                    tk->p_subpackets_timecode[tk->i_out_subpacket] = 0;
+
+                    p_sys->i_pcr = p_block->i_dts;
+                    es_out_Control( p_demux->out, ES_OUT_SET_PCR,
+                            (int64_t)p_sys->i_pcr );
+                }
-                es_out_Send( p_demux->out, tk->p_es, p_block );
-
@@ -654 +704 @@
-{
-    demux_sys_t *p_sys = p_demux->p_sys;
-#if 0
-    double f, *pf;
-    int64_t i64;
-
+
-    int64_t *pi64;
-
-    switch( i_query )
-    {
-#if 0
-        case DEMUX_GET_POSITION:
-            pf = (double*) va_arg( args, double* );
+
+            if( p_sys->i_our_duration > 0 )
+            {
+                *pf = (double)p_sys->i_pcr / 1000.0 / p_sys->i_our_duration;
+                return VLC_SUCCESS;
+            }
+
+            /* read stream size maybe failed in rtsp streaming, 
+               so use duration to determin the position at first  */
-            i64 = stream_Size( p_demux->s );
-            if( i64 > 0 )
-            {
-
+1.0*
-            }
-            else
@@ -675 +732 @@
-            }
-            return VLC_SUCCESS;
+
+        case DEMUX_GET_TIME:
+            pi64 = (int64_t*)va_arg( args, int64_t * );
+
+            if( p_sys->i_our_duration > 0 )
+            {
+                *pi64 = p_sys->i_pcr;
+                return VLC_SUCCESS;
+            }
+
+            /* same as GET_POSTION */
+            i64 = stream_Size( p_demux->s );
+            if( p_sys->i_our_duration > 0 && i64 > 0 )
+            {
+                *pi64 = (int64_t)( 1000.0 * p_sys->i_our_duration * stream_Tell( p_demux->s ) / i64 );
+                return VLC_SUCCESS;
+            }
+
+            *pi64 = 0;
+            return VLC_EGENERIC;
-
-        case DEMUX_SET_POSITION:
-            f = (double) va_arg( args, double );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        case DEMUX_GET_LENGTH:
@@ -732 +860 @@
-        }
-
-        case DEMUX_SET_TIME:
-        case DEMUX_GET_FPS:
-        default:
@@ -738 +865 @@
-    }
-    return VLC_EGENERIC;
+}
+
+/*****************************************************************************
+ * ReadRealIndex:
+ *****************************************************************************/
+
+static void ReadRealIndex( demux_t *p_demux )
+{
+    demux_sys_t *p_sys = p_demux->p_sys;
+    uint8_t buffer[100];
+    uint32_t    i_id;
+    uint32_t    i_size;
+    int         i_version;
+    int            i;
+
+    uint32_t    i_index_count;
+
+    if ( p_sys->i_index_offset == 0 )
+        return;
+
+    stream_Seek( p_demux->s, p_sys->i_index_offset );
+
+    if ( stream_Read( p_demux->s, buffer, 20 ) < 20 )
+        return ;
+
+    i_id = VLC_FOURCC( buffer[0], buffer[1], buffer[2], buffer[3] );
+    i_size      = GetDWBE( &buffer[4] );
+    i_version   = GetWBE( &buffer[8] );
+
+    msg_Dbg( p_demux, "Real index %4.4s size=%d version=%d",
+                 (char*)&i_id, i_size, i_version );
+
+    if( (i_size < 20) && (i_id != VLC_FOURCC('I','N','D','X')) )
+        return;
+
+    i_index_count = GetDWBE( &buffer[10] );
+
+    msg_Dbg( p_demux, "Real Index : num : %d ", i_index_count );
+
+    if ( i_index_count == 0 )
+        return;
+
+    if (  GetDWBE( &buffer[16] ) > 0 )
+        msg_Dbg( p_demux, "Real Index: next index is exist? %d ", GetDWBE( &buffer[16] )  );
+
+    p_sys->p_index =  ( rm_index_t *) malloc( sizeof(rm_index_t) * (i_index_count+1) );
+    if ( p_sys->p_index == NULL )
+    {
+        msg_Err( p_demux, "Real Index: Error , fail to malloc index buffer " );
+        return;
+    }
+
+    memset( p_sys->p_index, 0, sizeof(rm_index_t) * (i_index_count+1) );
+
+    for( i=0; i<i_index_count; i++ )
+    {
+        if ( stream_Read( p_demux->s, buffer, 14 ) < 14 )
+            return ;
+
+        if ( GetWBE( &buffer[0] ) != 0 )
+        {
+            msg_Dbg( p_demux, "Real Index: invaild version of index entry %d ", GetWBE( &buffer[0] ) );
+            return;
+        }
+
+        p_sys->p_index[i].time_offset = GetDWBE( &buffer[2] );
+        p_sys->p_index[i].file_offset = GetDWBE( &buffer[6] );
+        p_sys->p_index[i].frame_index = GetDWBE( &buffer[10] );
+#if 0
+        msg_Dbg( p_demux, "Real Index: time %d file %d frame %d ", p_sys->p_index[i].time_offset, p_sys->p_index[i].file_offset , p_sys->p_index[i].frame_index );
+#endif
+
+    }
+
-}
-
@@ -752 +953 @@
-    int64_t     i_skip;
-    int         i_version;
+    p_sys->p_meta = vlc_meta_New();
-
-    for( ;; )
@@ -802 +1004 @@
-            p_sys->i_our_duration = (int)GetDWBE(&header[20]);
- 
+            p_sys->i_index_offset = GetDWBE(&header[28]);
+
-            i_flags = GetWBE(&header[38]);
-            msg_Dbg( p_demux, "    - flags=0x%x %s%s%s",
@@ -828 +1032 @@
-                msg_Dbg( p_demux, "    - title=`%s'", psz );
-                p_sys->psz_title = psz;
+                vlc_meta_Add( p_sys->p_meta, VLC_META_TITLE, psz );
+                free( psz );
-                i_skip -= i_len;
-            }
@@ -842 +1048 @@
-                msg_Dbg( p_demux, "    - author=`%s'", psz );
-                p_sys->psz_artist = psz;
+                vlc_meta_Add( p_sys->p_meta, VLC_META_ARTIST, psz );
+                free( psz );
-                i_skip -= i_len;
-            }
@@ -856 +1064 @@
-                msg_Dbg( p_demux, "    - copyright=`%s'", psz );
-                p_sys->psz_copyright = psz;
+                vlc_meta_Add( p_sys->p_meta, VLC_META_COPYRIGHT, psz );
+                free( psz );
-                i_skip -= i_len;
-            }
@@ -870 +1080 @@
-                msg_Dbg( p_demux, "    - comment=`%s'", psz );
-                p_sys->psz_description = psz;
+                vlc_meta_Add( p_sys->p_meta, VLC_META_DESCRIPTION, psz );
+                free( psz );
-                i_skip -= i_len;
-            }
@@ -959 +1171 @@
-    /* TODO read index if possible */
-
+    if ( p_sys->i_index_offset > 0 )
+    {
+        int64_t pos;
+        pos = stream_Tell( p_demux->s );
+        ReadRealIndex( p_demux );
+        stream_Seek( p_demux->s, pos );
+    }
+
-    return VLC_SUCCESS;
-}
@@ -1015 +1235 @@
-        tk->i_subpackets = 0;
-        tk->p_subpackets = NULL;
+        tk->p_subpackets_timecode = NULL;
-        tk->i_id = i_num;
-        tk->fmt = fmt;
@@ -1025 +1246 @@
-    else if( !strncmp( (char *)p_peek, ".ra\xfd", 4 ) )
-    {
-
-
+
+
+
+
+
+
-        char p_genr[4];
-        int i_version = GetWBE( &p_peek[4] );   /* [0..3] = '.','r','a',0xfd */
@@ -1247 +1472 @@
-            tk->i_subpackets = 0;
-            tk->p_subpackets = NULL;
+            tk->p_subpackets_timecode = NULL;
-            if( fmt.i_codec == VLC_FOURCC('c','o','o','k')
-             || fmt.i_codec == VLC_FOURCC('a','t','r','c') )
@@ -1254 +1480 @@
-                tk->p_subpackets =
-                    calloc( tk->i_subpackets, sizeof(block_t *) );
+                tk->p_subpackets_timecode =
+                    calloc( tk->i_subpackets , sizeof( int64_t ) );
-            }
-            else if( fmt.i_codec == VLC_FOURCC('2','8','_','8') )
@@ -1261 +1489 @@
-                tk->p_subpackets =
-                    calloc( tk->i_subpackets, sizeof(block_t *) );
+                tk->p_subpackets_timecode =
+                    calloc( tk->i_subpackets , sizeof( int64_t ) );
-            }
-