simple mixer: remove useless allocation and simplify

[vlc] / modules / demux / flac.c

diff --git a/modules/demux/flac.c b/modules/demux/flac.c
index 3a928f4c16dcddf80a7324d13f9896c34d749ac8..0405d2e978250b4622f1242e77b2017a746c29c5 100644 (file)
--- a/modules/demux/flac.c
+++ b/modules/demux/flac.c
@@ -109,7 +109,16 @@ static int Open( vlc_object_t * p_this )
 
     if( p_peek[0]!='f' || p_peek[1]!='L' || p_peek[2]!='a' || p_peek[3]!='C' )
     {
-        if( !p_demux->b_force ) return VLC_EGENERIC;
+        if( !p_demux->b_force )
+        {
+            char *psz_mime = stream_ContentType( p_demux->s );
+            if ( !psz_mime || strcmp( psz_mime, "audio/flac" ) )
+            {
+                free( psz_mime );
+                return VLC_EGENERIC;
+            }
+            free( psz_mime );
+        }
 
         /* User forced */
         msg_Err( p_demux, "this doesn't look like a flac stream, "
@@ -199,14 +208,16 @@ static int Demux( demux_t *p_demux )
     demux_sys_t *p_sys = p_demux->p_sys;
     block_t     *p_block_in, *p_block_out;
 
-    if( !( p_block_in = stream_Block( p_demux->s, FLAC_PACKET_SIZE ) ) )
-        return 0;
+    bool b_eof = !( p_block_in = stream_Block( p_demux->s, FLAC_PACKET_SIZE ) );
 
-    p_block_in->i_pts = p_block_in->i_dts = p_sys->b_start ? VLC_TS_0 : VLC_TS_INVALID;
-    p_sys->b_start = false;
+    if ( p_block_in )
+    {
+        p_block_in->i_pts = p_block_in->i_dts = p_sys->b_start ? VLC_TS_0 : VLC_TS_INVALID;
+        p_sys->b_start = false;
+    }
 
     while( (p_block_out = p_sys->p_packetizer->pf_packetize(
-                p_sys->p_packetizer, &p_block_in )) )
+                p_sys->p_packetizer, (p_block_in) ? &p_block_in : NULL )) )
     {
         while( p_block_out )
         {
@@ -230,7 +241,7 @@ static int Demux( demux_t *p_demux )
             p_block_out = p_next;
         }
     }
-    return 1;
+    return !b_eof;
 }
 
 /*****************************************************************************
@@ -546,7 +557,7 @@ static void ParseSeekTable( demux_t *p_demux, const uint8_t *p_data, int i_data,
             continue;
 
         s = vlc_seekpoint_New();
-        s->i_time_offset = i_sample * INT64_C(1000000)/i_sample_rate;
+        s->i_time_offset = i_sample * CLOCK_FREQ / i_sample_rate;
         s->i_byte_offset = GetQWBE( &p_data[4+18*i+8] );
 
         /* Check for duplicate entry */
@@ -575,7 +586,7 @@ static void ParseComment( demux_t *p_demux, const uint8_t *p_data, int i_data )
     if( i_data < 4 )
         return;
 
-    vorbis_ParseComment( &p_sys->p_meta, &p_data[4], i_data - 4,
+    vorbis_ParseComment( NULL, &p_sys->p_meta, &p_data[4], i_data - 4,
         &p_sys->i_attachments, &p_sys->attachments,
         &p_sys->i_cover_score, &p_sys->i_cover_idx, NULL, NULL, NULL, NULL );
 }