X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fsdi.cpp;h=f2b99cfdafd90aeba5b622bc40d871b8d1d4d4b8;hb=6c29b00af01a5570e49b2c56e36650882903a14f;hp=12e71926faa1ed2e796e7eb3a85c8ad538cf2386;hpb=884ad77b7f0a4cae1a181c7034cf49fc8c399a3a;p=vlc diff --git a/modules/access/sdi.cpp b/modules/access/sdi.cpp index 12e71926fa..f2b99cfdaf 100644 --- a/modules/access/sdi.cpp +++ b/modules/access/sdi.cpp @@ -25,6 +25,11 @@ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); +#define CARD_INDEX_TEXT N_("Input card to use") +#define CARD_INDEX_LONGTEXT N_( \ + "SDI capture card to use, if multiple exist. " \ + "The cards are numbered from 0." ) + #define MODE_TEXT N_("Desired input video mode") #define MODE_LONGTEXT N_( \ "Desired input video mode for SDI captures. " \ @@ -69,6 +74,8 @@ vlc_module_begin () set_category( CAT_INPUT ) set_subcategory( SUBCAT_INPUT_ACCESS ) + add_integer( "sdi-card-index", 0, NULL, + CARD_INDEX_TEXT, CARD_INDEX_LONGTEXT, true ) add_string( "sdi-mode", "pal ", NULL, MODE_TEXT, MODE_LONGTEXT, true ) add_integer( "sdi-caching", DEFAULT_PTS_DELAY / 1000, NULL, @@ -103,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; @@ -110,25 +118,40 @@ struct demux_sys_t int i_rate, i_channels; vlc_mutex_t frame_lock; - block_t *p_video_frame; // protected by - block_t *p_audio_frame; // protected by - vlc_cond_t has_frame; // related to + block_t *p_video_frame; /* protected by */ + block_t *p_audio_frame; /* protected by */ + vlc_cond_t has_frame; /* related to */ }; 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_; }; @@ -208,9 +231,17 @@ HRESULT DeckLinkCaptureDelegate::VideoInputFrameArrived(IDeckLinkVideoInputFrame { 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 ); } @@ -245,30 +276,57 @@ static int Open( vlc_object_t *p_this ) 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; } HRESULT result; - result = decklink_iterator->Next( &p_sys->p_card ); + + int i_card_index = var_CreateGetInteger( p_demux, "sdi-card-index" ); + for( int i = 0; i <= i_card_index; ++i ) + { + result = decklink_iterator->Next( &p_sys->p_card ); + if( result != S_OK ) + break; + } + + decklink_iterator->Release(); if( result != S_OK ) { - msg_Err( p_demux, "No DeckLink PCI cards found" ); + msg_Err( p_demux, "DeckLink PCI card %d not found", i_card_index ); + Close( p_this ); return VLC_EGENERIC; } + const char *psz_model_name; + result = p_sys->p_card->GetModelName( &psz_model_name ); + + if( result != S_OK ) + { + msg_Err( p_demux, "Could not get model name" ); + free( psz_model_name ); + Close( p_this ); + return VLC_EGENERIC; + } + + msg_Dbg( p_demux, "Opened DeckLink PCI card %d (%s)", i_card_index, psz_model_name ); + free( psz_model_name ); + 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; } @@ -292,6 +350,9 @@ static int Open( vlc_object_t *p_this ) { 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 ); @@ -301,6 +362,8 @@ static int Open( vlc_object_t *p_this ) if( result != S_OK ) { msg_Err( p_demux, "Failed to set video input connection" ); + p_config->Release(); + Close( p_this ); return VLC_EGENERIC; } } @@ -319,6 +382,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." ); + Close( p_this ); return VLC_EGENERIC; } free( psz_tmp ); @@ -328,27 +392,37 @@ static int Open( vlc_object_t *p_this ) if( result != S_OK ) { msg_Err( p_demux, "Failed to set audio input connection" ); + p_config->Release(); + Close( p_this ); return VLC_EGENERIC; } - } + } + + 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 ) { 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" ); + 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 ) @@ -377,6 +451,8 @@ static int Open( vlc_object_t *p_this ) if( result != S_OK ) { msg_Err( p_demux, "Failed to get display mode name" ); + p_display_iterator->Release(); + Close( p_this ); return VLC_EGENERIC; } @@ -385,6 +461,8 @@ static int Open( vlc_object_t *p_this ) if( result != S_OK ) { msg_Err( p_demux, "Failed to get frame rate" ); + p_display_iterator->Release(); + Close( p_this ); return VLC_EGENERIC; } @@ -428,11 +506,14 @@ static int Open( vlc_object_t *p_this ) } } + 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; } @@ -440,10 +521,11 @@ static int Open( vlc_object_t *p_this ) 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 ) @@ -452,6 +534,7 @@ static int Open( vlc_object_t *p_this ) if( result != S_OK ) { msg_Err( p_demux, "Failed to enable audio input" ); + Close( p_this ); return VLC_EGENERIC; } } @@ -463,6 +546,7 @@ static int Open( vlc_object_t *p_this ) if( result != S_OK ) { msg_Err( p_demux, "Failed to start streams" ); + Close( p_this ); return VLC_EGENERIC; } @@ -519,11 +603,24 @@ static void Close( vlc_object_t *p_this ) 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(); + 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; @@ -544,7 +641,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 */ @@ -576,12 +673,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 ); }