Changeset 6bd540727c8cc58e0f9fbec615c606e381eaabaa

Timestamp:

30/05/07 21:30:07 (2 years ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1180553407 +0000

git-parent:

[b2ef4197fb788dcbc660f904d45782f52fad0ed4]

git-author:

Laurent Aimar <fenrir@videolan.org> 1180553407 +0000

Message:

Implemented (close #1194):

• time/duration display
  
• meta info parsing.
  
• seek (precise seek if SEEKTABLE presents)
  

Resampling can still happen but I think it has to do with the
decoder(at least with our ffmpeg wrapper, I haven't tested the
native one).

Files:

• modules/demux/flac.c (modified) (13 diffs)

modules/demux/flac.c

@@ -6 +6 @@
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
+ *          Laurent Aimar <fenrir@via.ecp.fr>
- *
- * This program is free software; you can redistribute it and/or modify
@@ -28 +29 @@
-#include <vlc_demux.h>
-#include <vlc_meta.h>
+#include <vlc_input.h>
-#include <vlc_codec.h>
+#include <assert.h>
-
-/*****************************************************************************
@@ -51 +54 @@
-static int Control( demux_t *, int, va_list );
-
+static int  ReadMeta( demux_t *, uint8_t **pp_streaminfo, int *pi_streaminfo );
+
-struct demux_sys_t
-{
@@ -59 +64 @@
-    decoder_t *p_packetizer;
-    vlc_meta_t *p_meta;
+
+    int64_t i_time_offset;
+    int64_t i_pts;
+    int64_t i_pts_start;
+
+    int64_t i_length; /* Length from stream info */
+    int64_t i_data_pos;
+
+    /* */
+    int         i_seekpoint;
+    seekpoint_t **seekpoint;
-};
-
@@ -72 +88 @@
-    module_t    *p_id3;
-    demux_sys_t *p_sys;
-    int          i_peek;
-    byte_t      *p_peek;
-
+
+
-
-    /* Have a peep at the show. */
@@ -91 +107 @@
-    p_demux->pf_control = Control;
-    p_demux->p_sys      = p_sys = malloc( sizeof( demux_sys_t ) );
-    es_format_Init( &fmt, AUDIO_ES, VLC_FOURCC( 'f', 'l', 'a', 'c' ) );
-    p_sys->b_start = VLC_TRUE;
-    p_sys->p_meta = NULL;
+    p_sys->i_length = 0;
+    p_sys->i_time_offset = 0;
+    p_sys->i_pts = 0;
+    p_sys->i_pts_start = 0;
+    p_sys->p_es = NULL;
+    TAB_INIT( p_sys->i_seekpoint, p_sys->seekpoint );
-
-    /* We need to read and store the STREAMINFO metadata */
-
-
-
-
-
-
-
-
-
-
+
+
+
-        return VLC_EGENERIC;
-    }
@@ -113 +127 @@
-
-    /* Store STREAMINFO for the decoder and packetizer */
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-    p_sys->p_packetizer->p_module =
@@ -136 +143 @@
-    }
-
-    p_sys->p_es = es_out_Add( p_demux->out, &fmt );
-
-    /* Parse possible id3 header */
-    if( ( p_id3 = module_Need( p_demux, "meta reader", NULL, 0 ) ) )
-    {
-
+
+
+
+
+
+
+
+
+
+
+
-        p_demux->p_private = NULL;
-        module_Unneed( p_demux, p_id3 );
@@ -165 +180 @@
-    /* Delete the decoder */
-    vlc_object_destroy( p_sys->p_packetizer );
-
+
+
-    free( p_sys );
-}
@@ -180 +196 @@
-
-    if( !( p_block_in = stream_Block( p_demux->s, FLAC_PACKET_SIZE ) ) )
-    {
-        return 0;
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-    while( (p_block_out = p_sys->p_packetizer->pf_packetize(
@@ -201 +208 @@
-            block_t *p_next = p_block_out->p_next;
-
+            p_block_out->p_next = NULL;
+
+            if( p_sys->p_es == NULL )
+            {
+                p_sys->p_packetizer->fmt_out.b_packetized = VLC_TRUE;
+                p_sys->p_es = es_out_Add( p_demux->out, &p_sys->p_packetizer->fmt_out);
+            }
+
-            /* set PCR */
-
-
+
+
+
+
+
+
-            es_out_Send( p_demux->out, p_sys->p_es, p_block_out );
-
@@ -216 +235 @@
- * Control:
- *****************************************************************************/
+static int64_t ControlGetLength( demux_t *p_demux )
+{
+    demux_sys_t *p_sys = p_demux->p_sys;
+    const int64_t i_size = stream_Size(p_demux->s) - p_sys->i_data_pos;
+    int64_t i_length = p_sys->i_length;
+    int i;
+
+    /* Try to fix length using seekpoint and current size for truncated file */
+    for( i = p_sys->i_seekpoint-1; i >= 0; i-- )
+    {
+        seekpoint_t *s = p_sys->seekpoint[i];
+        if( s->i_byte_offset <= i_size )
+        {
+            if( i+1 < p_sys->i_seekpoint )
+            {
+                /* Broken file */
+                seekpoint_t *n = p_sys->seekpoint[i+1];
+                assert( n->i_byte_offset != s->i_byte_offset); /* Should be ensured by ParseSeekTable */
+                i_length = s->i_time_offset + (n->i_time_offset-s->i_time_offset) * (i_size-s->i_byte_offset) / (n->i_byte_offset-s->i_byte_offset);
+            }
+            break;
+        }
+    }
+    return i_length;
+}
+static int64_t ControlGetTime( demux_t *p_demux )
+{
+    demux_sys_t *p_sys = p_demux->p_sys;
+    return __MAX(p_sys->i_pts, p_sys->i_pts_start) + p_sys->i_time_offset;
+}
+static int ControlSetTime( demux_t *p_demux, int64_t i_time )
+{
+    demux_sys_t *p_sys = p_demux->p_sys;
+    int64_t i_next_time;
+    int64_t i_next_offset;
+    int64_t i_delta_time;
+    int64_t i_delta_offset;
+    vlc_bool_t b_seekable;
+    int i;
+
+    /* */
+    stream_Control( p_demux->s, STREAM_CAN_SEEK, &b_seekable );
+    if( !b_seekable )
+        return VLC_EGENERIC;
+
+    /* */
+    assert( p_sys->i_seekpoint > 0 );   /* ReadMeta ensure at least (0,0) */
+    for( i = p_sys->i_seekpoint-1; i >= 0; i-- )
+    {
+        if( p_sys->seekpoint[i]->i_time_offset <= i_time )
+            break;
+    }
+    if( i+1 < p_sys->i_seekpoint )
+    {
+        i_next_time   = p_sys->seekpoint[i+1]->i_time_offset;
+        i_next_offset = p_sys->seekpoint[i+1]->i_byte_offset;
+    }
+    else
+    {
+        i_next_time   = p_sys->i_length;
+        i_next_offset = stream_Size(p_demux->s)-p_sys->i_data_pos;
+    }
+    i_delta_time = i_time - p_sys->seekpoint[i]->i_time_offset;
+    i_delta_offset = (i_next_offset - p_sys->seekpoint[i]->i_byte_offset) * i_delta_time / 
+                            (p_sys->seekpoint[i+1]->i_time_offset-p_sys->seekpoint[i]->i_time_offset);
+
+    /* XXX We do exact seek if it's not too far away(45s) */
+    if( i_delta_time < 45*I64C(1000000) )
+    {
+        if( stream_Seek( p_demux->s, p_sys->seekpoint[i]->i_byte_offset+p_sys->i_data_pos ) )
+            return VLC_EGENERIC;
+        p_sys->i_time_offset = p_sys->seekpoint[i]->i_time_offset - p_sys->i_pts;
+        p_sys->i_pts_start = p_sys->i_pts+i_delta_time;
+        es_out_Control( p_demux->out, ES_OUT_SET_NEXT_DISPLAY_TIME, p_sys->p_es, p_sys->i_pts_start );
+    }
+    else
+    {
+        if( stream_Seek( p_demux->s, p_sys->seekpoint[i]->i_byte_offset+p_sys->i_data_pos + i_delta_offset ) )
+            return VLC_EGENERIC;
+        p_sys->i_pts_start = p_sys->i_pts;
+        p_sys->i_time_offset = (p_sys->seekpoint[i]->i_time_offset+i_delta_time) - p_sys->i_pts;
+    }
+    return VLC_SUCCESS;
+}
+
-static int Control( demux_t *p_demux, int i_query, va_list args )
-{
-
-
-
-
+
+
+
-    {
-        vlc_meta_t *p_meta = (vlc_meta_t *)va_arg( args, vlc_meta_t* );
@@ -228 +331 @@
-        return VLC_SUCCESS;
-    }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+