]> git.sesse.net Git - vlc/blobdiff - modules/access/decklink.cpp
Send frames from the receiver thread instead of having a Demux(). Seemingly some...
[vlc] / modules / access / decklink.cpp
index 87bf5237ced44d77c7dceb0bef416807186b439a..d49605cf90cf105d479410a04b28c206911db324 100644 (file)
@@ -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 <steinar+vlc@gunderson.no>
  *
@@ -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 <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_input.h>
 #include <vlc_demux.h>
-#include <vlc_access.h>
-#include <vlc_picture.h>
-#include <vlc_charset.h>
-#include <vlc_fs.h>
 #include <vlc_atomic.h>
 
 #include <arpa/inet.h>
@@ -86,6 +79,13 @@ static void Close( vlc_object_t * );
     "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." )
@@ -110,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 )
 
@@ -118,7 +119,6 @@ vlc_module_begin ()
     set_callbacks( Open, Close )
 vlc_module_end ()
 
-static int Demux  ( demux_t * );
 static int Control( demux_t *, int, va_list );
 
 class DeckLinkCaptureDelegate;
@@ -131,18 +131,12 @@ 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;
+    
+    vlc_mutex_t pts_lock;
+    int i_last_pts;  /* protected by <pts_lock> */
 
-    int i_width, i_height, i_fps_num, i_fps_den;
     uint32_t i_dominance_flags;
-
-    int i_rate, i_channels;
-
-    vlc_mutex_t frame_lock;
-    block_t *p_video_frame;  /* protected by <frame_lock> */
-    block_t *p_audio_frame;  /* protected by <frame_lock> */
-    vlc_cond_t has_frame;  /* related to <frame_lock> */
+    int i_channels;
 };
 
 class DeckLinkCaptureDelegate : public IDeckLinkInputCallback
@@ -168,7 +162,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 +175,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,19 +206,22 @@ 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;
+        
+        vlc_mutex_lock( &p_sys->pts_lock );
+        if( p_video_frame->i_pts > p_sys->i_last_pts )
+            p_sys->i_last_pts = p_video_frame->i_pts;
+        vlc_mutex_unlock( &p_sys->pts_lock );
+
+        es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_video_frame->i_pts );
+        es_out_Send( p_demux->out, p_sys->p_video_es, p_video_frame );
     }
 
     if( audioFrame )
@@ -248,25 +244,15 @@ HRESULT DeckLinkCaptureDelegate::VideoInputFrameArrived(IDeckLinkVideoInputFrame
         BMDTimeValue packet_time;
         audioFrame->GetPacketTime( &packet_time, CLOCK_FREQ );
         p_audio_frame->i_pts = p_audio_frame->i_dts = VLC_TS_0 + packet_time;
-    }
-
-    if( p_video_frame || p_audio_frame )
-    {
-        vlc_mutex_lock( &p_sys->frame_lock );
-        if( p_video_frame )
-        {
-            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 )
-        {
-            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 );
+        
+        vlc_mutex_lock( &p_sys->pts_lock );
+        if( p_audio_frame->i_pts > p_sys->i_last_pts )
+            p_sys->i_last_pts = p_audio_frame->i_pts;
+        vlc_mutex_unlock( &p_sys->pts_lock );
+        if( p_audio_frame->i_pts > p_sys->i_last_pts )
+
+        es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_audio_frame->i_pts );
+        es_out_Send( p_demux->out, p_sys->p_audio_es, p_audio_frame );
     }
 
     return S_OK;
@@ -276,20 +262,23 @@ 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' )
         return VLC_EGENERIC;
 
     /* Set up p_demux */
-    p_demux->pf_demux = Demux;
+    p_demux->pf_demux = NULL;
     p_demux->pf_control = Control;
     p_demux->info.i_update = 0;
     p_demux->info.i_title = 0;
@@ -300,19 +289,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 )
@@ -325,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;
     }
 
@@ -335,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;
     }
 
@@ -344,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;
     }
 
@@ -353,11 +343,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;
@@ -377,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;
         }
 
@@ -386,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;
         }
     }
@@ -405,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;
         }
 
@@ -414,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;
         }
     }
@@ -425,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;
     }
 
@@ -467,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;
         }
 
@@ -477,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;
         }
 
@@ -513,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;
         }
 
@@ -528,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;
     }
 
@@ -536,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;
         }
     }
@@ -562,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",
@@ -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;
@@ -606,8 +576,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 )
@@ -673,12 +642,14 @@ 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:
             pi64 = (int64_t*)va_arg( args, int64_t * );
+            vlc_mutex_lock( &p_sys->pts_lock );
             *pi64 = p_sys->i_last_pts;
+            vlc_mutex_unlock( &p_sys->pts_lock );
             return VLC_SUCCESS;
 
         /* TODO implement others */
@@ -688,42 +659,3 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
 
     return VLC_EGENERIC;
 }
-
-static int Demux( demux_t *p_demux )
-{
-    demux_sys_t *p_sys = p_demux->p_sys;
-    block_t *p_video_block = NULL;
-    block_t *p_audio_block = NULL;
-
-    vlc_mutex_lock( &p_sys->frame_lock );
-
-    while( !p_sys->p_video_frame && !p_sys->p_audio_frame )
-        vlc_cond_wait( &p_sys->has_frame, &p_sys->frame_lock );
-
-    p_video_block = p_sys->p_video_frame;
-    p_sys->p_video_frame = NULL;
-
-    p_audio_block = p_sys->p_audio_frame;
-    p_sys->p_audio_frame = NULL;
-
-    vlc_mutex_unlock( &p_sys->frame_lock );
-
-    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 );
-    }
-
-    return 1;
-}
-