X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fsdi.cpp;h=b842e0180d3d8b9a20935037416ea6068db2f734;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=9d42eae79aec9faac93f216cb0ac5ab270d55ac2;hpb=354bf997e0392b175aa791bb74245d9a6e007ab4;p=vlc diff --git a/modules/access/sdi.cpp b/modules/access/sdi.cpp index 9d42eae79a..b842e0180d 100644 --- a/modules/access/sdi.cpp +++ b/modules/access/sdi.cpp @@ -1,4 +1,4 @@ -/* BlackMagic SDI driver */ +/* Blackmagic SDI driver */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -16,6 +16,7 @@ #include #include #include +#include #include @@ -70,10 +71,10 @@ static void Close( vlc_object_t * ); vlc_module_begin () set_shortname( N_("SDI") ) - set_description( N_("BlackMagic SDI input") ) + set_description( N_("Blackmagic SDI input") ) 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, @@ -126,38 +127,37 @@ struct demux_sys_t class DeckLinkCaptureDelegate : public IDeckLinkInputCallback { public: - DeckLinkCaptureDelegate( demux_t *p_demux ) : m_ref_(1), p_demux_(p_demux) {} + DeckLinkCaptureDelegate( demux_t *p_demux ) : p_demux_(p_demux) + { + vlc_atomic_set( &m_ref_, 1 ); + } virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, LPVOID *ppv) { return E_NOINTERFACE; } - /* Note: AddRef() and Release() here are not thread safe. */ - virtual ULONG STDMETHODCALLTYPE AddRef(void) { - return ++m_ref_; + return vlc_atomic_inc( &m_ref_ ); } virtual ULONG STDMETHODCALLTYPE Release(void) { - if ( --m_ref_ == 0 ) - { + uintptr_t new_ref = vlc_atomic_dec( &m_ref_ ); + if ( new_ref == 0 ) delete this; - return 0; - } - return m_ref_; + return new_ref; } virtual HRESULT STDMETHODCALLTYPE VideoInputFormatChanged(BMDVideoInputFormatChangedEvents, IDeckLinkDisplayMode*, BMDDetectedVideoInputFormatFlags); virtual HRESULT STDMETHODCALLTYPE VideoInputFrameArrived(IDeckLinkVideoInputFrame*, IDeckLinkAudioInputPacket*); private: - int m_ref_; + vlc_atomic_t m_ref_; demux_t *p_demux_; }; HRESULT DeckLinkCaptureDelegate::VideoInputFormatChanged(BMDVideoInputFormatChangedEvents events, IDeckLinkDisplayMode *mode, BMDDetectedVideoInputFormatFlags) { - msg_Dbg( p_demux_, "Video input format changed" ); + msg_Dbg( p_demux_, "Video input format changed" ); return S_OK; } @@ -206,7 +206,7 @@ HRESULT DeckLinkCaptureDelegate::VideoInputFrameArrived(IDeckLinkVideoInputFrame } p_video_frame->i_pts = p_video_frame->i_dts = VLC_TS_0 + stream_time; } - + if( audioFrame ) { const int i_bytes = audioFrame->GetSampleFrameCount() * sizeof(int16_t) * p_sys->i_channels; @@ -215,6 +215,8 @@ HRESULT DeckLinkCaptureDelegate::VideoInputFrameArrived(IDeckLinkVideoInputFrame if( !p_audio_frame ) { msg_Err( p_demux_, "Could not allocate memory for audio frame" ); + if( p_video_frame ) + block_Release( p_video_frame ); return S_OK; } @@ -253,6 +255,13 @@ static int Open( vlc_object_t *p_this ) { demux_t *p_demux = (demux_t*)p_this; demux_sys_t *p_sys; + int ret = VLC_SUCCESS; + char *psz_aspect; + char *psz_display_mode = NULL; + char *psz_video_connection = NULL; + char *psz_audio_connection = NULL; + bool b_found_mode; + int i_card_index; /* Only when selected */ if( *p_demux->psz_access == '\0' ) @@ -276,14 +285,13 @@ static int Open( vlc_object_t *p_this ) if( !decklink_iterator ) { msg_Err( p_demux, "DeckLink drivers not found." ); - decklink_iterator->Release(); - Close( p_this ); - return VLC_EGENERIC; + ret = VLC_EGENERIC; + goto finish; } HRESULT result; - int i_card_index = var_CreateGetInteger( p_demux, "sdi-card-index" ); + i_card_index = var_InheritInteger( p_demux, "sdi-card-index" ); for( int i = 0; i <= i_card_index; ++i ) { if( p_sys->p_card ) @@ -293,23 +301,21 @@ static int Open( vlc_object_t *p_this ) 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; + ret = VLC_EGENERIC; + goto finish; } 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" ); - Close( p_this ); - return VLC_EGENERIC; + ret = VLC_EGENERIC; + goto finish; } msg_Dbg( p_demux, "Opened DeckLink PCI card %d (%s)", i_card_index, psz_model_name ); @@ -317,109 +323,96 @@ static int Open( vlc_object_t *p_this ) 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; + ret = VLC_EGENERIC; + goto finish; } - + /* 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; + ret = VLC_EGENERIC; + goto finish; } - - char *psz_tmp = var_CreateGetNonEmptyString( p_demux, "sdi-video-connection" ); - if( psz_tmp ) + + psz_video_connection = var_CreateGetNonEmptyString( p_demux, "sdi-video-connection" ); + if( psz_video_connection ) { BMDVideoConnection conn; - if ( !strcmp( psz_tmp, "sdi" ) ) + if ( !strcmp( psz_video_connection, "sdi" ) ) conn = bmdVideoConnectionSDI; - else if ( !strcmp( psz_tmp, "hdmi" ) ) + else if ( !strcmp( psz_video_connection, "hdmi" ) ) conn = bmdVideoConnectionHDMI; - else if ( !strcmp( psz_tmp, "opticalsdi" ) ) + else if ( !strcmp( psz_video_connection, "opticalsdi" ) ) conn = bmdVideoConnectionOpticalSDI; - else if ( !strcmp( psz_tmp, "component" ) ) + else if ( !strcmp( psz_video_connection, "component" ) ) conn = bmdVideoConnectionComponent; - else if ( !strcmp( psz_tmp, "composite" ) ) + else if ( !strcmp( psz_video_connection, "composite" ) ) conn = bmdVideoConnectionComposite; - else if ( !strcmp( psz_tmp, "svideo" ) ) + else if ( !strcmp( psz_video_connection, "svideo" ) ) conn = bmdVideoConnectionSVideo; else { 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; + ret = VLC_EGENERIC; + goto finish; } - free( psz_tmp ); msg_Dbg( p_demux, "Setting video input format to 0x%x", conn); result = p_config->SetVideoInputFormat( conn ); if( result != S_OK ) { msg_Err( p_demux, "Failed to set video input connection" ); - p_config->Release(); - Close( p_this ); - return VLC_EGENERIC; + ret = VLC_EGENERIC; + goto finish; } - } + } - psz_tmp = var_CreateGetNonEmptyString( p_demux, "sdi-audio-connection" ); - if( psz_tmp ) + psz_audio_connection = var_CreateGetNonEmptyString( p_demux, "sdi-audio-connection" ); + if( psz_audio_connection ) { BMDAudioConnection conn; - if ( !strcmp( psz_tmp, "embedded" ) ) + if ( !strcmp( psz_audio_connection, "embedded" ) ) conn = bmdAudioConnectionEmbedded; - else if ( !strcmp( psz_tmp, "aesebu" ) ) + else if ( !strcmp( psz_audio_connection, "aesebu" ) ) conn = bmdAudioConnectionAESEBU; - else if ( !strcmp( psz_tmp, "analog" ) ) + else if ( !strcmp( psz_audio_connection, "analog" ) ) conn = bmdAudioConnectionAnalog; else { 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; + ret = VLC_EGENERIC; + goto finish; } - free( psz_tmp ); msg_Dbg( p_demux, "Setting audio input format to 0x%x", conn); result = p_config->SetAudioInputFormat( conn ); if( result != S_OK ) { msg_Err( p_demux, "Failed to set audio input connection" ); - p_config->Release(); - Close( p_this ); - return VLC_EGENERIC; + ret = VLC_EGENERIC; + goto finish; } } - 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; + ret = VLC_EGENERIC; + goto finish; } - - char *psz_display_mode = var_CreateGetString( p_demux, "sdi-mode" ); + + psz_display_mode = var_InheritString( 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; + ret = VLC_EGENERIC; + goto finish; } /* @@ -430,20 +423,18 @@ 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) ); - - bool b_found_mode = false; + + b_found_mode = false; for (;;) { IDeckLinkDisplayMode *p_display_mode; result = p_display_iterator->Next( &p_display_mode ); if( result != S_OK || !p_display_mode ) - break; + break; char sz_mode_id_text[5] = {0}; BMDDisplayMode mode_id = ntohl( p_display_mode->GetDisplayMode() ); @@ -455,9 +446,8 @@ static int Open( vlc_object_t *p_this ) { msg_Err( p_demux, "Failed to get display mode name" ); p_display_mode->Release(); - p_display_iterator->Release(); - Close( p_this ); - return VLC_EGENERIC; + ret = VLC_EGENERIC; + goto finish; } BMDTimeValue frame_duration, time_scale; @@ -466,9 +456,8 @@ static int Open( vlc_object_t *p_this ) { msg_Err( p_demux, "Failed to get frame rate" ); p_display_mode->Release(); - p_display_iterator->Release(); - Close( p_this ); - return VLC_EGENERIC; + ret = VLC_EGENERIC; + goto finish; } const char *psz_field_dominance; @@ -513,48 +502,47 @@ static int Open( vlc_object_t *p_this ) 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; + ret = VLC_EGENERIC; + goto finish; } result = p_sys->p_input->EnableVideoInput( htonl( wanted_mode_id ), bmdFormat8BitYUV, 0 ); if( result != S_OK ) { msg_Err( p_demux, "Failed to enable video input" ); - Close( p_this ); - return VLC_EGENERIC; + ret = VLC_EGENERIC; + goto finish; } - + /* 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" ); + p_sys->i_rate = var_InheritInteger( p_demux, "sdi-audio-rate" ); + p_sys->i_channels = var_InheritInteger( p_demux, "sdi-audio-channels" ); if( p_sys->i_rate > 0 && p_sys->i_channels > 0 ) { result = p_sys->p_input->EnableAudioInput( p_sys->i_rate, bmdAudioSampleType16bitInteger, p_sys->i_channels ); if( result != S_OK ) { msg_Err( p_demux, "Failed to enable audio input" ); - Close( p_this ); - return VLC_EGENERIC; + ret = VLC_EGENERIC; + goto finish; } } - + p_sys->p_delegate = new DeckLinkCaptureDelegate( p_demux ); p_sys->p_input->SetCallback( p_sys->p_delegate ); result = p_sys->p_input->StartStreams(); if( result != S_OK ) { - msg_Err( p_demux, "Failed to start streams" ); - Close( p_this ); - return VLC_EGENERIC; + msg_Err( p_demux, "Could not start streaming from SDI card. This could be caused " + "by invalid video mode or flags, access denied, or card already in use." ); + ret = VLC_EGENERIC; + goto finish; } /* Declare elementary streams */ @@ -567,24 +555,24 @@ static int Open( vlc_object_t *p_this ) video_fmt.video.i_frame_rate = p_sys->i_fps_num; video_fmt.video.i_frame_rate_base = p_sys->i_fps_den; video_fmt.i_bitrate = video_fmt.video.i_width * video_fmt.video.i_height * video_fmt.video.i_frame_rate * 2 * 8; - - psz_tmp = var_CreateGetNonEmptyString( p_demux, "sdi-aspect-ratio" ); - if( psz_tmp ) + + psz_aspect = var_CreateGetNonEmptyString( p_demux, "sdi-aspect-ratio" ); + if( psz_aspect ) { - char *psz_denominator = strchr( psz_tmp, ':' ); + char *psz_denominator = strchr( psz_aspect, ':' ); if( psz_denominator ) { *psz_denominator++ = '\0'; - video_fmt.video.i_sar_num = atoi( psz_tmp ) * video_fmt.video.i_height; + video_fmt.video.i_sar_num = atoi( psz_aspect ) * video_fmt.video.i_height; video_fmt.video.i_sar_den = atoi( psz_denominator ) * video_fmt.video.i_width; } - free( psz_tmp ); + free( psz_aspect ); } msg_Dbg( p_demux, "added new video es %4.4s %dx%d", (char*)&video_fmt.i_codec, video_fmt.video.i_width, video_fmt.video.i_height ); p_sys->p_video_es = es_out_Add( p_demux->out, &video_fmt ); - + es_format_t audio_fmt; es_format_Init( &audio_fmt, AUDIO_ES, VLC_CODEC_S16N ); audio_fmt.audio.i_channels = p_sys->i_channels; @@ -600,7 +588,24 @@ static int Open( vlc_object_t *p_this ) /* Update default_pts to a suitable value for access */ var_Create( p_demux, "sdi-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - return VLC_SUCCESS; +finish: + if( decklink_iterator ) + decklink_iterator->Release(); + + if( p_config ) + p_config->Release(); + + free( psz_video_connection ); + free( psz_audio_connection ); + free( psz_display_mode ); + + if( p_display_iterator ) + p_display_iterator->Release(); + + if( ret != VLC_SUCCESS ) + Close( p_this ); + + return ret; } static void Close( vlc_object_t *p_this ) @@ -619,10 +624,10 @@ static void Close( vlc_object_t *p_this ) 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 ); @@ -689,7 +694,7 @@ static int Demux( demux_t *p_demux ) 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 )