mmap: Correct [cbc1122ac4551505181ea048ca14a5f87041090f]

[vlc] / modules / demux / flac.c

diff --git a/modules/demux/flac.c b/modules/demux/flac.c
index 4d6c24c42b33ed293b1998f9f404c0215cb7bd11..d82efc77027bcae811b92455e95c7ef5e91a4e40 100644 (file)
--- a/modules/demux/flac.c
+++ b/modules/demux/flac.c
@@ -103,6 +103,7 @@ static int Open( vlc_object_t * p_this )
     const uint8_t *p_peek;
     uint8_t     *p_streaminfo;
     int         i_streaminfo;
+    es_format_t fmt;
 
     /* Have a peep at the show. */
     if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) return VLC_EGENERIC;
@@ -140,21 +141,16 @@ static int Open( vlc_object_t * p_this )
     }
 
     /* Load the FLAC packetizer */
-    INIT_APACKETIZER( p_sys->p_packetizer, 'f', 'l', 'a', 'c' );
-
     /* Store STREAMINFO for the decoder and packetizer */
     p_streaminfo[4] |= 0x80; /* Fake this as the last metadata block */
-    p_sys->p_packetizer->fmt_in.i_extra = i_streaminfo;
-    p_sys->p_packetizer->fmt_in.p_extra = p_streaminfo;
+    es_format_Init( &fmt, AUDIO_ES, VLC_FOURCC( 'f', 'l', 'a', 'c' ) );
+    fmt.i_extra = i_streaminfo;
+    fmt.p_extra = p_streaminfo;
 
-    p_sys->p_packetizer->p_module =
-        module_Need( p_sys->p_packetizer, "packetizer", NULL, 0 );
-    if( !p_sys->p_packetizer->p_module )
+    p_sys->p_packetizer = demux_PacketizerNew( p_demux, &fmt, "flac" );
+    if( !p_sys->p_packetizer )
     {
-        free( p_sys->p_packetizer->fmt_in.p_extra );
-        vlc_object_release( p_sys->p_packetizer );
-
-        msg_Err( p_demux, "cannot find flac packetizer" );
+        free( p_sys );
         return VLC_EGENERIC;
     }
 
@@ -186,13 +182,9 @@ static void Close( vlc_object_t * p_this )
         free( p_sys->attachments[i] );
     TAB_CLEAN( p_sys->i_attachments, p_sys->attachments);
 
-    /* Unneed module */
-    module_Unneed( p_sys->p_packetizer, p_sys->p_packetizer->p_module );
-
-    free( p_sys->p_packetizer->fmt_in.p_extra );
-
     /* Delete the decoder */
-    vlc_object_release( p_sys->p_packetizer );
+    demux_PacketizerDestroy( p_sys->p_packetizer );
+
     if( p_sys->p_meta )
         vlc_meta_Delete( p_sys->p_meta );
     free( p_sys );
@@ -431,7 +423,7 @@ static inline int Get24bBE( const uint8_t *p )
     return (p[0] << 16)|(p[1] << 8)|(p[2]);
 }
 
-static void ParseStreamInfo( demux_t *p_demux, int *pi_rate, int64_t *pi_count, uint8_t *p_data, int i_data );
+static void ParseStreamInfo( int *pi_rate, int64_t *pi_count, uint8_t *p_data );
 static void ParseSeekTable( demux_t *p_demux, const uint8_t *p_data, int i_data,
                             int i_sample_rate );
 static void ParseComment( demux_t *, const uint8_t *p_data, int i_data );
@@ -473,7 +465,7 @@ static int  ReadMeta( demux_t *p_demux, uint8_t **pp_streaminfo, int *pi_streami
     }
 
     /* */
-    ParseStreamInfo( p_demux, &i_sample_rate, &i_sample_count,  *pp_streaminfo, *pi_streaminfo );
+    ParseStreamInfo( &i_sample_rate, &i_sample_count, *pp_streaminfo );
     if( i_sample_rate > 0 )
         p_sys->i_length = i_sample_count * INT64_C(1000000)/i_sample_rate;
 
@@ -524,7 +516,7 @@ static int  ReadMeta( demux_t *p_demux, uint8_t **pp_streaminfo, int *pi_streami
 
     return VLC_SUCCESS;
 }
-static void ParseStreamInfo( demux_t *p_demux, int *pi_rate, int64_t *pi_count, uint8_t *p_data, int i_data )
+static void ParseStreamInfo( int *pi_rate, int64_t *pi_count, uint8_t *p_data )
 {
     const int i_skip = 4+4;
 
@@ -620,7 +612,7 @@ static void ParseComment( demux_t *p_demux, const uint8_t *p_data, int i_data )
         if( n <= 0 )
             continue;
 
-        psz = strndup( p_data, n );
+        psz = strndup( (const char*)p_data, n );
         RM(n);
 
         EnsureUTF8( psz );
@@ -693,11 +685,11 @@ static void ParsePicture( demux_t *p_demux, const uint8_t *p_data, int i_data )
     i_len = GetDWBE( p_data ); RM(4);
     if( i_len < 0 || i_data < i_len + 4 )
         goto error;
-    psz_mime = strndup( p_data, i_len ); RM(i_len);
+    psz_mime = strndup( (const char*)p_data, i_len ); RM(i_len);
     i_len = GetDWBE( p_data ); RM(4);
     if( i_len < 0 || i_data < i_len + 4*4 + 4)
         goto error;
-    psz_description = strndup( p_data, i_len ); RM(i_len);
+    psz_description = strndup( (const char*)p_data, i_len ); RM(i_len);
     EnsureUTF8( psz_description );
     RM(4*4);
     i_len = GetDWBE( p_data ); RM(4);
@@ -717,7 +709,7 @@ static void ParsePicture( demux_t *p_demux, const uint8_t *p_data, int i_data )
                                              p_data, i_data );
     TAB_APPEND( p_sys->i_attachments, p_sys->attachments, p_attachment );
 
-    if( i_type >= 0 && i_type < sizeof(pi_cover_score)/sizeof(pi_cover_score[0]) &&
+    if( i_type >= 0 && (unsigned int)i_type < sizeof(pi_cover_score)/sizeof(pi_cover_score[0]) &&
         p_sys->i_cover_score < pi_cover_score[i_type] )
     {
         p_sys->i_cover_idx = p_sys->i_attachments-1;