X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fdecklink.cpp;h=3f837f22f09ca9197cdba7827a4d0606e696d509;hb=d66255d540dfac647c8a7d8aded8522a02b3ca2d;hp=78ef54c5f695a062f7823c95e827271be344823a;hpb=903a434e3f7f78e2522b00f1f4c5da00a66e6d8c;p=vlc diff --git a/modules/access/decklink.cpp b/modules/access/decklink.cpp index 78ef54c5f6..3f837f22f0 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 @@ -113,10 +127,8 @@ struct demux_sys_t 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 +159,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 +172,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 +203,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 +261,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' ) @@ -285,13 +294,18 @@ static int Open( vlc_object_t *p_this ) 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 +318,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 +327,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 +335,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,7 +343,6 @@ 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; } @@ -356,7 +366,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 +374,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 +392,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 +400,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 +410,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 +450,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 +459,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 +494,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 +509,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 +516,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 +540,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 +567,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; @@ -588,6 +579,8 @@ static int Open( vlc_object_t *p_this ) /* 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 ) decklink_iterator->Release();