Fix warning and remove unneeded function parameters.

[vlc] / modules / demux / flac.c

diff --git a/modules/demux/flac.c b/modules/demux/flac.c
index 3d9bf2456ad206737c9b38607b4082e0be5024f3..2459c9501895a536d2885edd7dc5869c7101f85b 100644 (file)
--- a/modules/demux/flac.c
+++ b/modules/demux/flac.c
@@ -29,7 +29,8 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_demux.h>
 #include <vlc_meta.h>
 #include <vlc_input.h>
@@ -44,7 +45,7 @@ static int  Open  ( vlc_object_t * );
 static void Close ( vlc_object_t * );
 
 vlc_module_begin();
-    set_description( _("FLAC demuxer") );
+    set_description( N_("FLAC demuxer") );
     set_capability( "demux", 155 );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
@@ -229,13 +230,18 @@ static int Demux( demux_t *p_demux )
                 p_sys->p_es = es_out_Add( p_demux->out, &p_sys->p_packetizer->fmt_out);
             }
 
+            p_sys->i_pts = p_block_out->i_dts;
+
+            /* Correct timestamp */
+            p_block_out->i_pts += p_sys->i_time_offset;
+            p_block_out->i_dts += p_sys->i_time_offset;
+
             /* set PCR */
-            if( p_block_out->i_dts >= p_sys->i_pts_start )
+            if( p_block_out->i_dts >= p_sys->i_pts_start + p_sys->i_time_offset )
                 es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_block_out->i_dts );
             else
                 es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
 
-            p_sys->i_pts = p_block_out->i_dts;
             es_out_Send( p_demux->out, p_sys->p_es, p_block_out );
 
             p_block_out = p_next;
@@ -282,10 +288,7 @@ static int64_t ControlGetTime( demux_t *p_demux )
 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;
     bool b_seekable;
     int i;
 
@@ -301,33 +304,43 @@ static int ControlSetTime( demux_t *p_demux, int64_t i_time )
         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( i_delta_time < 45*INT64_C(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 );
+        es_out_Control( p_demux->out, ES_OUT_SET_NEXT_DISPLAY_TIME, p_sys->p_es, p_sys->i_pts_start + p_sys->i_time_offset );
     }
     else
     {
+        int64_t i_delta_offset;
+        int64_t i_next_time;
+        int64_t i_next_offset;
+
+        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_offset = 0;
+        if( i_next_time-p_sys->seekpoint[i]->i_time_offset > 0 )
+            i_delta_offset = (i_next_offset - p_sys->seekpoint[i]->i_byte_offset) * i_delta_time /
+                             (i_next_time-p_sys->seekpoint[i]->i_time_offset);
+
         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;
     }
@@ -418,7 +431,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 );
@@ -460,9 +473,9 @@ 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 * I64C(1000000)/i_sample_rate;
+        p_sys->i_length = i_sample_count * INT64_C(1000000)/i_sample_rate;
 
     /* Be sure we have seekpoint 0 */
     s = vlc_seekpoint_New();
@@ -511,12 +524,12 @@ 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;
 
     *pi_rate = GetDWBE(&p_data[i_skip+4+6]) >> 12;
-    *pi_count = GetQWBE(&p_data[i_skip+4+6]) &  ((I64C(1)<<36)-1);
+    *pi_count = GetQWBE(&p_data[i_skip+4+6]) &  ((INT64_C(1)<<36)-1);
 }
 
 static void ParseSeekTable( demux_t *p_demux, const uint8_t *p_data, int i_data,
@@ -539,7 +552,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 * I64C(1000000)/i_sample_rate;
+        s->i_time_offset = i_sample * INT64_C(1000000)/i_sample_rate;
         s->i_byte_offset = GetQWBE( &p_data[4+18*i+8] );
 
         /* Check for duplicate entry */
@@ -607,7 +620,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 );
@@ -619,7 +632,8 @@ static void ParseComment( demux_t *p_demux, const uint8_t *p_data, int i_data )
         if( oldval ) \
         { \
             char * newval; \
-            asprintf( &newval, "%s,%s", oldval, &psz[strlen(txt)] ); \
+            if( asprintf( &newval, "%s,%s", oldval, &psz[strlen(txt)] ) == -1 ) \
+                newval = NULL; \
             vlc_meta_Set( p_sys->p_meta, vlc_meta_ ## var, newval ); \
             free( newval ); \
         } \
@@ -677,17 +691,17 @@ static void ParsePicture( demux_t *p_demux, const uint8_t *p_data, int i_data )
 
     i_type = GetDWBE( p_data ); RM(4);
     i_len = GetDWBE( p_data ); RM(4);
-    if( i_data < i_len + 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_data < i_len + 4*4 + 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);
-    if( i_len > i_data )
+    if( i_len < 0 || i_len > i_data )
         goto error;
 
     msg_Dbg( p_demux, "FLAC: Picture type=%d mime=%s description='%s' file length=%d",
@@ -703,7 +717,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;