X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fdecklink.cpp;h=be2b41f6e6934a910015cba7d11c719cf30950b0;hb=4f3de686e8d9c8d8639417183dc4cb53a35648ec;hp=abefa5de51e3a977be349caa327e01d5f30c8597;hpb=470ce70b69e1530173950a8dfd6d274a70caa7bc;p=vlc diff --git a/modules/access/decklink.cpp b/modules/access/decklink.cpp index abefa5de51..be2b41f6e6 100644 --- a/modules/access/decklink.cpp +++ b/modules/access/decklink.cpp @@ -1,21 +1,35 @@ -/* Blackmagic SDI driver */ +/***************************************************************************** + * decklink.cpp: BlackMagic DeckLink SDI input module + ***************************************************************************** + * Copyright (C) 2010 Steinar H. Gunderson + * + * Authors: Steinar H. Gunderson + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + *****************************************************************************/ + +#define __STDC_CONSTANT_MACROS 1 #ifdef HAVE_CONFIG_H # include "config.h" #endif -#ifndef INT64_C -#define INT64_C(c) c ## LL -#endif - #include #include -#include #include -#include -#include -#include -#include #include #include @@ -28,50 +42,57 @@ 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. " \ + "DeckLink 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. " \ + "Desired input video mode for DeckLink captures. " \ "This value should be a FOURCC code in textual " \ "form, e.g. \"ntsc\"." ) #define CACHING_TEXT N_("Caching value in ms") #define CACHING_LONGTEXT N_( \ - "Caching value for SDI captures. This " \ + "Caching value for DeckLink captures. This " \ "value should be set in milliseconds." ) #define AUDIO_CONNECTION_TEXT N_("Audio connection") #define AUDIO_CONNECTION_LONGTEXT N_( \ - "Audio connection to use for SDI captures. " \ + "Audio connection to use for DeckLink captures. " \ "Valid choices: embedded, aesebu, analog. " \ "Leave blank for card default." ) #define RATE_TEXT N_("Audio sampling rate in Hz") #define RATE_LONGTEXT N_( \ - "Audio sampling rate (in hertz) for SDI captures. " \ + "Audio sampling rate (in hertz) for DeckLink captures. " \ "0 disables audio input." ) #define CHANNELS_TEXT N_("Number of audio channels") #define CHANNELS_LONGTEXT N_( \ - "Number of input audio channels for SDI captures. " \ + "Number of input audio channels for DeckLink 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. " \ + "Video connection to use for DeckLink captures. " \ "Valid choices: sdi, hdmi, opticalsdi, component, " \ "composite, svideo. " \ "Leave blank for card default." ) +static const char *const ppsz_videoconns[] = { + "sdi", "hdmi", "opticalsdi", "component", "composite", "svideo" +}; +static const char *const ppsz_videoconns_text[] = { + N_("SDI"), N_("HDMI"), N_("Optical SDI"), N_("Component"), N_("Composite"), N_("S-video") +}; + #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_shortname( N_("DeckLink") ) + set_description( N_("Blackmagic DeckLink SDI input") ) set_category( CAT_INPUT ) set_subcategory( SUBCAT_INPUT_ACCESS ) @@ -89,6 +110,7 @@ vlc_module_begin () CHANNELS_TEXT, CHANNELS_LONGTEXT, true ) add_string( "decklink-video-connection", 0, NULL, VIDEO_CONNECTION_TEXT, VIDEO_CONNECTION_LONGTEXT, true ) + change_string_list( ppsz_videoconns, ppsz_videoconns_text, 0 ) add_string( "decklink-aspect-ratio", NULL, NULL, ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, true ) @@ -110,13 +132,10 @@ 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; - - int i_rate, i_channels; + int i_channels; vlc_mutex_t frame_lock; block_t *p_video_frame; /* protected by */ @@ -147,7 +166,12 @@ public: return new_ref; } - virtual HRESULT STDMETHODCALLTYPE VideoInputFormatChanged(BMDVideoInputFormatChangedEvents, IDeckLinkDisplayMode*, BMDDetectedVideoInputFormatFlags); + virtual HRESULT STDMETHODCALLTYPE VideoInputFormatChanged(BMDVideoInputFormatChangedEvents, IDeckLinkDisplayMode*, BMDDetectedVideoInputFormatFlags) + { + msg_Dbg( p_demux_, "Video input format changed" ); + return S_OK; + } + virtual HRESULT STDMETHODCALLTYPE VideoInputFrameArrived(IDeckLinkVideoInputFrame*, IDeckLinkAudioInputPacket*); private: @@ -155,12 +179,6 @@ private: demux_t *p_demux_; }; -HRESULT DeckLinkCaptureDelegate::VideoInputFormatChanged(BMDVideoInputFormatChangedEvents events, IDeckLinkDisplayMode *mode, BMDDetectedVideoInputFormatFlags) -{ - msg_Dbg( p_demux_, "Video input format changed" ); - return S_OK; -} - HRESULT DeckLinkCaptureDelegate::VideoInputFrameArrived(IDeckLinkVideoInputFrame* videoFrame, IDeckLinkAudioInputPacket* audioFrame) { demux_sys_t *p_sys = p_demux_->p_sys; @@ -192,18 +210,13 @@ HRESULT DeckLinkCaptureDelegate::VideoInputFrameArrived(IDeckLinkVideoInputFrame for( int y = 0; y < i_height; ++y ) { const uint8_t *src = (const uint8_t *)frame_bytes + i_stride * y; - uint8_t *dst = (uint8_t *)p_video_frame->p_buffer + i_width * i_bpp * y; + uint8_t *dst = p_video_frame->p_buffer + i_width * i_bpp * y; memcpy( dst, src, i_width * i_bpp ); } BMDTimeValue stream_time, frame_duration; videoFrame->GetStreamTime( &stream_time, &frame_duration, CLOCK_FREQ ); p_video_frame->i_flags = BLOCK_FLAG_TYPE_I | p_sys->i_dominance_flags; - if( p_sys->b_first_frame ) - { - p_video_frame->i_flags |= BLOCK_FLAG_DISCONTINUITY; - p_sys->b_first_frame = false; - } p_video_frame->i_pts = p_video_frame->i_dts = VLC_TS_0 + stream_time; } @@ -255,13 +268,16 @@ 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; + int ret = VLC_EGENERIC; 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; + int i_width, i_height, i_fps_num, i_fps_den; + int i_rate; + unsigned u_aspect_num, u_aspect_den; /* Only when selected */ if( *p_demux->psz_access == '\0' ) @@ -279,19 +295,23 @@ static int Open( vlc_object_t *p_this ) vlc_mutex_init( &p_sys->frame_lock ); vlc_cond_init( &p_sys->has_frame ); - p_sys->b_first_frame = true; IDeckLinkIterator *decklink_iterator = CreateDeckLinkIteratorInstance(); if( !decklink_iterator ) { msg_Err( p_demux, "DeckLink drivers not found." ); - ret = VLC_EGENERIC; goto finish; } HRESULT result; i_card_index = var_InheritInteger( p_demux, "decklink-card-index" ); + if( i_card_index < 0 ) + { + msg_Err( p_demux, "Invalid card index %d", i_card_index ); + goto finish; + } + for( int i = 0; i <= i_card_index; ++i ) { if( p_sys->p_card ) @@ -304,7 +324,6 @@ static int Open( vlc_object_t *p_this ) if( result != S_OK ) { msg_Err( p_demux, "DeckLink PCI card %d not found", i_card_index ); - ret = VLC_EGENERIC; goto finish; } @@ -314,7 +333,6 @@ static int Open( vlc_object_t *p_this ) if( result != S_OK ) { msg_Err( p_demux, "Could not get model name" ); - ret = VLC_EGENERIC; goto finish; } @@ -323,7 +341,6 @@ 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" ); - ret = VLC_EGENERIC; goto finish; } @@ -332,11 +349,10 @@ static int Open( vlc_object_t *p_this ) if( p_sys->p_card->QueryInterface( IID_IDeckLinkConfiguration, (void**)&p_config) != S_OK ) { msg_Err( p_demux, "Failed to get configuration interface" ); - ret = VLC_EGENERIC; goto finish; } - psz_video_connection = var_CreateGetNonEmptyString( p_demux, "decklink-video-connection" ); + psz_video_connection = var_InheritString( p_demux, "decklink-video-connection" ); if( psz_video_connection ) { BMDVideoConnection conn; @@ -356,7 +372,6 @@ static int Open( vlc_object_t *p_this ) { msg_Err( p_demux, "Invalid --decklink-video-connection specified; choose one of " \ "sdi, hdmi, opticalsdi, component, composite, or svideo." ); - ret = VLC_EGENERIC; goto finish; } @@ -365,7 +380,6 @@ static int Open( vlc_object_t *p_this ) if( result != S_OK ) { msg_Err( p_demux, "Failed to set video input connection" ); - ret = VLC_EGENERIC; goto finish; } } @@ -384,7 +398,6 @@ static int Open( vlc_object_t *p_this ) { msg_Err( p_demux, "Invalid --decklink-audio-connection specified; choose one of " \ "embedded, aesebu, or analog." ); - ret = VLC_EGENERIC; goto finish; } @@ -393,7 +406,6 @@ static int Open( vlc_object_t *p_this ) if( result != S_OK ) { msg_Err( p_demux, "Failed to set audio input connection" ); - ret = VLC_EGENERIC; goto finish; } } @@ -404,14 +416,12 @@ static int Open( vlc_object_t *p_this ) if( result != S_OK ) { msg_Err( p_demux, "Failed to enumerate display modes" ); - ret = VLC_EGENERIC; goto finish; } - psz_display_mode = var_InheritString( p_demux, "decklink-mode" ); - if( !psz_display_mode || strlen( psz_display_mode ) == 0 || strlen( psz_display_mode ) > 4 ) { + psz_display_mode = var_CreateGetNonEmptyString( p_demux, "decklink-mode" ); + if( !psz_display_mode || strlen( psz_display_mode ) > 4 ) { msg_Err( p_demux, "Missing or invalid --decklink-mode string" ); - ret = VLC_EGENERIC; goto finish; } @@ -446,7 +456,6 @@ static int Open( vlc_object_t *p_this ) { msg_Err( p_demux, "Failed to get display mode name" ); p_display_mode->Release(); - ret = VLC_EGENERIC; goto finish; } @@ -456,7 +465,6 @@ static int Open( vlc_object_t *p_this ) { msg_Err( p_demux, "Failed to get frame rate" ); p_display_mode->Release(); - ret = VLC_EGENERIC; goto finish; } @@ -492,10 +500,10 @@ static int Open( vlc_object_t *p_this ) if( wanted_mode_id == mode_id ) { b_found_mode = true; - p_sys->i_width = p_display_mode->GetWidth(); - p_sys->i_height = p_display_mode->GetHeight(); - p_sys->i_fps_num = time_scale; - p_sys->i_fps_den = frame_duration; + i_width = p_display_mode->GetWidth(); + i_height = p_display_mode->GetHeight(); + i_fps_num = time_scale; + i_fps_den = frame_duration; p_sys->i_dominance_flags = i_dominance_flags; } @@ -507,7 +515,6 @@ static int Open( vlc_object_t *p_this ) msg_Err( p_demux, "Unknown video mode specified. " \ "Run VLC with -v --verbose-objects=-all,+decklink " \ "to get a list of supported modes." ); - ret = VLC_EGENERIC; goto finish; } @@ -515,20 +522,18 @@ static int Open( vlc_object_t *p_this ) if( result != S_OK ) { msg_Err( p_demux, "Failed to enable video input" ); - ret = VLC_EGENERIC; goto finish; } /* Set up audio. */ - p_sys->i_rate = var_InheritInteger( p_demux, "decklink-audio-rate" ); p_sys->i_channels = var_InheritInteger( p_demux, "decklink-audio-channels" ); - if( p_sys->i_rate > 0 && p_sys->i_channels > 0 ) + i_rate = var_InheritInteger( p_demux, "decklink-audio-rate" ); + if( i_rate > 0 && p_sys->i_channels > 0 ) { - result = p_sys->p_input->EnableAudioInput( p_sys->i_rate, bmdAudioSampleType16bitInteger, p_sys->i_channels ); + result = p_sys->p_input->EnableAudioInput( i_rate, bmdAudioSampleType16bitInteger, p_sys->i_channels ); if( result != S_OK ) { msg_Err( p_demux, "Failed to enable audio input" ); - ret = VLC_EGENERIC; goto finish; } } @@ -541,32 +546,24 @@ static int Open( vlc_object_t *p_this ) { 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 */ es_format_t video_fmt; es_format_Init( &video_fmt, VIDEO_ES, VLC_CODEC_UYVY ); - video_fmt.video.i_width = p_sys->i_width; - video_fmt.video.i_height = p_sys->i_height; + video_fmt.video.i_width = i_width; + video_fmt.video.i_height = i_height; video_fmt.video.i_sar_num = 1; 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.video.i_frame_rate = i_fps_num; + video_fmt.video.i_frame_rate_base = 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_aspect = var_CreateGetNonEmptyString( p_demux, "decklink-aspect-ratio" ); - if( psz_aspect ) - { - char *psz_denominator = strchr( psz_aspect, ':' ); - if( psz_denominator ) - { - *psz_denominator++ = '\0'; - 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_aspect ); + if ( !var_InheritURational( p_demux, &u_aspect_num, &u_aspect_den, "decklink-aspect-ratio" ) && + u_aspect_num > 0 && u_aspect_den > 0 ) { + video_fmt.video.i_sar_num = u_aspect_num * video_fmt.video.i_height; + video_fmt.video.i_sar_den = u_aspect_den * video_fmt.video.i_width; } msg_Dbg( p_demux, "added new video es %4.4s %dx%d", @@ -576,7 +573,7 @@ static int Open( vlc_object_t *p_this ) es_format_t audio_fmt; es_format_Init( &audio_fmt, AUDIO_ES, VLC_CODEC_S16N ); audio_fmt.audio.i_channels = p_sys->i_channels; - audio_fmt.audio.i_rate = p_sys->i_rate; + audio_fmt.audio.i_rate = i_rate; audio_fmt.audio.i_bitspersample = 16; audio_fmt.audio.i_blockalign = audio_fmt.audio.i_channels * audio_fmt.audio.i_bitspersample / 8; audio_fmt.i_bitrate = audio_fmt.audio.i_channels * audio_fmt.audio.i_rate * audio_fmt.audio.i_bitspersample; @@ -585,8 +582,7 @@ 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 ); - /* Update default_pts to a suitable value for access */ - var_Create( p_demux, "decklink-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); + ret = VLC_SUCCESS; finish: if( decklink_iterator ) @@ -652,7 +648,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) case DEMUX_GET_PTS_DELAY: pi64 = (int64_t*)va_arg( args, int64_t * ); - *pi64 = var_GetInteger( p_demux, "decklink-caching" ) * 1000; + *pi64 = var_InheritInteger( p_demux, "decklink-caching" ) * 1000; return VLC_SUCCESS; case DEMUX_GET_TIME: