X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fdecklink.cpp;h=e99bc20cf0550105899df6b7c919440173123dea;hb=8ab209b51d1255d305659af4ffa281c2c68a8b48;hp=87bf5237ced44d77c7dceb0bef416807186b439a;hpb=c12acbd7d48431d7b5029d765e69e87378aca7a2;p=vlc diff --git a/modules/access/decklink.cpp b/modules/access/decklink.cpp index 87bf5237ce..e99bc20cf0 100644 --- a/modules/access/decklink.cpp +++ b/modules/access/decklink.cpp @@ -1,7 +1,7 @@ /***************************************************************************** * decklink.cpp: BlackMagic DeckLink SDI input module ***************************************************************************** - * Copyright (C) 2010 VideoLAN + * Copyright (C) 2010 Steinar H. Gunderson * * Authors: Steinar H. Gunderson * @@ -9,34 +9,27 @@ * 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 @@ -134,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 */ @@ -168,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: @@ -176,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; @@ -213,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; } @@ -276,13 +261,15 @@ 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; /* Only when selected */ if( *p_demux->psz_access == '\0' ) @@ -306,7 +293,6 @@ static int Open( vlc_object_t *p_this ) if( !decklink_iterator ) { msg_Err( p_demux, "DeckLink drivers not found." ); - ret = VLC_EGENERIC; goto finish; } @@ -325,7 +311,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; } @@ -335,7 +320,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; } @@ -344,7 +328,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; } @@ -353,7 +336,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; } @@ -377,7 +359,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; } @@ -386,7 +367,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; } } @@ -405,7 +385,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; } @@ -414,7 +393,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; } } @@ -425,14 +403,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 ) { msg_Err( p_demux, "Missing or invalid --decklink-mode string" ); - ret = VLC_EGENERIC; goto finish; } @@ -467,7 +443,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; } @@ -477,7 +452,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; } @@ -513,10 +487,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; } @@ -528,7 +502,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; } @@ -536,20 +509,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; } } @@ -562,19 +533,18 @@ 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" ); @@ -597,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; @@ -609,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();