Remove extra braces.

[vlc] / modules / access / sdi.cpp

diff --git a/modules/access/sdi.cpp b/modules/access/sdi.cpp
index 84b3b4dad46614e86ef64071a3d7bf353c696146..b5e021c415adba34a64af82a8c4baa59ee7431f2 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;
@@ -117,25 +118,40 @@ struct demux_sys_t
     int i_rate, i_channels;
 
     vlc_mutex_t frame_lock;
-    block_t *p_video_frame;  // protected by <frame_lock>
-    block_t *p_audio_frame;  // protected by <frame_lock>
-    vlc_cond_t has_frame;  // related to <frame_lock>
+    block_t *p_video_frame;  /* protected by <frame_lock> */
+    block_t *p_audio_frame;  /* protected by <frame_lock> */
+    vlc_cond_t has_frame;  /* related to <frame_lock> */
 };
 
 class DeckLinkCaptureDelegate : public IDeckLinkInputCallback
 {
 public:
-    DeckLinkCaptureDelegate( demux_t *p_demux ) : p_demux_(p_demux) {}
+    DeckLinkCaptureDelegate( demux_t *p_demux ) : m_ref_(1), p_demux_(p_demux) {}
 
-    // FIXME: These leak.
     virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, LPVOID *ppv) { return E_NOINTERFACE; }
-    virtual ULONG STDMETHODCALLTYPE AddRef(void) { return 1; }
-    virtual ULONG STDMETHODCALLTYPE Release(void) { return 1; }
+
+    /* Note: AddRef() and Release() here are not thread safe. */
+
+    virtual ULONG STDMETHODCALLTYPE AddRef(void)
+    {
+        return ++m_ref_;
+    }
+
+    virtual ULONG STDMETHODCALLTYPE Release(void)
+    {
+        if ( --m_ref_ == 0 )
+        {
+            delete this;
+            return 0;
+        }
+        return m_ref_;
+    }
 
     virtual HRESULT STDMETHODCALLTYPE VideoInputFormatChanged(BMDVideoInputFormatChangedEvents, IDeckLinkDisplayMode*, BMDDetectedVideoInputFormatFlags);
     virtual HRESULT STDMETHODCALLTYPE VideoInputFrameArrived(IDeckLinkVideoInputFrame*, IDeckLinkAudioInputPacket*);
 
 private:
+    int m_ref_;
     demux_t *p_demux_;
 };
 
@@ -303,7 +319,7 @@ static int Open( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
    
-    // Set up the video and audio sources. 
+    /* Set up the video and audio sources. */
     IDeckLinkConfiguration *p_config;
     if( p_sys->p_card->QueryInterface( IID_IDeckLinkConfiguration, (void**)&p_config) != S_OK )
     {
@@ -364,6 +380,7 @@ static int Open( vlc_object_t *p_this )
         {
             msg_Err( p_demux, "Invalid --sdi-audio-connection specified; choose one of " \
                               "embedded, aesebu, or analog." );
+            p_config->Release();
             Close( p_this );
             return VLC_EGENERIC;
         }
@@ -382,7 +399,7 @@ static int Open( vlc_object_t *p_this )
 
     p_config->Release();
 
-    // Get the list of display modes.
+    /* Get the list of display modes. */
     IDeckLinkDisplayModeIterator *p_display_iterator;
     result = p_sys->p_input->GetDisplayModeIterator( &p_display_iterator );
     if( result != S_OK )
@@ -401,8 +418,10 @@ static int Open( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
 
-    // Pad the --sdi-mode string to four characters, so the user can specify e.g. "pal"
-    // without having to add the trailing space.
+    /*
+     * Pad the --sdi-mode string to four characters, so the user can specify e.g. "pal"
+     * without having to add the trailing space.
+     */
     char sz_display_mode_padded[5];
     strcpy(sz_display_mode_padded, "    ");
     for( int i = 0; i < strlen( psz_display_mode ); ++i )
@@ -418,9 +437,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() );
@@ -505,7 +522,7 @@ static int Open( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
   
-    // Set up audio. 
+    /* Set up audio. */
     p_sys->i_rate = var_CreateGetInteger( p_demux, "sdi-audio-rate" );
     p_sys->i_channels = var_CreateGetInteger( p_demux, "sdi-audio-channels" );
     if( p_sys->i_rate > 0 && p_sys->i_channels > 0 )
@@ -592,12 +609,15 @@ static void Close( vlc_object_t *p_this )
     if( p_sys->p_card )
         p_sys->p_card->Release();
 
-    delete p_sys->p_delegate;
+    if( p_sys->p_delegate )
+        p_sys->p_delegate->Release();
+
     free( p_sys );
 }
 
 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;
 
@@ -618,7 +638,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 */
@@ -650,12 +670,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 );
     }