Yet more free troubles.

[vlc] / modules / access / sdi.cpp

diff --git a/modules/access/sdi.cpp b/modules/access/sdi.cpp
index 61bb92ac8540dd2f93469c63b5e6876dca27ba2f..9e9acc92496c2100850f3ac0cabc99d1e1e47fbe 100644 (file)
--- a/modules/access/sdi.cpp
+++ b/modules/access/sdi.cpp
@@ -110,6 +110,7 @@ struct demux_sys_t
     es_out_id_t *p_video_es;
     es_out_id_t *p_audio_es;
     bool b_first_frame;
+    int i_last_pts;
 
     int i_width, i_height, i_fps_num, i_fps_den;
     uint32_t i_dominance_flags;
@@ -379,6 +380,8 @@ static int Open( vlc_object_t *p_this )
         {
             msg_Err( p_demux, "Invalid --sdi-audio-connection specified; choose one of " \
                               "embedded, aesebu, or analog." );
+            free( psz_tmp );
+            p_config->Release();
             Close( p_this );
             return VLC_EGENERIC;
         }
@@ -411,6 +414,7 @@ static int Open( vlc_object_t *p_this )
     char *psz_display_mode = var_CreateGetString( p_demux, "sdi-mode" );
     if( !psz_display_mode || strlen( psz_display_mode ) == 0 || strlen( psz_display_mode ) > 4 ) {
         msg_Err( p_demux, "Missing or invalid --sdi-mode string" );
+        free( psz_display_mode );
         p_display_iterator->Release();
         Close( p_this );
         return VLC_EGENERIC;
@@ -424,6 +428,8 @@ static int Open( vlc_object_t *p_this )
     strcpy(sz_display_mode_padded, "    ");
     for( int i = 0; i < strlen( psz_display_mode ); ++i )
         sz_display_mode_padded[i] = psz_display_mode[i];
+        
+    free( psz_display_mode );
 
     BMDDisplayMode wanted_mode_id;
     memcpy( &wanted_mode_id, &sz_display_mode_padded, sizeof(wanted_mode_id) );
@@ -435,9 +441,7 @@ static int Open( vlc_object_t *p_this )
         IDeckLinkDisplayMode *p_display_mode;
         result = p_display_iterator->Next( &p_display_mode );
         if( result != S_OK || !p_display_mode )
-        {
             break; 
-        }
 
         char sz_mode_id_text[5] = {0};
         BMDDisplayMode mode_id = ntohl( p_display_mode->GetDisplayMode() );
@@ -448,6 +452,7 @@ static int Open( vlc_object_t *p_this )
         if( result != S_OK )
         {
             msg_Err( p_demux, "Failed to get display mode name" );
+            p_display_mode->Release();
             p_display_iterator->Release();
             Close( p_this );
             return VLC_EGENERIC;
@@ -458,6 +463,7 @@ static int Open( vlc_object_t *p_this )
         if( result != S_OK )
         {
             msg_Err( p_demux, "Failed to get frame rate" );
+            p_display_mode->Release();
             p_display_iterator->Release();
             Close( p_this );
             return VLC_EGENERIC;
@@ -501,6 +507,8 @@ static int Open( vlc_object_t *p_this )
             p_sys->i_fps_den = frame_duration;
             p_sys->i_dominance_flags = i_dominance_flags;
         }
+
+        p_display_mode->Release();
     }
 
     p_display_iterator->Release();
@@ -617,6 +625,7 @@ static void Close( vlc_object_t *p_this )
 
 static int Control( demux_t *p_demux, int i_query, va_list args )
 {
+    demux_sys_t *p_sys = p_demux->p_sys;
     bool *pb;
     int64_t    *pi64;
 
@@ -637,7 +646,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
 
         case DEMUX_GET_TIME:
             pi64 = (int64_t*)va_arg( args, int64_t * );
-            *pi64 = mdate();  /* FIXME */
+            *pi64 = p_sys->i_last_pts;
             return VLC_SUCCESS;
 
         /* TODO implement others */
@@ -669,12 +678,16 @@ static int Demux( demux_t *p_demux )
 
     if( p_video_block )
     {
+        if( p_video_block->i_pts > p_sys->i_last_pts )
+            p_sys->i_last_pts = p_video_block->i_pts;
         es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_video_block->i_pts );
         es_out_Send( p_demux->out, p_sys->p_video_es, p_video_block );
     }
     
     if( p_audio_block )
     {
+        if( p_audio_block->i_pts > p_sys->i_last_pts )
+            p_sys->i_last_pts = p_audio_block->i_pts;
         es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_audio_block->i_pts );
         es_out_Send( p_demux->out, p_sys->p_audio_es, p_audio_block );
     }