X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fsdi.cpp;h=ec93c27cf677276bd8b8e5bd1676f38fa7bfa734;hb=794142d331d9a04420fd7e010fb63d13ac43cfb3;hp=aae8cb6c27a10eaead26a64e278ebc1cadf2530e;hpb=83dab833098630f15c5299673367d611b383c688;p=vlc diff --git a/modules/access/sdi.cpp b/modules/access/sdi.cpp index aae8cb6c27..ec93c27cf6 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" @@ -19,8 +19,8 @@ #include -#include "DeckLinkAPI.h" -#include "DeckLinkAPIDispatch.cpp" +#include +#include static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); @@ -70,10 +70,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, @@ -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,9 +118,9 @@ 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 @@ -129,7 +130,7 @@ public: virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, LPVOID *ppv) { return E_NOINTERFACE; } - // Note: AddRef() and Release() here are not thread safe. + /* Note: AddRef() and Release() here are not thread safe. */ virtual ULONG STDMETHODCALLTYPE AddRef(void) { @@ -156,7 +157,7 @@ private: 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; } @@ -205,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; @@ -214,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; } @@ -269,7 +272,7 @@ 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 ) @@ -285,6 +288,8 @@ static int Open( vlc_object_t *p_this ) 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; @@ -301,7 +306,7 @@ static int Open( vlc_object_t *p_this ) 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" ); @@ -317,8 +322,8 @@ static int Open( vlc_object_t *p_this ) 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 ) { @@ -326,7 +331,7 @@ static int Open( vlc_object_t *p_this ) Close( p_this ); return VLC_EGENERIC; } - + char *psz_tmp = var_CreateGetNonEmptyString( p_demux, "sdi-video-connection" ); if( psz_tmp ) { @@ -363,7 +368,7 @@ static int Open( vlc_object_t *p_this ) Close( p_this ); return VLC_EGENERIC; } - } + } psz_tmp = var_CreateGetNonEmptyString( p_demux, "sdi-audio-connection" ); if( psz_tmp ) @@ -379,6 +384,8 @@ static int Open( vlc_object_t *p_this ) { 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; } @@ -397,7 +404,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 ) @@ -407,25 +414,30 @@ static int Open( vlc_object_t *p_this ) 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) ); - + bool b_found_mode = false; for (;;) @@ -433,9 +445,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; - } + break; char sz_mode_id_text[5] = {0}; BMDDisplayMode mode_id = ntohl( p_display_mode->GetDisplayMode() ); @@ -446,6 +456,7 @@ static int Open( vlc_object_t *p_this ) 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; @@ -456,6 +467,7 @@ static int Open( vlc_object_t *p_this ) 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; @@ -499,6 +511,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(); } p_display_iterator->Release(); @@ -519,8 +533,8 @@ static int Open( vlc_object_t *p_this ) 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 ) @@ -533,7 +547,7 @@ static int Open( vlc_object_t *p_this ) return VLC_EGENERIC; } } - + p_sys->p_delegate = new DeckLinkCaptureDelegate( p_demux ); p_sys->p_input->SetCallback( p_sys->p_delegate ); @@ -555,7 +569,7 @@ 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 ) { @@ -572,7 +586,7 @@ static int Open( vlc_object_t *p_this ) 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; @@ -585,8 +599,6 @@ 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 ); @@ -610,11 +622,18 @@ 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 ); + 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; @@ -635,7 +654,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 */ @@ -667,12 +686,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 ); }