* all: removed block_t->b_discontinuity,b_frame_* and added i_flags

[vlc] / modules / demux / flac.c

diff --git a/modules/demux/flac.c b/modules/demux/flac.c
index 08440e80419fd646381a2f52bc39e5342f77b5b7..9e042614db89d33ce5450b340b208b9cc8bb1009 100644 (file)
--- a/modules/demux/flac.c
+++ b/modules/demux/flac.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * flac.c : FLAC demux module for vlc
  *****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: flac.c,v 1.7 2003/11/21 12:18:54 gbazin Exp $
+ * Copyright (C) 2001-2003 VideoLAN
+ * $Id: flac.c,v 1.11 2004/02/25 17:48:52 fenrir Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -51,7 +51,7 @@ struct demux_sys_t
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();                                      
-    set_description( _("flac demuxer") );                       
+    set_description( _("FLAC demuxer") );                       
     set_capability( "demux", 155 );
     set_callbacks( Open, Close );
     add_shortcut( "flac" );
@@ -99,20 +99,17 @@ static int Open( vlc_object_t * p_this )
     es_format_Init( &fmt, AUDIO_ES, VLC_FOURCC( 'f', 'l', 'a', 'c' ) );
     p_sys->b_start = VLC_TRUE;
 
-    /* Skip stream marker */
-    stream_Read( p_input->s, NULL, 4 );
-
     /* We need to read and store the STREAMINFO metadata */
-    i_peek = stream_Peek( p_input->s, &p_peek, 4 );
-    if( p_peek[0] & 0x7F )
+    i_peek = stream_Peek( p_input->s, &p_peek, 8 );
+    if( p_peek[4] & 0x7F )
     {
-        msg_Err( p_input, "This isn't a STREAMINFO metadata block" );
+        msg_Err( p_input, "this isn't a STREAMINFO metadata block" );
         return VLC_EGENERIC;
     }
 
-    if( ((p_peek[1]<<16)+(p_peek[2]<<8)+p_peek[3]) != (STREAMINFO_SIZE - 4) )
+    if( ((p_peek[5]<<16)+(p_peek[6]<<8)+p_peek[7]) != (STREAMINFO_SIZE - 4) )
     {
-        msg_Err( p_input, "Invalid size for a STREAMINFO metadata block" );
+        msg_Err( p_input, "invalid size for a STREAMINFO metadata block" );
         return VLC_EGENERIC;
     }
 
@@ -120,27 +117,26 @@ static int Open( vlc_object_t * p_this )
      * Load the FLAC packetizer
      */
     p_sys->p_packetizer = vlc_object_create( p_input, VLC_OBJECT_DECODER );
-    p_sys->p_packetizer->pf_decode = 0;
     p_sys->p_packetizer->pf_decode_audio = 0;
     p_sys->p_packetizer->pf_decode_video = 0;
     p_sys->p_packetizer->pf_decode_sub = 0;
     p_sys->p_packetizer->pf_packetize = 0;
-    p_sys->p_packetizer->pf_run = 0;
 
     /* Initialization of decoder structure */
     es_format_Init( &p_sys->p_packetizer->fmt_in, AUDIO_ES,
                     VLC_FOURCC( 'f', 'l', 'a', 'c' ) );
 
     /* Store STREAMINFO for the decoder and packetizer */
-    p_sys->p_packetizer->fmt_in.i_extra = fmt.i_extra = STREAMINFO_SIZE;
-    p_sys->p_packetizer->fmt_in.p_extra = malloc( STREAMINFO_SIZE );
+    p_sys->p_packetizer->fmt_in.i_extra = fmt.i_extra = STREAMINFO_SIZE + 4;
+    p_sys->p_packetizer->fmt_in.p_extra = malloc( STREAMINFO_SIZE + 4 );
     stream_Read( p_input->s, p_sys->p_packetizer->fmt_in.p_extra,
-                 STREAMINFO_SIZE );
+                 STREAMINFO_SIZE + 4 );
 
     /* Fake this as the last metadata block */
-    ((uint8_t*)p_sys->p_packetizer->fmt_in.p_extra)[0] |= 0x80;
-    fmt.p_extra = malloc( STREAMINFO_SIZE );
-    memcpy( fmt.p_extra, p_sys->p_packetizer->fmt_in.p_extra, STREAMINFO_SIZE);
+    ((uint8_t*)p_sys->p_packetizer->fmt_in.p_extra)[4] |= 0x80;
+    fmt.p_extra = malloc( STREAMINFO_SIZE + 4 );
+    memcpy( fmt.p_extra, p_sys->p_packetizer->fmt_in.p_extra,
+            STREAMINFO_SIZE + 4 );
 
     p_sys->p_packetizer->p_module =
         module_Need( p_sys->p_packetizer, "packetizer", NULL );
@@ -226,7 +222,6 @@ static int Demux( input_thread_t * p_input )
                                   p_input->stream.p_selected_program,
                                   p_block_out->i_pts * 9 / 100 );
 
-            p_block_in->b_discontinuity = 0;
             p_block_out->i_dts = p_block_out->i_pts =
                 input_ClockGetTS( p_input, p_input->stream.p_selected_program,
                                   p_block_out->i_pts * 9 / 100 );