#include <arpa/inet.h>
-#include "DeckLinkAPI.h"
-#include "DeckLinkAPIDispatch.cpp"
+#include <DeckLinkAPI.h>
+#include <DeckLinkAPIDispatch.cpp>
static int Open ( vlc_object_t * );
static void Close( vlc_object_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;
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_;
};
{
vlc_mutex_lock( &p_sys->frame_lock );
if( p_video_frame )
- p_sys->p_video_frame = p_video_frame; // FIXME: leak
+ {
+ if( p_sys->p_video_frame )
+ block_Release( p_sys->p_video_frame );
+ p_sys->p_video_frame = p_video_frame;
+ }
if( p_audio_frame )
- p_sys->p_audio_frame = p_audio_frame; // FIXME: leak
+ {
+ if( p_sys->p_audio_frame )
+ block_Release( p_sys->p_audio_frame );
+ p_sys->p_audio_frame = p_audio_frame;
+ }
vlc_cond_signal( &p_sys->has_frame );
vlc_mutex_unlock( &p_sys->frame_lock );
}
vlc_mutex_init( &p_sys->frame_lock );
vlc_cond_init( &p_sys->has_frame );
- p_sys->p_video_frame = NULL;
+ p_sys->b_first_frame = true;
IDeckLinkIterator *decklink_iterator = CreateDeckLinkIteratorInstance();
if( !decklink_iterator )
{
msg_Err( p_demux, "DeckLink drivers not found." );
- // FIXME: Leak here and several other error paths.
+ decklink_iterator->Release();
+ Close( p_this );
return VLC_EGENERIC;
}
int i_card_index = var_CreateGetInteger( p_demux, "sdi-card-index" );
for( int i = 0; i <= i_card_index; ++i )
{
+ if( p_sys->p_card )
+ p_sys->p_card->Release();
result = decklink_iterator->Next( &p_sys->p_card );
if( result != S_OK )
break;
}
+ decklink_iterator->Release();
+
if( result != S_OK )
{
msg_Err( p_demux, "DeckLink PCI card %d not found", i_card_index );
+ Close( p_this );
return VLC_EGENERIC;
}
if( result != S_OK )
{
msg_Err( p_demux, "Could not get model name" );
+ Close( p_this );
return VLC_EGENERIC;
}
if( p_sys->p_card->QueryInterface( IID_IDeckLinkInput, (void**)&p_sys->p_input) != S_OK )
{
msg_Err( p_demux, "Card has no inputs" );
+ Close( 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 )
{
msg_Err( p_demux, "Failed to get configuration interface" );
+ Close( p_this );
return VLC_EGENERIC;
}
{
msg_Err( p_demux, "Invalid --sdi-video-connection specified; choose one of " \
"sdi, hdmi, opticalsdi, component, composite, or svideo." );
+ p_config->Release();
+ free( psz_tmp );
+ Close( p_this );
return VLC_EGENERIC;
}
free( psz_tmp );
if( result != S_OK )
{
msg_Err( p_demux, "Failed to set video input connection" );
+ p_config->Release();
+ Close( p_this );
return VLC_EGENERIC;
}
}
{
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;
}
free( psz_tmp );
if( result != S_OK )
{
msg_Err( p_demux, "Failed to set audio input connection" );
+ p_config->Release();
+ Close( p_this );
return VLC_EGENERIC;
}
- }
+ }
- // Get the list of display modes.
+ p_config->Release();
+
+ /* Get the list of display modes. */
IDeckLinkDisplayModeIterator *p_display_iterator;
result = p_sys->p_input->GetDisplayModeIterator( &p_display_iterator );
if( result != S_OK )
{
msg_Err( p_demux, "Failed to enumerate display modes" );
+ p_display_iterator->Release();
+ Close( p_this );
return VLC_EGENERIC;
}
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;
}
- // 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 )
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) );
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() );
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;
}
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;
}
p_sys->i_fps_den = frame_duration;
p_sys->i_dominance_flags = i_dominance_flags;
}
+
+ p_display_mode->Release();
}
+ p_display_iterator->Release();
+
if( !b_found_mode )
{
msg_Err( p_demux, "Unknown SDI mode specified. " \
"Run VLC with -v --verbose-objects=-all,+sdi " \
"to get a list of supported modes." );
+ Close( p_this );
return VLC_EGENERIC;
}
if( result != S_OK )
{
msg_Err( p_demux, "Failed to enable video input" );
+ Close( 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 )
if( result != S_OK )
{
msg_Err( p_demux, "Failed to enable audio input" );
+ Close( p_this );
return VLC_EGENERIC;
}
}
if( result != S_OK )
{
msg_Err( p_demux, "Failed to start streams" );
+ Close( p_this );
return VLC_EGENERIC;
}
(char*)&audio_fmt.i_codec, audio_fmt.audio.i_rate, audio_fmt.audio.i_bitspersample, audio_fmt.audio.i_channels);
p_sys->p_audio_es = es_out_Add( p_demux->out, &audio_fmt );
- p_sys->b_first_frame = true;
-
/* Update default_pts to a suitable value for access */
var_Create( p_demux, "sdi-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
demux_t *p_demux = (demux_t *)p_this;
demux_sys_t *p_sys = p_demux->p_sys;
+ if( p_sys->p_input )
+ {
+ p_sys->p_input->StopStreams();
+ p_sys->p_input->Release();
+ }
+
+ if( p_sys->p_card )
+ p_sys->p_card->Release();
+
+ if( p_sys->p_delegate )
+ p_sys->p_delegate->Release();
+
+ if( p_sys->p_video_frame )
+ block_Release( p_sys->p_video_frame );
+
+ if( p_sys->p_audio_frame )
+ block_Release( p_sys->p_audio_frame );
+
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;
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 */
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 );
}
projects / vlc / blobdiff