X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fsdi.cpp;h=b842e0180d3d8b9a20935037416ea6068db2f734;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=b539074f6e3fad85d648cccad93909962f4956dc;hpb=e542ae5c523ad56dbc50df35a716914aa1d18f8e;p=vlc diff --git a/modules/access/sdi.cpp b/modules/access/sdi.cpp index b539074f6e..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,15 +16,21 @@ #include #include #include +#include #include -#include "DeckLinkAPI.h" -#include "DeckLinkAPIDispatch.cpp" +#include +#include 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. " \ @@ -52,16 +58,25 @@ static void Close( vlc_object_t * ); "Number of input audio channels for SDI captures. " \ "Must be 2, 8 or 16. 0 disables audio input." ) +#define VIDEO_CONNECTION_TEXT N_("Video connection") +#define VIDEO_CONNECTION_LONGTEXT N_( \ + "Video connection to use for SDI captures. " \ + "Valid choices: sdi, hdmi, opticalsdi, component, " \ + "composite, svideo. " \ + "Leave blank for card default." ) + #define ASPECT_RATIO_TEXT N_("Aspect ratio") #define ASPECT_RATIO_LONGTEXT N_( \ "Aspect ratio (4:3, 16:9). Default assumes square pixels." ) 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, MODE_TEXT, MODE_LONGTEXT, true ) add_integer( "sdi-caching", DEFAULT_PTS_DELAY / 1000, NULL, @@ -72,6 +87,8 @@ vlc_module_begin () RATE_TEXT, RATE_LONGTEXT, true ) add_integer( "sdi-audio-channels", 2, NULL, CHANNELS_TEXT, CHANNELS_LONGTEXT, true ) + add_string( "sdi-video-connection", 0, NULL, + VIDEO_CONNECTION_TEXT, VIDEO_CONNECTION_LONGTEXT, true ) add_string( "sdi-aspect-ratio", NULL, NULL, ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, true ) @@ -94,6 +111,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; @@ -101,31 +119,45 @@ 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 ) : p_demux_(p_demux) + { + vlc_atomic_set( &m_ref_, 1 ); + } - // 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; } + + virtual ULONG STDMETHODCALLTYPE AddRef(void) + { + return vlc_atomic_inc( &m_ref_ ); + } + + virtual ULONG STDMETHODCALLTYPE Release(void) + { + uintptr_t new_ref = vlc_atomic_dec( &m_ref_ ); + if ( new_ref == 0 ) + delete this; + return new_ref; + } virtual HRESULT STDMETHODCALLTYPE VideoInputFormatChanged(BMDVideoInputFormatChangedEvents, IDeckLinkDisplayMode*, BMDDetectedVideoInputFormatFlags); virtual HRESULT STDMETHODCALLTYPE VideoInputFrameArrived(IDeckLinkVideoInputFrame*, IDeckLinkAudioInputPacket*); private: + 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; } @@ -174,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; @@ -183,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; } @@ -199,9 +233,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 ); } @@ -213,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' ) @@ -230,112 +279,175 @@ static int Open( vlc_object_t *p_this ) 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. - return VLC_EGENERIC; + ret = VLC_EGENERIC; + goto finish; } HRESULT result; - result = decklink_iterator->Next( &p_sys->p_card ); + + i_card_index = var_InheritInteger( 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; + } if( result != S_OK ) { - msg_Err( p_demux, "No DeckLink PCI cards found" ); - return VLC_EGENERIC; + msg_Err( p_demux, "DeckLink PCI card %d not found", i_card_index ); + 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" ); + ret = VLC_EGENERIC; + goto finish; } + msg_Dbg( p_demux, "Opened DeckLink PCI card %d (%s)", i_card_index, 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" ); - return VLC_EGENERIC; + ret = VLC_EGENERIC; + goto finish; } - - // 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" ); - return VLC_EGENERIC; + ret = VLC_EGENERIC; + goto finish; + } + + psz_video_connection = var_CreateGetNonEmptyString( p_demux, "sdi-video-connection" ); + if( psz_video_connection ) + { + BMDVideoConnection conn; + if ( !strcmp( psz_video_connection, "sdi" ) ) + conn = bmdVideoConnectionSDI; + else if ( !strcmp( psz_video_connection, "hdmi" ) ) + conn = bmdVideoConnectionHDMI; + else if ( !strcmp( psz_video_connection, "opticalsdi" ) ) + conn = bmdVideoConnectionOpticalSDI; + else if ( !strcmp( psz_video_connection, "component" ) ) + conn = bmdVideoConnectionComponent; + else if ( !strcmp( psz_video_connection, "composite" ) ) + conn = bmdVideoConnectionComposite; + 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." ); + ret = VLC_EGENERIC; + goto finish; + } + + 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" ); + ret = VLC_EGENERIC; + goto finish; + } } - char *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." ); - 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" ); - return VLC_EGENERIC; + ret = VLC_EGENERIC; + goto finish; } - } + } - // 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" ); - return VLC_EGENERIC; + ret = VLC_EGENERIC; + goto finish; } - - char *mode_string = var_CreateGetString( p_demux, "sdi-mode" ); - if( !mode_string || strlen( mode_string ) == 0 || strlen( mode_string ) > 4 ) { + + 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" ); - return VLC_EGENERIC; + ret = VLC_EGENERIC; + goto finish; } - // Pad the --sdi-mode string to four characters, so the user can specify e.g. "pal" - // without having to add the trailing space. - char mode_string_padded[5]; - strcpy(mode_string_padded, " "); - for( int i = 0; i < strlen(mode_string); ++i ) - mode_string_padded[i] = mode_string[i]; + /* + * 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]; BMDDisplayMode wanted_mode_id; - memcpy( &wanted_mode_id, &mode_string_padded, sizeof(wanted_mode_id) ); - - bool b_found_mode = false; + memcpy( &wanted_mode_id, &sz_display_mode_padded, sizeof(wanted_mode_id) ); + + 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 mode_id_text[5] = {0}; + char sz_mode_id_text[5] = {0}; BMDDisplayMode mode_id = ntohl( p_display_mode->GetDisplayMode() ); - memcpy( mode_id_text, &mode_id, sizeof(mode_id) ); + memcpy( sz_mode_id_text, &mode_id, sizeof(mode_id) ); - const char *mode_name; - result = p_display_mode->GetName( &mode_name ); + const char *psz_mode_name; + result = p_display_mode->GetName( &psz_mode_name ); if( result != S_OK ) { msg_Err( p_demux, "Failed to get display mode name" ); - return VLC_EGENERIC; + p_display_mode->Release(); + ret = VLC_EGENERIC; + goto finish; } BMDTimeValue frame_duration, time_scale; @@ -343,37 +455,39 @@ static int Open( vlc_object_t *p_this ) if( result != S_OK ) { msg_Err( p_demux, "Failed to get frame rate" ); - return VLC_EGENERIC; + p_display_mode->Release(); + ret = VLC_EGENERIC; + goto finish; } - const char *field_dominance; + const char *psz_field_dominance; uint32_t i_dominance_flags = 0; switch( p_display_mode->GetFieldDominance() ) { case bmdProgressiveFrame: - field_dominance = ""; + psz_field_dominance = ""; break; case bmdProgressiveSegmentedFrame: - field_dominance = ", segmented"; + psz_field_dominance = ", segmented"; break; case bmdLowerFieldFirst: - field_dominance = ", interlaced [BFF]"; + psz_field_dominance = ", interlaced [BFF]"; i_dominance_flags = BLOCK_FLAG_BOTTOM_FIELD_FIRST; break; case bmdUpperFieldFirst: - field_dominance = ", interlaced [TFF]"; + psz_field_dominance = ", interlaced [TFF]"; i_dominance_flags = BLOCK_FLAG_TOP_FIELD_FIRST; break; case bmdUnknownFieldDominance: default: - field_dominance = ", unknown field dominance"; + psz_field_dominance = ", unknown field dominance"; break; } msg_Dbg( p_demux, "Found mode '%s': %s (%dx%d, %.3f fps%s)", - mode_id_text, mode_name, + sz_mode_id_text, psz_mode_name, p_display_mode->GetWidth(), p_display_mode->GetHeight(), - double(time_scale) / frame_duration, field_dominance ); + double(time_scale) / frame_duration, psz_field_dominance ); if( wanted_mode_id == mode_id ) { @@ -384,6 +498,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(); } if( !b_found_mode ) @@ -391,37 +507,42 @@ static int Open( vlc_object_t *p_this ) msg_Err( p_demux, "Unknown SDI mode specified. " \ "Run VLC with -v --verbose-objects=-all,+sdi " \ "to get a list of supported modes." ); - 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" ); - 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" ); + + /* Set up audio. */ + 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" ); - 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" ); - 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 */ @@ -433,25 +554,25 @@ static int Open( vlc_object_t *p_this ) video_fmt.video.i_sar_den = 1; 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; - - psz_tmp = var_CreateGetNonEmptyString( p_demux, "sdi-aspect-ratio" ); - if( psz_tmp ) + video_fmt.i_bitrate = video_fmt.video.i_width * video_fmt.video.i_height * video_fmt.video.i_frame_rate * 2 * 8; + + 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; @@ -464,12 +585,27 @@ static int Open( vlc_object_t *p_this ) (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 ); - 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 ) @@ -477,11 +613,30 @@ 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(); + + 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; @@ -502,7 +657,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 */ @@ -534,12 +689,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 ); }