diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-03-29 17:41:53 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-03-29 17:41:53 +0200 |
| commit | 860ccd414dbb313fabf065b92838f0f39037584b (patch) | |
| tree | 0d5c0d3510db3ca3d7e6487420e8d09f74ae1961 /sys | |
| parent | a9ec4d62a89dd53aa295af02c7d5f57ef936359b (diff) | |
| parent | d84d98943af42ce645ee022207bcf04e747d2d4a (diff) | |
| download | gstreamer-plugins-bad-860ccd414dbb313fabf065b92838f0f39037584b.tar.gz | |
Merge remote-tracking branch 'origin/0.10'
Conflicts:
NEWS
RELEASE
common
configure.ac
docs/libs/gst-plugins-bad-libs-sections.txt
docs/plugins/gst-plugins-bad-plugins.args
docs/plugins/gst-plugins-bad-plugins.hierarchy
docs/plugins/gst-plugins-bad-plugins.interfaces
docs/plugins/inspect/plugin-adpcmdec.xml
docs/plugins/inspect/plugin-adpcmenc.xml
docs/plugins/inspect/plugin-assrender.xml
docs/plugins/inspect/plugin-audiovisualizers.xml
docs/plugins/inspect/plugin-autoconvert.xml
docs/plugins/inspect/plugin-bayer.xml
docs/plugins/inspect/plugin-bz2.xml
docs/plugins/inspect/plugin-camerabin2.xml
docs/plugins/inspect/plugin-celt.xml
docs/plugins/inspect/plugin-dataurisrc.xml
docs/plugins/inspect/plugin-debugutilsbad.xml
docs/plugins/inspect/plugin-dtmf.xml
docs/plugins/inspect/plugin-dtsdec.xml
docs/plugins/inspect/plugin-dvbsuboverlay.xml
docs/plugins/inspect/plugin-dvdspu.xml
docs/plugins/inspect/plugin-faac.xml
docs/plugins/inspect/plugin-faad.xml
docs/plugins/inspect/plugin-gsm.xml
docs/plugins/inspect/plugin-h264parse.xml
docs/plugins/inspect/plugin-mms.xml
docs/plugins/inspect/plugin-modplug.xml
docs/plugins/inspect/plugin-mpeg2enc.xml
docs/plugins/inspect/plugin-mpegdemux2.xml
docs/plugins/inspect/plugin-mpegtsdemux.xml
docs/plugins/inspect/plugin-mpegvideoparse.xml
docs/plugins/inspect/plugin-mplex.xml
docs/plugins/inspect/plugin-pcapparse.xml
docs/plugins/inspect/plugin-rawparse.xml
docs/plugins/inspect/plugin-rtpmux.xml
docs/plugins/inspect/plugin-rtpvp8.xml
docs/plugins/inspect/plugin-scaletempo.xml
docs/plugins/inspect/plugin-schro.xml
docs/plugins/inspect/plugin-sdp.xml
docs/plugins/inspect/plugin-segmentclip.xml
docs/plugins/inspect/plugin-shm.xml
docs/plugins/inspect/plugin-videomaxrate.xml
docs/plugins/inspect/plugin-videoparsersbad.xml
docs/plugins/inspect/plugin-vp8.xml
docs/plugins/inspect/plugin-y4mdec.xml
ext/celt/gstceltdec.c
ext/dts/gstdtsdec.c
ext/modplug/gstmodplug.cc
ext/opus/gstopusenc.c
gst-libs/gst/video/gstbasevideocodec.c
gst-libs/gst/video/gstbasevideocodec.h
gst-libs/gst/video/gstbasevideodecoder.c
gst-libs/gst/video/gstbasevideodecoder.h
gst-libs/gst/video/gstbasevideoencoder.c
gst-libs/gst/video/gstbasevideoencoder.h
gst/adpcmdec/Makefile.am
gst/audiovisualizers/gstbaseaudiovisualizer.c
gst/h264parse/gsth264parse.c
gst/mpegdemux/mpegtsparse.c
gst/mpegtsdemux/mpegtsbase.c
gst/mpegtsdemux/mpegtspacketizer.c
gst/mpegtsdemux/mpegtsparse.c
gst/mpegtsdemux/tsdemux.c
gst/mpegtsdemux/tsdemux.h
gst/mxf/mxfdemux.c
gst/rawparse/gstaudioparse.c
gst/videoparsers/gsth263parse.c
gst/videoparsers/gsth264parse.c
sys/d3dvideosink/d3dvideosink.c
sys/decklink/gstdecklinksink.cpp
sys/dvb/gstdvbsrc.c
sys/shm/gstshmsrc.c
sys/vdpau/h264/gstvdph264dec.c
sys/vdpau/mpeg/gstvdpmpegdec.c
tests/examples/opencv/gst_element_print_properties.c
win32/common/config.h
Diffstat (limited to 'sys')
38 files changed, 2768 insertions, 390 deletions
diff --git a/sys/Makefile.am b/sys/Makefile.am index d15f8282c..b0ddf9e06 100644 --- a/sys/Makefile.am +++ b/sys/Makefile.am @@ -1,19 +1,19 @@ -# if USE_DXR3 -# DXR3_DIR=dxr3 -# else -# DXR3_DIR= -# endif +if USE_ACM +ACM_DIR=acmenc acmmp3dec +else +ACM_DIR= +endif -# if USE_QCAM -# QCAM_DIR=qcam -# else -# QCAM_DIR= -# endif +if USE_APPLE_MEDIA +APPLE_MEDIA_DIR=applemedia +else +APPLE_MEDIA_DIR= +endif -if USE_VCD -VCD_DIR=vcd +if USE_AVC +AVC_DIR=avc else -VCD_DIR= +AVC_DIR= endif # if USE_CDROM @@ -58,25 +58,42 @@ else DVB_DIR= endif +# if USE_DXR3 +# DXR3_DIR=dxr3 +# else +# DXR3_DIR= +# endif + if USE_LINSYS LINSYS_DIR=linsys else LINSYS_DIR= endif +if USE_OSX_VIDEO +OSX_VIDEO_DIR=osxvideo +else +OSX_VIDEO_DIR= +endif -if USE_APPLE_MEDIA -APPLE_MEDIA_DIR=applemedia +if USE_PVR +PVR_DIR=pvr2d else -APPLE_MEDIA_DIR= +PVR_DIR= endif -if USE_OSX_VIDEO -OSX_VIDEO_DIR=osxvideo +if USE_SHM +SHM_DIR=shm else -OSX_VIDEO_DIR= +SHM_DIR= endif +# if USE_QCAM +# QCAM_DIR=qcam +# else +# QCAM_DIR= +# endif + if USE_QUICKTIME QT_DIR=qtwrapper else @@ -89,10 +106,10 @@ else WININET_DIR= endif -if USE_ACM -ACM_DIR=acmenc acmmp3dec +if USE_VCD +VCD_DIR=vcd else -ACM_DIR= +VCD_DIR= endif #if USE_VDPAU @@ -101,28 +118,15 @@ endif #VDPAU_DIR= #endif - -if USE_SHM -SHM_DIR=shm +if USE_DIRECT3D9 +WINSCREENCAP_DIR=winscreencap else -SHM_DIR= -endif - -if USE_AVC -AVC_DIR=avc -else -AVC_DIR= -endif - -if USE_PVR -PVR_DIR=pvr2d -else -PVR_DIR= +WINSCREENCAP_DIR= endif -SUBDIRS = $(ACM_DIR) $(APPLE_MEDIA_DIR) $(AVC_DIR) $(D3DVIDEOSINK_DIR) $(DECKLINK_DIR) $(DIRECTDRAW_DIR) $(DIRECTSOUND_DIR) $(DVB_DIR) $(FBDEV_DIR) $(LINSYS_DIR) $(OSX_VIDEO_DIR) $(QT_DIR) $(SHM_DIR) $(VCD_DIR) $(VDPAU_DIR) $(WININET_DIR) $(PVR_DIR) +SUBDIRS = $(ACM_DIR) $(APPLE_MEDIA_DIR) $(AVC_DIR) $(D3DVIDEOSINK_DIR) $(DECKLINK_DIR) $(DIRECTDRAW_DIR) $(DIRECTSOUND_DIR) $(DVB_DIR) $(FBDEV_DIR) $(LINSYS_DIR) $(OSX_VIDEO_DIR) $(PVR_DIR) $(QT_DIR) $(SHM_DIR) $(VCD_DIR) $(VDPAU_DIR) $(WININET_DIR) $(WINSCREENCAP_DIR) DIST_SUBDIRS = acmenc acmmp3dec applemedia avc d3dvideosink decklink directdraw directsound dvb linsys fbdev dshowdecwrapper dshowsrcwrapper dshowvideosink \ - osxvideo qtwrapper shm vcd vdpau wasapi wininet winks winscreencap pvr2d + osxvideo pvr2d qtwrapper shm vcd vdpau wasapi wininet winks winscreencap include $(top_srcdir)/common/parallel-subdirs.mak diff --git a/sys/d3dvideosink/Makefile.am b/sys/d3dvideosink/Makefile.am index 183e460cf..76b79209d 100644 --- a/sys/d3dvideosink/Makefile.am +++ b/sys/d3dvideosink/Makefile.am @@ -4,11 +4,11 @@ libgstd3dvideosink_la_SOURCES = d3dvideosink.c directx/d3d.c directx/dx.c \ directx/directx9/dx9.c directx/directx9/dx9_d3d.c \ directx/directx10/dx10.c directx/directx10/dx10_d3d.c \ directx/directx11/dx11.c directx/directx11/dx11_d3d.c -libgstd3dvideosink_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_CFLAGS) +libgstd3dvideosink_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_CFLAGS) $(DIRECTX_CFLAGS) libgstd3dvideosink_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \ -lgstvideo-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) \ $(DIRECT3D_LIBS) -libgstd3dvideosink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +libgstd3dvideosink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTX_LDFAGS) libgstd3dvideosink_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = d3dvideosink.h directx/d3d.h directx/dx.h directx/directx.h \ diff --git a/sys/d3dvideosink/d3dvideosink.c b/sys/d3dvideosink/d3dvideosink.c index bafb90731..bbcf3ad32 100644 --- a/sys/d3dvideosink/d3dvideosink.c +++ b/sys/d3dvideosink/d3dvideosink.c @@ -63,7 +63,6 @@ struct _GstD3DVideoSinkHookData static GstD3DVideoSinkShared shared; /* Define a shared lock to synchronize the creation/destruction of the d3d device */ static GStaticMutex shared_d3d_lock = G_STATIC_MUTEX_INIT; -static GStaticMutex shared_d3d_dev_lock = G_STATIC_MUTEX_INIT; static GStaticMutex shared_d3d_hook_lock = G_STATIC_MUTEX_INIT; /* Hold a reference to our dll's HINSTANCE */ static HINSTANCE g_hinstDll = NULL; @@ -155,12 +154,11 @@ static void gst_d3dvideosink_remove_window_for_renderer (GstD3DVideoSink * sink); static gboolean gst_d3dvideosink_initialize_direct3d (GstD3DVideoSink * sink); static gboolean gst_d3dvideosink_initialize_d3d_device (GstD3DVideoSink * sink); -static gboolean gst_d3dvideosink_resize_swap_chain (GstD3DVideoSink * sink, - gint width, gint height); + static gboolean gst_d3dvideosink_notify_device_init (GstD3DVideoSink * sink); static gboolean gst_d3dvideosink_notify_device_lost (GstD3DVideoSink * sink); static gboolean gst_d3dvideosink_notify_device_reset (GstD3DVideoSink * sink); -static gboolean gst_d3dvideosink_notify_device_resize (GstD3DVideoSink * sink); +static gboolean gst_d3dvideosink_notify_device_reinit (GstD3DVideoSink * sink); static gboolean gst_d3dvideosink_device_lost (GstD3DVideoSink * sink); static gboolean gst_d3dvideosink_release_d3d_device (GstD3DVideoSink * sink); static gboolean gst_d3dvideosink_release_direct3d (GstD3DVideoSink * sink); @@ -470,11 +468,13 @@ gst_d3dvideosink_get_caps (GstBaseSink * basesink) GstStructure *stru = gst_caps_get_structure (c, i); if (!gst_structure_has_name (stru, "video/x-raw-rgb")) { gst_structure_get_fourcc (stru, "format", (guint32 *) & d3dfourcc); - switch (d3dfourcc) { + switch ((guint32) d3dfourcc) { case GST_MAKE_FOURCC ('Y', 'V', '1', '2'): case GST_MAKE_FOURCC ('I', '4', '2', '0'): d3dfourcc = (D3DFORMAT) MAKEFOURCC ('Y', 'V', '1', '2'); break; + default: + break; } if (d3dfourcc && SUCCEEDED (IDirect3D9_CheckDeviceFormat (shared.d3d, D3DADAPTER_DEFAULT, @@ -531,9 +531,6 @@ gst_d3dvideosink_create_shared_hidden_window (GstD3DVideoSink * sink) CloseHandle (shared.hidden_window_created_signal); - if (!shared.d3ddev) - goto failed; - GST_DEBUG ("Successfully created Direct3D hidden window, handle: %p", shared.hidden_window_handle); @@ -638,7 +635,9 @@ SharedHiddenWndProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { shared.device_lost_sink = NULL; GST_DEBUG ("Initializing Direct3D"); + GST_D3DVIDEOSINK_SWAP_CHAIN_LOCK (sink); gst_d3dvideosink_initialize_d3d_device (sink); + GST_D3DVIDEOSINK_SWAP_CHAIN_UNLOCK (sink); GST_DEBUG ("Direct3D initialization complete"); break; @@ -663,9 +662,11 @@ SharedHiddenWndProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { /* Did we receive a message to check if the device is available again? */ if (wParam == IDT_DEVICELOST) { + GST_D3DVIDEOSINK_SWAP_CHAIN_LOCK (sink); /* This will synchronously call SharedHiddenWndProc() because this thread is the one that created the window. */ SendMessage (hWnd, WM_DIRECTX_D3D_DEVICELOST, 0, (LPARAM) shared.device_lost_sink); + GST_D3DVIDEOSINK_SWAP_CHAIN_UNLOCK (sink); return 0; } break; @@ -735,6 +736,9 @@ WndProcHook (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) GstD3DVideoSink *sink = (GstD3DVideoSink *) GetProp (hWnd, TEXT ("GstD3DVideoSink")); + if (!sink) + return FALSE; + switch (message) { case WM_ERASEBKGND: return TRUE; @@ -801,6 +805,8 @@ static void gst_d3dvideosink_wnd_proc (GstD3DVideoSink * sink, HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { + if (!sink) + return; switch (message) { case WM_COPYDATA: { @@ -1068,12 +1074,18 @@ gst_d3dvideosink_set_window_handle (GstXOverlay * overlay, guintptr window_id) /* If we're already playing/paused, then we need to lock the swap chain, and recreate it with the new window. */ if (sink->d3ddev != NULL) { + GST_D3DVIDEOSINK_SWAP_CHAIN_LOCK (sink); /* Close our existing window if there is one */ gst_d3dvideosink_close_window (sink); /* Save our window id */ sink->window_handle = hWnd; gst_d3dvideosink_set_window_for_renderer (sink); - gst_d3dvideosink_notify_device_resize (sink); + sink->window_closed = FALSE; + + gst_d3dvideosink_notify_device_reinit (sink); + GST_D3DVIDEOSINK_SWAP_CHAIN_UNLOCK (sink); + //gst_d3dvideosink_notify_device_init(sink); + } else { sink->window_handle = hWnd; } @@ -1313,8 +1325,6 @@ GST_D3DVIDEOSINK_SHARED_D3D_HOOK_UNLOCK GST_D3DVIDEOSINK_SHARED_D3D_UNLOCK} static void gst_d3dvideosink_remove_window_for_renderer (GstD3DVideoSink * sink) { - //GST_D3DVIDEOSINK_SHARED_D3D_LOCK - //GST_D3DVIDEOSINK_SWAP_CHAIN_LOCK(sink); { GST_DEBUG ("Removing custom rendering window procedure"); if (!sink->is_new_window && sink->window_handle) { @@ -1341,8 +1351,6 @@ gst_d3dvideosink_remove_window_for_renderer (GstD3DVideoSink * sink) /* Remove the property associating our sink with the window */ RemoveProp (sink->window_handle, TEXT ("GstD3DVideoSink")); } - //GST_D3DVIDEOSINK_SWAP_CHAIN_UNLOCK(sink); - //GST_D3DVIDEOSINK_SHARED_D3D_UNLOCK } static void @@ -1568,7 +1576,7 @@ gst_d3dvideosink_flush_gpu (GstD3DVideoSink * sink) } } -static void +static G_GNUC_UNUSED void gst_d3dvideosink_wait_for_vsync (GstD3DVideoSink * sink) { if (sink->d3dpp.PresentationInterval == D3DPRESENT_INTERVAL_IMMEDIATE) { @@ -2033,9 +2041,6 @@ gst_d3dvideosink_initialize_d3d_device (GstD3DVideoSink * sink) /* Get the current size of the window */ gst_d3dvideosink_window_size (sink, &width, &height); - - GST_D3DVIDEOSINK_SWAP_CHAIN_LOCK (sink); - if (!shared.d3d) { GST_WARNING ("Direct3D object has not been initialized"); goto error; @@ -2194,41 +2199,10 @@ gst_d3dvideosink_initialize_d3d_device (GstD3DVideoSink * sink) //} /*success:*/ - GST_D3DVIDEOSINK_SWAP_CHAIN_UNLOCK (sink); + //GST_D3DVIDEOSINK_SWAP_CHAIN_UNLOCK (sink); return TRUE; error: - GST_D3DVIDEOSINK_SWAP_CHAIN_UNLOCK (sink); - return FALSE; -} - - -static gboolean -gst_d3dvideosink_resize_swap_chain (GstD3DVideoSink * sink, gint width, - gint height) -{ - if (width <= 0 || height <= 0 || width > GetSystemMetrics (SM_CXFULLSCREEN) - || height > GetSystemMetrics (SM_CYFULLSCREEN)) { - GST_DEBUG ("Invalid size"); - return FALSE; - } - if (!shared.d3d || !sink->d3ddev) { - GST_DEBUG_OBJECT (sink, "Direct3D device not initialized."); - return TRUE; - } - - GST_LOG_OBJECT (sink, "Resizing Direct3D swap chain for sink %p to %dx%d", - sink, width, height); - /* actually recreates the device + associated surfaces - must be called from thread that created the device */ - if (!gst_d3dvideosink_notify_device_resize (sink)) - goto error; - - -/* success:*/ - GST_LOG_OBJECT (sink, "Direct3D swap chain successfully resized"); - return TRUE; -error: - GST_ERROR_OBJECT (sink, "Error attempting to resize the Direct3D swap chain"); + //GST_D3DVIDEOSINK_SWAP_CHAIN_UNLOCK (sink); return FALSE; } @@ -2243,10 +2217,10 @@ gst_d3dvideosink_notify_device_init (GstD3DVideoSink * sink) } static gboolean -gst_d3dvideosink_notify_device_resize (GstD3DVideoSink * sink) +gst_d3dvideosink_notify_device_reinit (GstD3DVideoSink * sink) { if (sink->window_handle) { - SendMessage (shared.hidden_window_handle, WM_DIRECTX_D3D_RESIZE, 0, + SendMessage (shared.hidden_window_handle, WM_DIRECTX_D3D_DEVICELOST, 0, (LPARAM) sink); } return TRUE; @@ -2294,7 +2268,6 @@ gst_d3dvideosink_device_lost (GstD3DVideoSink * sink) { /* Must be called from hidden window's message loop! */ - GST_D3DVIDEOSINK_SWAP_CHAIN_LOCK (sink); { if (shared.device_lost) GST_DEBUG ("Direct3D device lost"); @@ -2342,18 +2315,15 @@ gst_d3dvideosink_device_lost (GstD3DVideoSink * sink) /*success:*/ GST_DEBUG ("Direct3D device has successfully been reset."); - GST_D3DVIDEOSINK_SWAP_CHAIN_UNLOCK (sink); return TRUE; error: GST_DEBUG ("Unable to successfully reset the Direct3D device."); - GST_D3DVIDEOSINK_SWAP_CHAIN_UNLOCK (sink); return FALSE; } static gboolean gst_d3dvideosink_release_d3d_device (GstD3DVideoSink * sink) { - GST_D3DVIDEOSINK_SWAP_CHAIN_LOCK (sink); if (sink->d3ddev) { int ref_count; ref_count = IDirect3DDevice9_Release (sink->d3ddev); @@ -2368,7 +2338,7 @@ gst_d3dvideosink_release_d3d_device (GstD3DVideoSink * sink) GST_DEBUG_OBJECT (sink, "Direct3D offscreen surface released. Reference count: %d", ref_count); } - GST_D3DVIDEOSINK_SWAP_CHAIN_UNLOCK (sink); + //GST_D3DVIDEOSINK_SWAP_CHAIN_UNLOCK (sink); return TRUE; } @@ -2390,7 +2360,9 @@ gst_d3dvideosink_release_direct3d (GstD3DVideoSink * sink) if (shared.element_count > 0) goto success; + GST_D3DVIDEOSINK_SWAP_CHAIN_LOCK (sink); gst_d3dvideosink_release_d3d_device (sink); + GST_D3DVIDEOSINK_SWAP_CHAIN_UNLOCK (sink); if (shared.d3d) { int ref_count; ref_count = IDirect3D9_Release (shared.d3d); diff --git a/sys/d3dvideosink/directx/d3d.h b/sys/d3dvideosink/directx/d3d.h index c58310fd9..238349c27 100644 --- a/sys/d3dvideosink/directx/d3d.h +++ b/sys/d3dvideosink/directx/d3d.h @@ -33,8 +33,8 @@ G_BEGIN_DECLS #define WM_DIRECTX_D3D_RESIZE WM_DIRECTX + 5 #define DIRECTX_D3D_API(version, dispatch_table, init_function, create_function, resize_function, device_lost_function, notify_device_reset_function, release_function) \ - static gpointer DIRECTX_API_COMPONENT_D3D_ ## version ## _DISPATCH_TABLE = &dispatch_table; \ - static DirectXAPIComponentD3D DIRECTX_API_COMPONENT_D3D_ ## version ## _INIT = { \ + static gpointer G_GNUC_UNUSED DIRECTX_API_COMPONENT_D3D_ ## version ## _DISPATCH_TABLE = &dispatch_table; \ + static DirectXAPIComponentD3D G_GNUC_UNUSED DIRECTX_API_COMPONENT_D3D_ ## version ## _INIT = { \ create_function /*create_function*/ \ , resize_function /*resize_function*/ \ , device_lost_function /*device_lost_function*/ \ @@ -42,7 +42,7 @@ G_BEGIN_DECLS , release_function /*release_function*/ \ , NULL /*private_data*/ \ }; \ - static void init_directx_api_component_d3d_ ## version ## _(const DirectXAPI* api) { \ + static void G_GNUC_UNUSED init_directx_api_component_d3d_ ## version ## _(const DirectXAPI* api) { \ gpointer private_data = &DIRECTX_API_COMPONENT_D3D_ ## version ## _INIT; \ gpointer vtable = DIRECTX_API_COMPONENT_D3D_ ## version ## _DISPATCH_TABLE; \ DIRECTX_SET_COMPONENT_INIT(DIRECTX_D3D(api), init_function); \ diff --git a/sys/d3dvideosink/directx/dx.h b/sys/d3dvideosink/directx/dx.h index 60dd6d869..dcf7c05db 100644 --- a/sys/d3dvideosink/directx/dx.h +++ b/sys/d3dvideosink/directx/dx.h @@ -111,7 +111,7 @@ typedef enum , &DIRECTX_ ## version ## _DIRECTCOMPUTE_COMPONENT \ , {NULL, NULL, NULL} /*reserved*/ \ }; \ - static void init_directx_ ## version ## _supported_api(void) { \ + static void G_GNUC_UNUSED init_directx_ ## version ## _supported_api(void) { \ DirectXAPI* api; \ api = &DIRECTX_ ## version ## _API; \ api->d3d->api = api; \ diff --git a/sys/decklink/Makefile.am b/sys/decklink/Makefile.am index a35658f6f..9d1260170 100644 --- a/sys/decklink/Makefile.am +++ b/sys/decklink/Makefile.am @@ -11,17 +11,32 @@ libgstdecklink_la_LIBADD = \ $(GST_BASE_LIBS) \ $(GST_LIBS) \ -lgstvideo-@GST_MAJORMINOR@ \ + -lgstinterfaces-@GST_MAJORMINOR@ \ $(DECKLINK_LIBS) \ $(LIBM) -libgstdecklink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +libgstdecklink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) + +if DECKLINK_OSX +libgstdecklink_la_LDFLAGS += \ + -Wl,-framework,CoreFoundation +endif + libgstdecklink_la_LIBTOOLFLAGS = --tag=disable-static libgstdecklink_la_SOURCES = \ gstdecklinksrc.cpp \ gstdecklinksink.cpp \ gstdecklink.cpp \ - capture.cpp \ + capture.cpp + +if DECKLINK_OSX +libgstdecklink_la_SOURCES += \ + osx/DeckLinkAPIDispatch-osx.cpp +else +libgstdecklink_la_SOURCES += \ linux/DeckLinkAPIDispatch.cpp +endif + noinst_HEADERS = \ gstdecklink.h \ @@ -29,10 +44,19 @@ noinst_HEADERS = \ gstdecklinksink.h \ capture.h \ linux/DeckLinkAPI.h \ - linux/LinuxCOM.h + linux/LinuxCOM.h \ + osx/DeckLinkAPI.h \ + osx/DeckLinkAPIConfiguration.h \ + osx/DeckLinkAPIDeckControl.h \ + osx/DeckLinkAPIDiscovery.h \ + osx/DeckLinkAPIModes.h \ + osx/DeckLinkAPIStreaming.h \ + osx/DeckLinkAPITypes.h \ + osx/DeckLinkAPIVersion.h EXTRA_DIST = \ win/DeckLinkAPI.h \ win/DeckLinkAPIDispatch.cpp \ win/DeckLinkAPI_i.c + diff --git a/sys/decklink/capture.cpp b/sys/decklink/capture.cpp index 39ee6c449..8804eebaf 100644 --- a/sys/decklink/capture.cpp +++ b/sys/decklink/capture.cpp @@ -43,11 +43,11 @@ IDeckLink *deckLink; IDeckLinkInput *deckLinkInput; IDeckLinkDisplayModeIterator *displayModeIterator; -static BMDTimecodeFormat g_timecodeFormat = (BMDTimecodeFormat)0; +static BMDTimecodeFormat g_timecodeFormat = (BMDTimecodeFormat) 0; DeckLinkCaptureDelegate::DeckLinkCaptureDelegate ():m_refCount (0) { - m_mutex = g_mutex_new(); + m_mutex = g_mutex_new (); } DeckLinkCaptureDelegate::~DeckLinkCaptureDelegate () @@ -55,8 +55,7 @@ DeckLinkCaptureDelegate::~DeckLinkCaptureDelegate () g_mutex_free (m_mutex); } -ULONG -DeckLinkCaptureDelegate::AddRef (void) +ULONG DeckLinkCaptureDelegate::AddRef (void) { g_mutex_lock (m_mutex); m_refCount++; @@ -65,15 +64,15 @@ DeckLinkCaptureDelegate::AddRef (void) return (ULONG) m_refCount; } -ULONG -DeckLinkCaptureDelegate::Release (void) +ULONG DeckLinkCaptureDelegate::Release (void) { g_mutex_lock (m_mutex); m_refCount--; g_mutex_unlock (m_mutex); if (m_refCount == 0) { - delete this; + delete + this; return 0; } diff --git a/sys/decklink/gstdecklink.cpp b/sys/decklink/gstdecklink.cpp index 0920cca2f..d747fcf9d 100644 --- a/sys/decklink/gstdecklink.cpp +++ b/sys/decklink/gstdecklink.cpp @@ -94,7 +94,8 @@ gst_decklink_audio_connection_get_type (void) if (!type) { static const GEnumValue connections[] = { {GST_DECKLINK_AUDIO_CONNECTION_AUTO, "auto", "Automatic"}, - {GST_DECKLINK_AUDIO_CONNECTION_EMBEDDED, "embedded", "SDI/HDMI embedded audio"}, + {GST_DECKLINK_AUDIO_CONNECTION_EMBEDDED, "embedded", + "SDI/HDMI embedded audio"}, {GST_DECKLINK_AUDIO_CONNECTION_AES_EBU, "aes", "AES/EBU input"}, {GST_DECKLINK_AUDIO_CONNECTION_ANALOG, "analog", "Analog input"}, {0, NULL, NULL} @@ -110,29 +111,29 @@ gst_decklink_audio_connection_get_type (void) #define HD 1, 1, false, true static const GstDecklinkMode modes[] = { - {bmdModeNTSC, 720, 486, 30000, 1001, true, NTSC }, - {bmdModeNTSC2398, 720, 486, 24000, 1001, true, NTSC }, - {bmdModePAL, 720, 576, 25, 1, true, PAL }, - {bmdModeNTSCp, 720, 486, 30000, 1001, false, NTSC }, - {bmdModePALp, 720, 576, 25, 1, false, PAL }, - - {bmdModeHD1080p2398, 1920, 1080, 24000, 1001, false, HD }, - {bmdModeHD1080p24, 1920, 1080, 24, 1, false, HD }, - {bmdModeHD1080p25, 1920, 1080, 25, 1, false, HD }, - {bmdModeHD1080p2997, 1920, 1080, 30000, 1001, false, HD }, - {bmdModeHD1080p30, 1920, 1080, 30, 1, false, HD }, - - {bmdModeHD1080i50, 1920, 1080, 25, 1, true, HD }, - {bmdModeHD1080i5994, 1920, 1080, 30000, 1001, true, HD }, - {bmdModeHD1080i6000, 1920, 1080, 30, 1, true, HD }, - - {bmdModeHD1080p50, 1920, 1080, 50, 1, false, HD }, - {bmdModeHD1080p5994, 1920, 1080, 30000, 1001, false, HD }, - {bmdModeHD1080p6000, 1920, 1080, 60, 1, false, HD }, - - {bmdModeHD720p50, 1280, 720, 50, 1, false, HD }, - {bmdModeHD720p5994, 1280, 720, 60000, 1001, false, HD }, - {bmdModeHD720p60, 1280, 720, 60, 1, false, HD } + {bmdModeNTSC, 720, 486, 30000, 1001, true, NTSC}, + {bmdModeNTSC2398, 720, 486, 24000, 1001, true, NTSC}, + {bmdModePAL, 720, 576, 25, 1, true, PAL}, + {bmdModeNTSCp, 720, 486, 30000, 1001, false, NTSC}, + {bmdModePALp, 720, 576, 25, 1, false, PAL}, + + {bmdModeHD1080p2398, 1920, 1080, 24000, 1001, false, HD}, + {bmdModeHD1080p24, 1920, 1080, 24, 1, false, HD}, + {bmdModeHD1080p25, 1920, 1080, 25, 1, false, HD}, + {bmdModeHD1080p2997, 1920, 1080, 30000, 1001, false, HD}, + {bmdModeHD1080p30, 1920, 1080, 30, 1, false, HD}, + + {bmdModeHD1080i50, 1920, 1080, 25, 1, true, HD}, + {bmdModeHD1080i5994, 1920, 1080, 30000, 1001, true, HD}, + {bmdModeHD1080i6000, 1920, 1080, 30, 1, true, HD}, + + {bmdModeHD1080p50, 1920, 1080, 50, 1, false, HD}, + {bmdModeHD1080p5994, 1920, 1080, 30000, 1001, false, HD}, + {bmdModeHD1080p6000, 1920, 1080, 60, 1, false, HD}, + + {bmdModeHD720p50, 1280, 720, 50, 1, false, HD}, + {bmdModeHD720p5994, 1280, 720, 60000, 1001, false, HD}, + {bmdModeHD720p60, 1280, 720, 60, 1, false, HD} }; @@ -155,8 +156,7 @@ gst_decklink_mode_get_structure (GstDecklinkModeEnum e) "interlaced", G_TYPE_BOOLEAN, mode->interlaced, "pixel-aspect-ratio", GST_TYPE_FRACTION, mode->par_n, mode->par_d, "color-matrix", G_TYPE_STRING, mode->is_hdtv ? "hdtv" : "sdtv", - "chroma-site", G_TYPE_STRING, "mpeg2", - NULL); + "chroma-site", G_TYPE_STRING, "mpeg2", NULL); } GstCaps * @@ -178,14 +178,44 @@ gst_decklink_mode_get_template_caps (void) GstStructure *s; caps = gst_caps_new_empty (); - for(i=0;i<(int)G_N_ELEMENTS(modes);i++) { - s = gst_decklink_mode_get_structure ((GstDecklinkModeEnum)i); + for (i = 0; i < (int) G_N_ELEMENTS (modes); i++) { + s = gst_decklink_mode_get_structure ((GstDecklinkModeEnum) i); gst_caps_append_structure (caps, s); } return caps; } +IDeckLink * +gst_decklink_get_nth_device (int n) +{ + IDeckLinkIterator *iterator; + IDeckLink *decklink = NULL; + HRESULT ret; + int i; + + iterator = CreateDeckLinkIteratorInstance (); + if (iterator == NULL) { + GST_ERROR ("no driver"); + return NULL; + } + + ret = iterator->Next (&decklink); + if (ret != S_OK) { + GST_ERROR ("no card"); + return NULL; + } + for (i = 0; i < n; i++) { + ret = iterator->Next (&decklink); + if (ret != S_OK) { + GST_ERROR ("no card"); + return NULL; + } + } + + return decklink; +} + static gboolean plugin_init (GstPlugin * plugin) { diff --git a/sys/decklink/gstdecklink.h b/sys/decklink/gstdecklink.h index bd1d1d30b..77c5cc43a 100644 --- a/sys/decklink/gstdecklink.h +++ b/sys/decklink/gstdecklink.h @@ -107,34 +107,7 @@ const GstDecklinkMode * gst_decklink_get_mode (GstDecklinkModeEnum e); GstCaps * gst_decklink_mode_get_caps (GstDecklinkModeEnum e); GstCaps * gst_decklink_mode_get_template_caps (void); -#define GST_DECKLINK_MODE_CAPS(w,h,n,d,i) \ - "video/x-raw-yuv,format=(fourcc){ UYVY, v210 },width=" #w ",height=" #h \ - ",framerate=" #n "/" #d ",interlaced=" #i - -#define GST_DECKLINK_CAPS \ - GST_DECKLINK_MODE_CAPS(720,486,30000,1001,true) ";" \ - GST_DECKLINK_MODE_CAPS(720,486,24000,1001,true) ";" \ - GST_DECKLINK_MODE_CAPS(720,576,25,1,true) ";" \ - GST_DECKLINK_MODE_CAPS(720,486,30000,1001,false) ";" \ - GST_DECKLINK_MODE_CAPS(720,576,25,1,false) ";" \ - \ - GST_DECKLINK_MODE_CAPS(1920,1080,24000,1001,false) ";" \ - GST_DECKLINK_MODE_CAPS(1920,1080,24,1,false) ";" \ - GST_DECKLINK_MODE_CAPS(1920,1080,25,1,false) ";" \ - GST_DECKLINK_MODE_CAPS(1920,1080,30000,1001,false) ";" \ - GST_DECKLINK_MODE_CAPS(1920,1080,30,1,false) ";" \ - \ - GST_DECKLINK_MODE_CAPS(1920,1080,25,1,true) ";" \ - GST_DECKLINK_MODE_CAPS(1920,1080,30000,1001,true) ";" \ - GST_DECKLINK_MODE_CAPS(1920,1080,30,1,true) ";" \ - \ - GST_DECKLINK_MODE_CAPS(1920,1080,50,1,false) ";" \ - GST_DECKLINK_MODE_CAPS(1920,1080,60000,1001,false) ";" \ - GST_DECKLINK_MODE_CAPS(1920,1080,60,1,false) ";" \ - \ - GST_DECKLINK_MODE_CAPS(1280,720,50,1,false) ";" \ - GST_DECKLINK_MODE_CAPS(1280,720,60000,1001,false) ";" \ - GST_DECKLINK_MODE_CAPS(1280,720,60,1,false) +IDeckLink * gst_decklink_get_nth_device (int n); #endif diff --git a/sys/decklink/gstdecklinksink.cpp b/sys/decklink/gstdecklinksink.cpp index 1f4ccc8d0..6a105d46d 100644 --- a/sys/decklink/gstdecklinksink.cpp +++ b/sys/decklink/gstdecklinksink.cpp @@ -35,8 +35,8 @@ #endif #include <gst/gst.h> -#include <gst/glib-compat-private.h> #include <gst/video/video.h> +#include <gst/interfaces/propertyprobe.h> #include "gstdecklink.h" #include "gstdecklinksink.h" #include <string.h> @@ -118,24 +118,25 @@ static GstFlowReturn gst_decklink_sink_audiosink_bufferalloc (GstPad * pad, guint64 offset, guint size, GstCaps * caps, GstBuffer ** buf); static GstIterator *gst_decklink_sink_audiosink_iterintlink (GstPad * pad); +static void +gst_decklink_sink_property_probe_interface_init (GstPropertyProbeInterface * + iface); + #ifdef _MSC_VER /* COM initialization/uninitialization thread */ -static void gst_decklink_sink_com_thread (GstDecklinkSink * src); +static void gst_decklink_sink_com_thread (GstDecklinkSink * sink); #endif /* _MSC_VER */ enum { PROP_0, - PROP_MODE + PROP_MODE, + PROP_DEVICE }; /* pad templates */ -static GstStaticPadTemplate gst_decklink_sink_videosink_template = -GST_STATIC_PAD_TEMPLATE ("videosink", - GST_PAD_SINK, - GST_PAD_ALWAYS, - GST_STATIC_CAPS (GST_DECKLINK_CAPS)); +/* the video sink pad template is created on the fly */ static GstStaticPadTemplate gst_decklink_sink_audiosink_template = GST_STATIC_PAD_TEMPLATE ("audiosink", @@ -151,16 +152,37 @@ GST_STATIC_PAD_TEMPLATE ("audiosink", GST_DEBUG_CATEGORY_INIT (gst_decklink_sink_debug_category, "decklinksink", 0, \ "debug category for decklinksink element"); +static void +gst_decklink_sink_init_interfaces (GType type) +{ + static const GInterfaceInfo decklink_sink_propertyprobe_info = { + (GInterfaceInitFunc) gst_decklink_sink_property_probe_interface_init, + NULL, + NULL, + }; + + GST_DEBUG_CATEGORY_INIT (gst_decklink_sink_debug_category, "decklinksink", 0, + "debug category for decklinksink element"); + + g_type_add_interface_static (type, GST_TYPE_PROPERTY_PROBE, + &decklink_sink_propertyprobe_info); +} + + GST_BOILERPLATE_FULL (GstDecklinkSink, gst_decklink_sink, GstElement, - GST_TYPE_ELEMENT, DEBUG_INIT); + GST_TYPE_ELEMENT, gst_decklink_sink_init_interfaces); static void gst_decklink_sink_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); + GstPadTemplate *pad_template; - gst_element_class_add_pad_template (element_class, - gst_static_pad_template_get (&gst_decklink_sink_videosink_template)); + pad_template = + gst_pad_template_new ("videosink", GST_PAD_SINK, GST_PAD_ALWAYS, + gst_decklink_mode_get_template_caps ()); + gst_element_class_add_pad_template (element_class, pad_template); + gst_object_unref (pad_template); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_decklink_sink_audiosink_template)); @@ -189,11 +211,18 @@ gst_decklink_sink_class_init (GstDecklinkSinkClass * klass) element_class->query = GST_DEBUG_FUNCPTR (gst_decklink_sink_query); g_object_class_install_property (gobject_class, PROP_MODE, - g_param_spec_enum ("mode", "Mode", "Mode", + g_param_spec_enum ("mode", "Playback Mode", + "Video Mode to use for playback", GST_TYPE_DECKLINK_MODE, GST_DECKLINK_MODE_NTSC, (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT))); + g_object_class_install_property (gobject_class, PROP_DEVICE, + g_param_spec_int ("device", "Device", "Capture device instance to use", + 0, G_MAXINT, 0, + (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | + G_PARAM_CONSTRUCT))); + } static void @@ -202,8 +231,8 @@ gst_decklink_sink_init (GstDecklinkSink * decklinksink, { decklinksink->videosinkpad = - gst_pad_new_from_static_template (&gst_decklink_sink_videosink_template, - "sink"); + gst_pad_new_from_template (gst_element_class_get_pad_template + (GST_ELEMENT_CLASS (decklinksink_class), "videosink"), "videosink"); gst_pad_set_getcaps_function (decklinksink->videosinkpad, GST_DEBUG_FUNCPTR (gst_decklink_sink_videosink_getcaps)); gst_pad_set_setcaps_function (decklinksink->videosinkpad, @@ -271,22 +300,23 @@ gst_decklink_sink_init (GstDecklinkSink * decklinksink, decklinksink->audio_mutex = g_mutex_new (); decklinksink->mode = GST_DECKLINK_MODE_NTSC; + decklinksink->device = 0; decklinksink->callback = new Output; decklinksink->callback->decklinksink = decklinksink; #ifdef _MSC_VER - decklinksink->com_init_lock = g_mutex_new(); - decklinksink->com_deinit_lock = g_mutex_new(); - decklinksink->com_initialized = g_cond_new(); - decklinksink->com_uninitialize = g_cond_new(); - decklinksink->com_uninitialized = g_cond_new(); + decklinksink->com_init_lock = g_mutex_new (); + decklinksink->com_deinit_lock = g_mutex_new (); + decklinksink->com_initialized = g_cond_new (); + decklinksink->com_uninitialize = g_cond_new (); + decklinksink->com_uninitialized = g_cond_new (); g_mutex_lock (decklinksink->com_init_lock); /* create the COM initialization thread */ - g_thread_create ((GThreadFunc)gst_decklink_sink_com_thread, - decklinksink, FALSE, NULL); + g_thread_create ((GThreadFunc) gst_decklink_sink_com_thread, + decklinksink, FALSE, NULL); /* wait until the COM thread signals that COM has been initialized */ g_cond_wait (decklinksink->com_initialized, decklinksink->com_init_lock); @@ -307,6 +337,9 @@ gst_decklink_sink_set_property (GObject * object, guint property_id, case PROP_MODE: decklinksink->mode = (GstDecklinkModeEnum) g_value_get_enum (value); break; + case PROP_DEVICE: + decklinksink->device = g_value_get_int (value); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break; @@ -326,6 +359,9 @@ gst_decklink_sink_get_property (GObject * object, guint property_id, case PROP_MODE: g_value_set_enum (value, decklinksink->mode); break; + case PROP_DEVICE: + g_value_set_int (value, decklinksink->device); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break; @@ -334,11 +370,11 @@ gst_decklink_sink_get_property (GObject * object, guint property_id, #ifdef _MSC_VER static void -gst_decklink_sink_com_thread (GstDecklinkSink * src) +gst_decklink_sink_com_thread (GstDecklinkSink * sink) { HRESULT res; - g_mutex_lock (src->com_init_lock); + g_mutex_lock (sink->com_init_lock); /* Initialize COM with a MTA for this process. This thread will * be the first one to enter the apartement and the last one to leave @@ -346,28 +382,29 @@ gst_decklink_sink_com_thread (GstDecklinkSink * src) res = CoInitializeEx (0, COINIT_MULTITHREADED); if (res == S_FALSE) - GST_WARNING_OBJECT (src, "COM has been already initialized in the same process"); + GST_WARNING_OBJECT (sink, + "COM has been already initialized in the same process"); else if (res == RPC_E_CHANGED_MODE) - GST_WARNING_OBJECT (src, "The concurrency model of COM has changed."); + GST_WARNING_OBJECT (sink, "The concurrency model of COM has changed."); else - GST_INFO_OBJECT (src, "COM intialized succesfully"); + GST_INFO_OBJECT (sink, "COM intialized succesfully"); - src->comInitialized = TRUE; + sink->comInitialized = TRUE; /* Signal other threads waiting on this condition that COM was initialized */ - g_cond_signal (src->com_initialized); + g_cond_signal (sink->com_initialized); - g_mutex_unlock (src->com_init_lock); + g_mutex_unlock (sink->com_init_lock); /* Wait until the unitialize condition is met to leave the COM apartement */ - g_mutex_lock (src->com_deinit_lock); - g_cond_wait (src->com_uninitialize, src->com_deinit_lock); + g_mutex_lock (sink->com_deinit_lock); + g_cond_wait (sink->com_uninitialize, sink->com_deinit_lock); CoUninitialize (); - GST_INFO_OBJECT (src, "COM unintialized succesfully"); - src->comInitialized = FALSE; - g_cond_signal (src->com_uninitialized); - g_mutex_unlock (src->com_deinit_lock); + GST_INFO_OBJECT (sink, "COM unintialized succesfully"); + sink->comInitialized = FALSE; + g_cond_signal (sink->com_uninitialized); + g_mutex_unlock (sink->com_deinit_lock); } #endif /* _MSC_VER */ @@ -401,7 +438,8 @@ gst_decklink_sink_finalize (GObject * object) if (decklinksink->comInitialized) { g_mutex_lock (decklinksink->com_deinit_lock); g_cond_signal (decklinksink->com_uninitialize); - g_cond_wait (decklinksink->com_uninitialized, decklinksink->com_deinit_lock); + g_cond_wait (decklinksink->com_uninitialized, + decklinksink->com_deinit_lock); g_mutex_unlock (decklinksink->com_deinit_lock); } @@ -418,27 +456,19 @@ gst_decklink_sink_finalize (GObject * object) static gboolean gst_decklink_sink_start (GstDecklinkSink * decklinksink) { - IDeckLinkIterator *iterator; HRESULT ret; const GstDecklinkMode *mode; BMDAudioSampleType sample_depth; - iterator = CreateDeckLinkIteratorInstance (); - if (iterator == NULL) { - GST_ERROR ("no driver"); - return FALSE; - } - - ret = iterator->Next (&decklinksink->decklink); - if (ret != S_OK) { - GST_ERROR ("no card"); + decklinksink->decklink = gst_decklink_get_nth_device (decklinksink->device); + if (decklinksink->decklink) { return FALSE; } ret = decklinksink->decklink->QueryInterface (IID_IDeckLinkOutput, (void **) &decklinksink->output); if (ret != S_OK) { - GST_ERROR ("no output"); + GST_ERROR ("selected device does not have output interface"); return FALSE; } @@ -454,8 +484,8 @@ gst_decklink_sink_start (GstDecklinkSink * decklinksink) } //decklinksink->video_enabled = TRUE; - decklinksink->output-> - SetScheduledFrameCompletionCallback (decklinksink->callback); + decklinksink->output->SetScheduledFrameCompletionCallback (decklinksink-> + callback); sample_depth = bmdAudioSampleType16bitInteger; ret = decklinksink->output->EnableAudioOutput (bmdAudioSampleRate48kHz, @@ -1088,16 +1118,18 @@ HRESULT return S_OK; } -HRESULT Output::ScheduledPlaybackHasStopped () +HRESULT +Output::ScheduledPlaybackHasStopped () { GST_ERROR ("ScheduledPlaybackHasStopped"); return S_OK; } -HRESULT Output::RenderAudioSamples (bool preroll) +HRESULT +Output::RenderAudioSamples (bool preroll) { uint32_t samplesWritten; - GstBuffer * buffer; + GstBuffer *buffer; // guint64 samplesToWrite; @@ -1107,9 +1139,7 @@ HRESULT Output::RenderAudioSamples (bool preroll) // running = true; } else { g_mutex_lock (decklinksink->audio_mutex); - decklinksink->output->ScheduleAudioSamples ( - GST_BUFFER_DATA (decklinksink->audio_buffer), - GST_BUFFER_SIZE (decklinksink->audio_buffer) / 4, // 2 bytes per sample, stereo + decklinksink->output->ScheduleAudioSamples (GST_BUFFER_DATA (decklinksink->audio_buffer), GST_BUFFER_SIZE (decklinksink->audio_buffer) / 4, // 2 bytes per sample, stereo 0, 0, &samplesWritten); buffer = @@ -1132,3 +1162,125 @@ HRESULT Output::RenderAudioSamples (bool preroll) return S_OK; } + + +static const GList * +gst_decklink_sink_probe_get_properties (GstPropertyProbe * probe) +{ + GObjectClass *klass = G_OBJECT_GET_CLASS (probe); + static GList *list = NULL; + static gsize init = 0; + + if (g_once_init_enter (&init)) { + list = g_list_append (NULL, g_object_class_find_property (klass, "device")); + + g_once_init_leave (&init, 1); + } + + return list; +} + + +static gboolean probed = FALSE; +static int n_devices; + +static void +gst_decklink_sink_class_probe_devices (GstElementClass * klass) +{ + IDeckLinkIterator *iterator; + IDeckLink *decklink; + + n_devices = 0; + iterator = CreateDeckLinkIteratorInstance (); + if (iterator) { + while (iterator->Next (&decklink) == S_OK) { + n_devices++; + } + } + + probed = TRUE; +} + +static void +gst_decklink_sink_probe_probe_property (GstPropertyProbe * probe, + guint prop_id, const GParamSpec * pspec) +{ + GstElementClass *klass = GST_ELEMENT_GET_CLASS (probe); + + switch (prop_id) { + case PROP_DEVICE: + gst_decklink_sink_class_probe_devices (klass); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (probe, prop_id, pspec); + break; + } +} + +static gboolean +gst_decklink_sink_probe_needs_probe (GstPropertyProbe * probe, + guint prop_id, const GParamSpec * pspec) +{ + gboolean ret = FALSE; + + switch (prop_id) { + case PROP_DEVICE: + ret = !probed; + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (probe, prop_id, pspec); + break; + } + return ret; +} + +static GValueArray * +gst_decklink_sink_class_list_devices (GstElementClass * klass) +{ + GValueArray *array; + GValue value = { + 0}; + GList *item; + int i; + + array = g_value_array_new (n_devices); + g_value_init (&value, G_TYPE_INT); + for (i = 0; i < n_devices; i++) { + g_value_set_int (&value, i); + g_value_array_append (array, &value); + + item = item->next; + } + g_value_unset (&value); + + return array; +} + +static GValueArray * +gst_decklink_sink_probe_get_values (GstPropertyProbe * probe, + guint prop_id, const GParamSpec * pspec) +{ + GstElementClass *klass = GST_ELEMENT_GET_CLASS (probe); + GValueArray *array = NULL; + + switch (prop_id) { + case PROP_DEVICE: + array = gst_decklink_sink_class_list_devices (klass); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (probe, prop_id, pspec); + break; + } + + return array; +} + +static void +gst_decklink_sink_property_probe_interface_init (GstPropertyProbeInterface * + iface) +{ + iface->get_properties = gst_decklink_sink_probe_get_properties; + iface->probe_property = gst_decklink_sink_probe_probe_property; + iface->needs_probe = gst_decklink_sink_probe_needs_probe; + iface->get_values = gst_decklink_sink_probe_get_values; +} diff --git a/sys/decklink/gstdecklinksink.h b/sys/decklink/gstdecklinksink.h index 31d70cd78..20c47edc2 100644 --- a/sys/decklink/gstdecklinksink.h +++ b/sys/decklink/gstdecklinksink.h @@ -75,6 +75,7 @@ struct _GstDecklinkSink /* properties */ GstDecklinkModeEnum mode; + int device; #ifdef _MSC_VER gboolean comInitialized; diff --git a/sys/decklink/gstdecklinksrc.cpp b/sys/decklink/gstdecklinksrc.cpp index 755cb3dfc..d1a776dce 100644 --- a/sys/decklink/gstdecklinksrc.cpp +++ b/sys/decklink/gstdecklinksrc.cpp @@ -45,6 +45,8 @@ #include "gstdecklinksrc.h" #include "capture.h" #include <string.h> +#include <gst/interfaces/propertyprobe.h> + GST_DEBUG_CATEGORY (gst_decklink_src_debug_category); #define GST_CAT_DEFAULT gst_decklink_src_debug_category @@ -118,6 +120,10 @@ static gboolean gst_decklink_src_video_src_query (GstPad * pad, GstQuery * query); static GstIterator *gst_decklink_src_video_src_iterintlink (GstPad * pad); +static void +gst_decklinksrc_property_probe_interface_init (GstPropertyProbeInterface * + iface); + static void gst_decklink_src_task (void *priv); #ifdef _MSC_VER @@ -131,7 +137,7 @@ enum PROP_MODE, PROP_CONNECTION, PROP_AUDIO_INPUT, - PROP_SUBDEVICE + PROP_DEVICE }; /* pad templates */ @@ -147,12 +153,24 @@ GST_STATIC_PAD_TEMPLATE ("audiosrc", /* class initialization */ -#define DEBUG_INIT(bla) \ - GST_DEBUG_CATEGORY_INIT (gst_decklink_src_debug_category, "decklinksrc", 0, \ +static void +gst_decklinksrc_init_interfaces (GType type) +{ + static const GInterfaceInfo decklinksrc_propertyprobe_info = { + (GInterfaceInitFunc) gst_decklinksrc_property_probe_interface_init, + NULL, + NULL, + }; + + GST_DEBUG_CATEGORY_INIT (gst_decklink_src_debug_category, "decklinksrc", 0, "debug category for decklinksrc element"); + g_type_add_interface_static (type, GST_TYPE_PROPERTY_PROBE, + &decklinksrc_propertyprobe_info); +} + GST_BOILERPLATE_FULL (GstDecklinkSrc, gst_decklink_src, GstElement, - GST_TYPE_ELEMENT, DEBUG_INIT); + GST_TYPE_ELEMENT, gst_decklinksrc_init_interfaces); static void gst_decklink_src_base_init (gpointer g_class) @@ -193,27 +211,29 @@ gst_decklink_src_class_init (GstDecklinkSrcClass * klass) element_class->query = GST_DEBUG_FUNCPTR (gst_decklink_src_query); g_object_class_install_property (gobject_class, PROP_MODE, - g_param_spec_enum ("mode", "Mode", "Mode", + g_param_spec_enum ("mode", "Mode", "Video Mode to use for capture", GST_TYPE_DECKLINK_MODE, GST_DECKLINK_MODE_NTSC, (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT))); g_object_class_install_property (gobject_class, PROP_CONNECTION, - g_param_spec_enum ("connection", "Connection", "Connection", + g_param_spec_enum ("connection", "Connection", + "Video Input Connection to use", GST_TYPE_DECKLINK_CONNECTION, GST_DECKLINK_CONNECTION_SDI, (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT))); g_object_class_install_property (gobject_class, PROP_AUDIO_INPUT, - g_param_spec_enum ("audio-input", "Audio Input", "Audio Input Connection", + g_param_spec_enum ("audio-input", "Audio Input", + "Audio Input Connection", GST_TYPE_DECKLINK_AUDIO_CONNECTION, GST_DECKLINK_AUDIO_CONNECTION_AUTO, (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT))); - g_object_class_install_property (gobject_class, PROP_SUBDEVICE, - g_param_spec_int ("subdevice", "Subdevice", "Subdevice", - 0, 3, 0, + g_object_class_install_property (gobject_class, PROP_DEVICE, + g_param_spec_int ("device", "Device", "Capture device instance to use", + 0, G_MAXINT, 0, (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT))); } @@ -294,25 +314,25 @@ gst_decklink_src_init (GstDecklinkSrc * decklinksrc, decklinksrc->mode = GST_DECKLINK_MODE_NTSC; decklinksrc->connection = GST_DECKLINK_CONNECTION_SDI; decklinksrc->audio_connection = GST_DECKLINK_AUDIO_CONNECTION_AUTO; - decklinksrc->subdevice = 0; + decklinksrc->device = 0; decklinksrc->stop = FALSE; decklinksrc->dropped_frames = 0; decklinksrc->dropped_frames_old = 0; - decklinksrc->frame_num = -1; /* -1 so will be 0 after incrementing */ + decklinksrc->frame_num = -1; /* -1 so will be 0 after incrementing */ #ifdef _MSC_VER - decklinksrc->com_init_lock = g_mutex_new(); - decklinksrc->com_deinit_lock = g_mutex_new(); - decklinksrc->com_initialized = g_cond_new(); - decklinksrc->com_uninitialize = g_cond_new(); - decklinksrc->com_uninitialized = g_cond_new(); + decklinksrc->com_init_lock = g_mutex_new (); + decklinksrc->com_deinit_lock = g_mutex_new (); + decklinksrc->com_initialized = g_cond_new (); + decklinksrc->com_uninitialize = g_cond_new (); + decklinksrc->com_uninitialized = g_cond_new (); g_mutex_lock (decklinksrc->com_init_lock); /* create the COM initialization thread */ - g_thread_create ((GThreadFunc)gst_decklink_src_com_thread, - decklinksrc, FALSE, NULL); + g_thread_create ((GThreadFunc) gst_decklink_src_com_thread, + decklinksrc, FALSE, NULL); /* wait until the COM thread signals that COM has been initialized */ g_cond_wait (decklinksrc->com_initialized, decklinksrc->com_init_lock); @@ -341,8 +361,8 @@ gst_decklink_src_set_property (GObject * object, guint property_id, decklinksrc->audio_connection = (GstDecklinkAudioConnectionEnum) g_value_get_enum (value); break; - case PROP_SUBDEVICE: - decklinksrc->subdevice = g_value_get_int (value); + case PROP_DEVICE: + decklinksrc->device = g_value_get_int (value); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); @@ -369,8 +389,8 @@ gst_decklink_src_get_property (GObject * object, guint property_id, case PROP_AUDIO_INPUT: g_value_set_enum (value, decklinksrc->audio_connection); break; - case PROP_SUBDEVICE: - g_value_set_int (value, decklinksrc->subdevice); + case PROP_DEVICE: + g_value_set_int (value, decklinksrc->device); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); @@ -392,7 +412,8 @@ gst_decklink_src_com_thread (GstDecklinkSrc * src) res = CoInitializeEx (0, COINIT_MULTITHREADED); if (res == S_FALSE) - GST_WARNING_OBJECT (src, "COM has been already initialized in the same process"); + GST_WARNING_OBJECT (src, + "COM has been already initialized in the same process"); else if (res == RPC_E_CHANGED_MODE) GST_WARNING_OBJECT (src, "The concurrency model of COM has changed."); else @@ -447,7 +468,6 @@ gst_decklink_src_finalize (GObject * object) if (decklinksrc->video_caps) { gst_caps_unref (decklinksrc->video_caps); } - #ifdef _MSC_VER /* signal the COM thread that it should uninitialize COM */ if (decklinksrc->comInitialized) { @@ -487,7 +507,6 @@ static gboolean gst_decklink_src_start (GstElement * element) { GstDecklinkSrc *decklinksrc = GST_DECKLINK_SRC (element); - IDeckLinkIterator *iterator; DeckLinkCaptureDelegate *delegate; //IDeckLinkDisplayModeIterator *mode_iterator; //IDeckLinkDisplayMode *mode; @@ -498,33 +517,18 @@ gst_decklink_src_start (GstElement * element) IDeckLinkConfiguration *config; BMDVideoConnection conn; BMDAudioConnection aconn; - int i; GST_DEBUG_OBJECT (decklinksrc, "start"); - iterator = CreateDeckLinkIteratorInstance (); - if (iterator == NULL) { - GST_ERROR ("no driver"); + decklinksrc->decklink = gst_decklink_get_nth_device (decklinksrc->device); + if (decklinksrc->decklink == NULL) { return FALSE; } - ret = iterator->Next (&decklinksrc->decklink); - if (ret != S_OK) { - GST_ERROR ("no card"); - return FALSE; - } - for (i = 0; i < decklinksrc->subdevice; i++) { - ret = iterator->Next (&decklinksrc->decklink); - if (ret != S_OK) { - GST_ERROR ("no card"); - return FALSE; - } - } - ret = decklinksrc->decklink->QueryInterface (IID_IDeckLinkInput, (void **) &decklinksrc->input); if (ret != S_OK) { - GST_ERROR ("query interface failed"); + GST_ERROR ("selected device does not have input interface"); return FALSE; } @@ -672,6 +676,9 @@ gst_decklink_src_stop (GstElement * element) decklinksrc->input->Release (); decklinksrc->input = NULL; + decklinksrc->decklink->Release (); + decklinksrc->decklink = NULL; + return TRUE; } @@ -759,8 +766,18 @@ gst_decklink_src_send_event (GstElement * element, GstEvent * event) static gboolean gst_decklink_src_query (GstElement * element, GstQuery * query) { + GstDecklinkSrc *decklinksrc = GST_DECKLINK_SRC (element); + gboolean ret; - return FALSE; + GST_DEBUG_OBJECT (decklinksrc, "query"); + + switch (GST_QUERY_TYPE (query)) { + default: + ret = GST_ELEMENT_CLASS (parent_class)->query (element, query); + break; + } + + return ret; } static GstCaps * @@ -783,28 +800,39 @@ static gboolean gst_decklink_src_audio_src_setcaps (GstPad * pad, GstCaps * caps) { GstDecklinkSrc *decklinksrc; + GstCaps *pad_caps; + gboolean can_intersect; decklinksrc = GST_DECKLINK_SRC (gst_pad_get_parent (pad)); + pad_caps = gst_pad_get_caps_reffed (pad); + can_intersect = gst_caps_can_intersect (pad_caps, caps); + gst_caps_unref (pad_caps); + GST_DEBUG_OBJECT (decklinksrc, "setcaps"); gst_object_unref (decklinksrc); - return TRUE; + return can_intersect; } static gboolean gst_decklink_src_audio_src_acceptcaps (GstPad * pad, GstCaps * caps) { GstDecklinkSrc *decklinksrc; + GstCaps *pad_caps; + gboolean can_intersect; decklinksrc = GST_DECKLINK_SRC (gst_pad_get_parent (pad)); - GST_DEBUG_OBJECT (decklinksrc, "acceptcaps"); + pad_caps = gst_pad_get_caps_reffed (pad); + can_intersect = gst_caps_can_intersect (pad_caps, caps); + gst_caps_unref (pad_caps); + GST_DEBUG_OBJECT (decklinksrc, "acceptcaps"); gst_object_unref (decklinksrc); - return TRUE; + return can_intersect; } static void @@ -865,9 +893,8 @@ gst_decklink_src_audio_src_activatepull (GstPad * pad, gboolean active) GST_DEBUG_OBJECT (decklinksrc, "activatepull"); - gst_object_unref (decklinksrc); - return TRUE; + return FALSE; } static GstPadLinkReturn @@ -976,28 +1003,39 @@ static gboolean gst_decklink_src_video_src_setcaps (GstPad * pad, GstCaps * caps) { GstDecklinkSrc *decklinksrc; + GstCaps *mode_caps; + gboolean can_intersect; decklinksrc = GST_DECKLINK_SRC (gst_pad_get_parent (pad)); GST_DEBUG_OBJECT (decklinksrc, "setcaps"); + mode_caps = gst_decklink_mode_get_caps (decklinksrc->mode); + can_intersect = gst_caps_can_intersect (mode_caps, caps); + gst_caps_unref (mode_caps); gst_object_unref (decklinksrc); - return TRUE; + return can_intersect; } static gboolean gst_decklink_src_video_src_acceptcaps (GstPad * pad, GstCaps * caps) { GstDecklinkSrc *decklinksrc; + GstCaps *mode_caps; + gboolean can_intersect; + decklinksrc = GST_DECKLINK_SRC (gst_pad_get_parent (pad)); GST_DEBUG_OBJECT (decklinksrc, "acceptcaps"); + mode_caps = gst_decklink_mode_get_caps (decklinksrc->mode); + can_intersect = gst_caps_can_intersect (mode_caps, caps); + gst_caps_unref (mode_caps); gst_object_unref (decklinksrc); - return TRUE; + return can_intersect; } static void @@ -1060,7 +1098,7 @@ gst_decklink_src_video_src_activatepull (GstPad * pad, gboolean active) gst_object_unref (decklinksrc); - return TRUE; + return FALSE; } static GstPadLinkReturn @@ -1115,7 +1153,7 @@ gst_decklink_src_video_src_event (GstPad * pad, GstEvent * event) static gboolean gst_decklink_src_video_src_query (GstPad * pad, GstQuery * query) { - gboolean res; + gboolean ret; GstDecklinkSrc *decklinksrc; decklinksrc = GST_DECKLINK_SRC (gst_pad_get_parent (pad)); @@ -1123,13 +1161,45 @@ gst_decklink_src_video_src_query (GstPad * pad, GstQuery * query) GST_DEBUG_OBJECT (decklinksrc, "query"); switch (GST_QUERY_TYPE (query)) { + case GST_QUERY_LATENCY:{ + GstClockTime min_latency, max_latency; + const GstDecklinkMode *mode; + + /* device must be open */ + if (decklinksrc->decklink == NULL) { + GST_WARNING_OBJECT (decklinksrc, + "Can't give latency since device isn't open !"); + goto done; + } + + mode = gst_decklink_get_mode (decklinksrc->mode); + + /* min latency is the time to capture one frame */ + min_latency = + gst_util_uint64_scale_int (GST_SECOND, mode->fps_d, mode->fps_n); + + /* max latency is total duration of the frame buffer */ + max_latency = 2 * min_latency; + + GST_DEBUG_OBJECT (decklinksrc, + "report latency min %" GST_TIME_FORMAT " max %" GST_TIME_FORMAT, + GST_TIME_ARGS (min_latency), GST_TIME_ARGS (max_latency)); + + /* we are always live, the min latency is 1 frame and the max latency is + * the complete buffer of frames. */ + gst_query_set_latency (query, TRUE, min_latency, max_latency); + + ret = TRUE; + break; + } default: - res = gst_pad_query_default (pad, query); + ret = gst_pad_query_default (pad, query); break; } +done: gst_object_unref (decklinksrc); - return res; + return ret; } static GstIterator * @@ -1190,10 +1260,9 @@ gst_decklink_src_task (void *priv) /* warning on dropped frames */ if (decklinksrc->dropped_frames - decklinksrc->dropped_frames_old > 0) { GST_ELEMENT_WARNING (decklinksrc, RESOURCE, READ, - ("Dropped %d frame(s), for a total of %d frame(s)", - decklinksrc->dropped_frames - decklinksrc->dropped_frames_old, - decklinksrc->dropped_frames), - (NULL)); + ("Dropped %d frame(s), for a total of %d frame(s)", + decklinksrc->dropped_frames - decklinksrc->dropped_frames_old, + decklinksrc->dropped_frames), (NULL)); decklinksrc->dropped_frames_old = decklinksrc->dropped_frames; } @@ -1233,11 +1302,28 @@ gst_decklink_src_task (void *priv) event = gst_event_new_new_segment (FALSE, 1.0, GST_FORMAT_TIME, 0, GST_CLOCK_TIME_NONE, 0); - ret = gst_pad_push_event (decklinksrc->videosrcpad, event); - if (!ret) { - GST_ERROR_OBJECT (decklinksrc, "new segment event ret=%d", ret); - return; + if (gst_pad_is_linked (decklinksrc->videosrcpad)) { + gst_event_ref (event); + ret = gst_pad_push_event (decklinksrc->videosrcpad, event); + if (!ret) { + GST_ERROR_OBJECT (decklinksrc, "new segment event ret=%d", ret); + gst_event_unref (event); + return; + } + } else { + gst_event_unref (event); + } + + if (gst_pad_is_linked (decklinksrc->audiosrcpad)) { + ret = gst_pad_push_event (decklinksrc->audiosrcpad, event); + if (!ret) { + GST_ERROR_OBJECT (decklinksrc, "new segment event ret=%d", ret); + gst_event_unref (event); + } + } else { + gst_event_unref (event); } + } if (decklinksrc->video_caps == NULL) { @@ -1246,8 +1332,11 @@ gst_decklink_src_task (void *priv) gst_buffer_set_caps (buffer, decklinksrc->video_caps); ret = gst_pad_push (decklinksrc->videosrcpad, buffer); - if (ret != GST_FLOW_OK) { - GST_ELEMENT_ERROR (decklinksrc, CORE, NEGOTIATION, (NULL), (NULL)); + if (!(ret == GST_FLOW_OK || ret == GST_FLOW_NOT_LINKED || + ret == GST_FLOW_WRONG_STATE)) { + GST_ELEMENT_ERROR (decklinksrc, STREAM, FAILED, + ("Internal data stream error."), + ("stream stopped, reason %s", gst_flow_get_name (ret))); } if (gst_pad_is_linked (decklinksrc->audiosrcpad)) { @@ -1260,9 +1349,7 @@ gst_decklink_src_task (void *priv) gst_util_uint64_scale_int (decklinksrc->num_audio_samples * GST_SECOND, 1, 48000); GST_BUFFER_DURATION (audio_buffer) = - gst_util_uint64_scale_int ((decklinksrc->num_audio_samples + - n_samples) * GST_SECOND, 1, - 48000) - GST_BUFFER_TIMESTAMP (audio_buffer); + gst_util_uint64_scale_int (n_samples * GST_SECOND, 1, 48000); decklinksrc->num_audio_samples += n_samples; if (decklinksrc->audio_caps == NULL) { @@ -1276,9 +1363,132 @@ gst_decklink_src_task (void *priv) gst_buffer_set_caps (audio_buffer, decklinksrc->audio_caps); ret = gst_pad_push (decklinksrc->audiosrcpad, audio_buffer); - if (ret != GST_FLOW_OK) { - GST_ELEMENT_ERROR (decklinksrc, CORE, NEGOTIATION, (NULL), (NULL)); + if (!(ret == GST_FLOW_OK || ret == GST_FLOW_NOT_LINKED || + ret == GST_FLOW_WRONG_STATE)) { + GST_ELEMENT_ERROR (decklinksrc, STREAM, FAILED, + ("Internal data stream error."), + ("stream stopped, reason %s", gst_flow_get_name (ret))); } } audio_frame->Release (); } + + +static const GList * +gst_decklinksrc_probe_get_properties (GstPropertyProbe * probe) +{ + GObjectClass *klass = G_OBJECT_GET_CLASS (probe); + static GList *list = NULL; + static gsize init = 0; + + if (g_once_init_enter (&init)) { + list = g_list_append (NULL, g_object_class_find_property (klass, "device")); + + g_once_init_leave (&init, 1); + } + + return list; +} + +static gboolean probed = FALSE; +static int n_devices; + +static void +gst_decklinksrc_class_probe_devices (GstElementClass * klass) +{ + IDeckLinkIterator *iterator; + IDeckLink *decklink; + + n_devices = 0; + iterator = CreateDeckLinkIteratorInstance (); + if (iterator) { + while (iterator->Next (&decklink) == S_OK) { + n_devices++; + } + } + + probed = TRUE; +} + +static void +gst_decklinksrc_probe_probe_property (GstPropertyProbe * probe, + guint prop_id, const GParamSpec * pspec) +{ + GstElementClass *klass = GST_ELEMENT_GET_CLASS (probe); + + switch (prop_id) { + case PROP_DEVICE: + gst_decklinksrc_class_probe_devices (klass); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (probe, prop_id, pspec); + break; + } +} + +static gboolean +gst_decklinksrc_probe_needs_probe (GstPropertyProbe * probe, + guint prop_id, const GParamSpec * pspec) +{ + gboolean ret = FALSE; + + switch (prop_id) { + case PROP_DEVICE: + ret = !probed; + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (probe, prop_id, pspec); + break; + } + return ret; +} + +static GValueArray * +gst_decklinksrc_class_list_devices (GstElementClass * klass) +{ + GValueArray *array; + GValue value = { 0 }; + GList *item; + int i; + + array = g_value_array_new (n_devices); + g_value_init (&value, G_TYPE_INT); + for (i = 0; i < n_devices; i++) { + g_value_set_int (&value, i); + g_value_array_append (array, &value); + + item = item->next; + } + g_value_unset (&value); + + return array; +} + +static GValueArray * +gst_decklinksrc_probe_get_values (GstPropertyProbe * probe, + guint prop_id, const GParamSpec * pspec) +{ + GstElementClass *klass = GST_ELEMENT_GET_CLASS (probe); + GValueArray *array = NULL; + + switch (prop_id) { + case PROP_DEVICE: + array = gst_decklinksrc_class_list_devices (klass); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (probe, prop_id, pspec); + break; + } + + return array; +} + +static void +gst_decklinksrc_property_probe_interface_init (GstPropertyProbeInterface * + iface) +{ + iface->get_properties = gst_decklinksrc_probe_get_properties; + iface->probe_property = gst_decklinksrc_probe_probe_property; + iface->needs_probe = gst_decklinksrc_probe_needs_probe; + iface->get_values = gst_decklinksrc_probe_get_values; +} diff --git a/sys/decklink/gstdecklinksrc.h b/sys/decklink/gstdecklinksrc.h index 69dea49f1..c47279a88 100644 --- a/sys/decklink/gstdecklinksrc.h +++ b/sys/decklink/gstdecklinksrc.h @@ -73,7 +73,7 @@ struct _GstDecklinkSrc GstDecklinkModeEnum mode; GstDecklinkConnectionEnum connection; GstDecklinkAudioConnectionEnum audio_connection; - int subdevice; + int device; #ifdef _MSC_VER gboolean comInitialized; diff --git a/sys/decklink/osx/DeckLinkAPI.h b/sys/decklink/osx/DeckLinkAPI.h new file mode 100644 index 000000000..b629369a7 --- /dev/null +++ b/sys/decklink/osx/DeckLinkAPI.h @@ -0,0 +1,695 @@ +/* -LICENSE-START- +** Copyright (c) 2011 Blackmagic Design +** +** Permission is hereby granted, free of charge, to any person or organization +** obtaining a copy of the software and accompanying documentation covered by +** this license (the "Software") to use, reproduce, display, distribute, +** execute, and transmit the Software, and to prepare derivative works of the +** Software, and to permit third-parties to whom the Software is furnished to +** do so, all subject to the following: +** +** The copyright notices in the Software and this entire statement, including +** the above license grant, this restriction and the following disclaimer, +** must be included in all copies of the Software, in whole or in part, and +** all derivative works of the Software, unless such copies or derivative +** works are solely in the form of machine-executable object code generated by +** a source language processor. +** +** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +** DEALINGS IN THE SOFTWARE. +** -LICENSE-END- +*/ + +#ifndef BMD_DECKLINKAPI_H +#define BMD_DECKLINKAPI_H + +/* DeckLink API */ + +#include <CoreFoundation/CoreFoundation.h> +#include <CoreFoundation/CFPlugInCOM.h> +#include <stdint.h> + +#include "DeckLinkAPITypes.h" +#include "DeckLinkAPIModes.h" +#include "DeckLinkAPIDiscovery.h" +#include "DeckLinkAPIConfiguration.h" +#include "DeckLinkAPIDeckControl.h" + +#include "DeckLinkAPIStreaming.h" + +#define BLACKMAGIC_DECKLINK_API_MAGIC 1 + +// Type Declarations + + +// Interface ID Declarations + +#define IID_IDeckLinkVideoOutputCallback /* 20AA5225-1958-47CB-820B-80A8D521A6EE */ (REFIID){0x20,0xAA,0x52,0x25,0x19,0x58,0x47,0xCB,0x82,0x0B,0x80,0xA8,0xD5,0x21,0xA6,0xEE} +#define IID_IDeckLinkInputCallback /* DD04E5EC-7415-42AB-AE4A-E80C4DFC044A */ (REFIID){0xDD,0x04,0xE5,0xEC,0x74,0x15,0x42,0xAB,0xAE,0x4A,0xE8,0x0C,0x4D,0xFC,0x04,0x4A} +#define IID_IDeckLinkMemoryAllocator /* B36EB6E7-9D29-4AA8-92EF-843B87A289E8 */ (REFIID){0xB3,0x6E,0xB6,0xE7,0x9D,0x29,0x4A,0xA8,0x92,0xEF,0x84,0x3B,0x87,0xA2,0x89,0xE8} +#define IID_IDeckLinkAudioOutputCallback /* 403C681B-7F46-4A12-B993-2BB127084EE6 */ (REFIID){0x40,0x3C,0x68,0x1B,0x7F,0x46,0x4A,0x12,0xB9,0x93,0x2B,0xB1,0x27,0x08,0x4E,0xE6} +#define IID_IDeckLinkIterator /* 50FB36CD-3063-4B73-BDBB-958087F2D8BA */ (REFIID){0x50,0xFB,0x36,0xCD,0x30,0x63,0x4B,0x73,0xBD,0xBB,0x95,0x80,0x87,0xF2,0xD8,0xBA} +#define IID_IDeckLinkAPIInformation /* 7BEA3C68-730D-4322-AF34-8A7152B532A4 */ (REFIID){0x7B,0xEA,0x3C,0x68,0x73,0x0D,0x43,0x22,0xAF,0x34,0x8A,0x71,0x52,0xB5,0x32,0xA4} +#define IID_IDeckLinkOutput /* A3EF0963-0862-44ED-92A9-EE89ABF431C7 */ (REFIID){0xA3,0xEF,0x09,0x63,0x08,0x62,0x44,0xED,0x92,0xA9,0xEE,0x89,0xAB,0xF4,0x31,0xC7} +#define IID_IDeckLinkInput /* 6D40EF78-28B9-4E21-990D-95BB7750A04F */ (REFIID){0x6D,0x40,0xEF,0x78,0x28,0xB9,0x4E,0x21,0x99,0x0D,0x95,0xBB,0x77,0x50,0xA0,0x4F} +#define IID_IDeckLinkVideoFrame /* 3F716FE0-F023-4111-BE5D-EF4414C05B17 */ (REFIID){0x3F,0x71,0x6F,0xE0,0xF0,0x23,0x41,0x11,0xBE,0x5D,0xEF,0x44,0x14,0xC0,0x5B,0x17} +#define IID_IDeckLinkMutableVideoFrame /* 69E2639F-40DA-4E19-B6F2-20ACE815C390 */ (REFIID){0x69,0xE2,0x63,0x9F,0x40,0xDA,0x4E,0x19,0xB6,0xF2,0x20,0xAC,0xE8,0x15,0xC3,0x90} +#define IID_IDeckLinkVideoFrame3DExtensions /* DA0F7E4A-EDC7-48A8-9CDD-2DB51C729CD7 */ (REFIID){0xDA,0x0F,0x7E,0x4A,0xED,0xC7,0x48,0xA8,0x9C,0xDD,0x2D,0xB5,0x1C,0x72,0x9C,0xD7} +#define IID_IDeckLinkVideoInputFrame /* 05CFE374-537C-4094-9A57-680525118F44 */ (REFIID){0x05,0xCF,0xE3,0x74,0x53,0x7C,0x40,0x94,0x9A,0x57,0x68,0x05,0x25,0x11,0x8F,0x44} +#define IID_IDeckLinkVideoFrameAncillary /* 732E723C-D1A4-4E29-9E8E-4A88797A0004 */ (REFIID){0x73,0x2E,0x72,0x3C,0xD1,0xA4,0x4E,0x29,0x9E,0x8E,0x4A,0x88,0x79,0x7A,0x00,0x04} +#define IID_IDeckLinkAudioInputPacket /* E43D5870-2894-11DE-8C30-0800200C9A66 */ (REFIID){0xE4,0x3D,0x58,0x70,0x28,0x94,0x11,0xDE,0x8C,0x30,0x08,0x00,0x20,0x0C,0x9A,0x66} +#define IID_IDeckLinkScreenPreviewCallback /* B1D3F49A-85FE-4C5D-95C8-0B5D5DCCD438 */ (REFIID){0xB1,0xD3,0xF4,0x9A,0x85,0xFE,0x4C,0x5D,0x95,0xC8,0x0B,0x5D,0x5D,0xCC,0xD4,0x38} +#define IID_IDeckLinkCocoaScreenPreviewCallback /* D174152F-8F96-4C07-83A5-DD5F5AF0A2AA */ (REFIID){0xD1,0x74,0x15,0x2F,0x8F,0x96,0x4C,0x07,0x83,0xA5,0xDD,0x5F,0x5A,0xF0,0xA2,0xAA} +#define IID_IDeckLinkGLScreenPreviewHelper /* 504E2209-CAC7-4C1A-9FB4-C5BB6274D22F */ (REFIID){0x50,0x4E,0x22,0x09,0xCA,0xC7,0x4C,0x1A,0x9F,0xB4,0xC5,0xBB,0x62,0x74,0xD2,0x2F} +#define IID_IDeckLinkAttributes /* ABC11843-D966-44CB-96E2-A1CB5D3135C4 */ (REFIID){0xAB,0xC1,0x18,0x43,0xD9,0x66,0x44,0xCB,0x96,0xE2,0xA1,0xCB,0x5D,0x31,0x35,0xC4} +#define IID_IDeckLinkKeyer /* 89AFCAF5-65F8-421E-98F7-96FE5F5BFBA3 */ (REFIID){0x89,0xAF,0xCA,0xF5,0x65,0xF8,0x42,0x1E,0x98,0xF7,0x96,0xFE,0x5F,0x5B,0xFB,0xA3} +#define IID_IDeckLinkVideoConversion /* 3BBCB8A2-DA2C-42D9-B5D8-88083644E99A */ (REFIID){0x3B,0xBC,0xB8,0xA2,0xDA,0x2C,0x42,0xD9,0xB5,0xD8,0x88,0x08,0x36,0x44,0xE9,0x9A} + +/* Enum BMDVideoOutputFlags - Flags to control the output of ancillary data along with video. */ + +typedef uint32_t BMDVideoOutputFlags; +enum _BMDVideoOutputFlags { + bmdVideoOutputFlagDefault = 0, + bmdVideoOutputVANC = 1 << 0, + bmdVideoOutputVITC = 1 << 1, + bmdVideoOutputRP188 = 1 << 2, + bmdVideoOutputDualStream3D = 1 << 4 +}; + +/* Enum BMDFrameFlags - Frame flags */ + +typedef uint32_t BMDFrameFlags; +enum _BMDFrameFlags { + bmdFrameFlagDefault = 0, + bmdFrameFlagFlipVertical = 1 << 0, + + /* Flags that are applicable only to instances of IDeckLinkVideoInputFrame */ + + bmdFrameHasNoInputSource = 1 << 31 +}; + +/* Enum BMDVideoInputFlags - Flags applicable to video input */ + +typedef uint32_t BMDVideoInputFlags; +enum _BMDVideoInputFlags { + bmdVideoInputFlagDefault = 0, + bmdVideoInputEnableFormatDetection = 1 << 0, + bmdVideoInputDualStream3D = 1 << 1 +}; + +/* Enum BMDVideoInputFormatChangedEvents - Bitmask passed to the VideoInputFormatChanged notification to identify the properties of the input signal that have changed */ + +typedef uint32_t BMDVideoInputFormatChangedEvents; +enum _BMDVideoInputFormatChangedEvents { + bmdVideoInputDisplayModeChanged = 1 << 0, + bmdVideoInputFieldDominanceChanged = 1 << 1, + bmdVideoInputColorspaceChanged = 1 << 2 +}; + +/* Enum BMDDetectedVideoInputFormatFlags - Flags passed to the VideoInputFormatChanged notification to describe the detected video input signal */ + +typedef uint32_t BMDDetectedVideoInputFormatFlags; +enum _BMDDetectedVideoInputFormatFlags { + bmdDetectedVideoInputYCbCr422 = 1 << 0, + bmdDetectedVideoInputRGB444 = 1 << 1 +}; + +/* Enum BMDOutputFrameCompletionResult - Frame Completion Callback */ + +typedef uint32_t BMDOutputFrameCompletionResult; +enum _BMDOutputFrameCompletionResult { + bmdOutputFrameCompleted, + bmdOutputFrameDisplayedLate, + bmdOutputFrameDropped, + bmdOutputFrameFlushed +}; + +/* Enum BMDReferenceStatus - GenLock input status */ + +typedef uint32_t BMDReferenceStatus; +enum _BMDReferenceStatus { + bmdReferenceNotSupportedByHardware = 1 << 0, + bmdReferenceLocked = 1 << 1 +}; + +/* Enum BMDAudioSampleRate - Audio sample rates supported for output/input */ + +typedef uint32_t BMDAudioSampleRate; +enum _BMDAudioSampleRate { + bmdAudioSampleRate48kHz = 48000 +}; + +/* Enum BMDAudioSampleType - Audio sample sizes supported for output/input */ + +typedef uint32_t BMDAudioSampleType; +enum _BMDAudioSampleType { + bmdAudioSampleType16bitInteger = 16, + bmdAudioSampleType32bitInteger = 32 +}; + +/* Enum BMDAudioOutputStreamType - Audio output stream type */ + +typedef uint32_t BMDAudioOutputStreamType; +enum _BMDAudioOutputStreamType { + bmdAudioOutputStreamContinuous, + bmdAudioOutputStreamContinuousDontResample, + bmdAudioOutputStreamTimestamped +}; + +/* Enum BMDDisplayModeSupport - Output mode supported flags */ + +typedef uint32_t BMDDisplayModeSupport; +enum _BMDDisplayModeSupport { + bmdDisplayModeNotSupported = 0, + bmdDisplayModeSupported, + bmdDisplayModeSupportedWithConversion +}; + +/* Enum BMDTimecodeFormat - Timecode formats for frame metadata */ + +typedef uint32_t BMDTimecodeFormat; +enum _BMDTimecodeFormat { + bmdTimecodeRP188VITC1 = 'rpv1', // RP188 timecode where DBB1 equals VITC1 (line 9) + bmdTimecodeRP188VITC2 = 'rp12', // RP188 timecode where DBB1 equals VITC2 (line 571) + bmdTimecodeRP188LTC = 'rplt', // RP188 timecode where DBB1 equals LTC (line 10) + bmdTimecodeRP188Any = 'rp18', // For capture: return the first valid timecode in {VITC1, LTC ,VITC2} - For playback: set the timecode as VITC1 + bmdTimecodeVITC = 'vitc', + bmdTimecodeVITCField2 = 'vit2', + bmdTimecodeSerial = 'seri' +}; + +/* Enum BMDAnalogVideoFlags - Analog video display flags */ + +typedef uint32_t BMDAnalogVideoFlags; +enum _BMDAnalogVideoFlags { + bmdAnalogVideoFlagCompositeSetup75 = 1 << 0, + bmdAnalogVideoFlagComponentBetacamLevels = 1 << 1 +}; + +/* Enum BMDAudioConnection - Audio connection types */ + +typedef uint32_t BMDAudioConnection; +enum _BMDAudioConnection { + bmdAudioConnectionEmbedded = 'embd', + bmdAudioConnectionAESEBU = 'aes ', + bmdAudioConnectionAnalog = 'anlg' +}; + +/* Enum BMDAudioOutputAnalogAESSwitch - Audio output Analog/AESEBU switch */ + +typedef uint32_t BMDAudioOutputAnalogAESSwitch; +enum _BMDAudioOutputAnalogAESSwitch { + bmdAudioOutputSwitchAESEBU = 'aes ', + bmdAudioOutputSwitchAnalog = 'anlg' +}; + +/* Enum BMDVideoOutputConversionMode - Video/audio conversion mode */ + +typedef uint32_t BMDVideoOutputConversionMode; +enum _BMDVideoOutputConversionMode { + bmdNoVideoOutputConversion = 'none', + bmdVideoOutputLetterboxDownconversion = 'ltbx', + bmdVideoOutputAnamorphicDownconversion = 'amph', + bmdVideoOutputHD720toHD1080Conversion = '720c', + bmdVideoOutputHardwareLetterboxDownconversion = 'HWlb', + bmdVideoOutputHardwareAnamorphicDownconversion = 'HWam', + bmdVideoOutputHardwareCenterCutDownconversion = 'HWcc', + bmdVideoOutputHardware720p1080pCrossconversion = 'xcap', + bmdVideoOutputHardwareAnamorphic720pUpconversion = 'ua7p', + bmdVideoOutputHardwareAnamorphic1080iUpconversion = 'ua1i', + bmdVideoOutputHardwareAnamorphic149To720pUpconversion = 'u47p', + bmdVideoOutputHardwareAnamorphic149To1080iUpconversion = 'u41i', + bmdVideoOutputHardwarePillarbox720pUpconversion = 'up7p', + bmdVideoOutputHardwarePillarbox1080iUpconversion = 'up1i' +}; + +/* Enum BMDVideoInputConversionMode - Video input conversion mode */ + +typedef uint32_t BMDVideoInputConversionMode; +enum _BMDVideoInputConversionMode { + bmdNoVideoInputConversion = 'none', + bmdVideoInputLetterboxDownconversionFromHD1080 = '10lb', + bmdVideoInputAnamorphicDownconversionFromHD1080 = '10am', + bmdVideoInputLetterboxDownconversionFromHD720 = '72lb', + bmdVideoInputAnamorphicDownconversionFromHD720 = '72am', + bmdVideoInputLetterboxUpconversion = 'lbup', + bmdVideoInputAnamorphicUpconversion = 'amup' +}; + +/* Enum BMDVideo3DPackingFormat - Video 3D packing format */ + +typedef uint32_t BMDVideo3DPackingFormat; +enum _BMDVideo3DPackingFormat { + bmdVideo3DPackingSidebySideHalf = 'sbsh', + bmdVideo3DPackingLinebyLine = 'lbyl', + bmdVideo3DPackingTopAndBottom = 'tabo', + bmdVideo3DPackingFramePacking = 'frpk', + bmdVideo3DPackingLeftOnly = 'left', + bmdVideo3DPackingRightOnly = 'righ' +}; + +/* Enum BMDIdleVideoOutputOperation - Video output operation when not playing video */ + +typedef uint32_t BMDIdleVideoOutputOperation; +enum _BMDIdleVideoOutputOperation { + bmdIdleVideoOutputBlack = 'blac', + bmdIdleVideoOutputLastFrame = 'lafa', + bmdIdleVideoOutputDesktop = 'desk' +}; + +/* Enum BMDDeckLinkAttributeID - DeckLink Attribute ID */ + +typedef uint32_t BMDDeckLinkAttributeID; +enum _BMDDeckLinkAttributeID { + + /* Flags */ + + BMDDeckLinkSupportsInternalKeying = 'keyi', + BMDDeckLinkSupportsExternalKeying = 'keye', + BMDDeckLinkSupportsHDKeying = 'keyh', + BMDDeckLinkSupportsInputFormatDetection = 'infd', + BMDDeckLinkHasReferenceInput = 'hrin', + BMDDeckLinkHasSerialPort = 'hspt', + BMDDeckLinkHasAnalogVideoOutputGain = 'avog', + BMDDeckLinkCanOnlyAdjustOverallVideoOutputGain = 'ovog', + BMDDeckLinkHasVideoInputAntiAliasingFilter = 'aafl', + BMDDeckLinkHasBypass = 'byps', + BMDDeckLinkSupportsDesktopDisplay = 'extd', + + /* Integers */ + + BMDDeckLinkMaximumAudioChannels = 'mach', + BMDDeckLinkNumberOfSubDevices = 'nsbd', + BMDDeckLinkSubDeviceIndex = 'subi', + BMDDeckLinkVideoOutputConnections = 'vocn', + BMDDeckLinkVideoInputConnections = 'vicn', + BMDDeckLinkDeviceBusyState = 'dbst', + + /* Floats */ + + BMDDeckLinkVideoInputGainMinimum = 'vigm', + BMDDeckLinkVideoInputGainMaximum = 'vigx', + BMDDeckLinkVideoOutputGainMinimum = 'vogm', + BMDDeckLinkVideoOutputGainMaximum = 'vogx', + + /* Strings */ + + BMDDeckLinkSerialPortDeviceName = 'slpn' +}; + +/* Enum BMDDeckLinkAPIInformationID - DeckLinkAPI information ID */ + +typedef uint32_t BMDDeckLinkAPIInformationID; +enum _BMDDeckLinkAPIInformationID { + BMDDeckLinkAPIVersion = 'vers' +}; + +/* Enum BMDDeviceBusyState - Current device busy state */ + +typedef uint32_t BMDDeviceBusyState; +enum _BMDDeviceBusyState { + bmdDeviceCaptureBusy = 1 << 0, + bmdDevicePlaybackBusy = 1 << 1, + bmdDeviceSerialPortBusy = 1 << 2 +}; + +/* Enum BMD3DPreviewFormat - Linked Frame preview format */ + +typedef uint32_t BMD3DPreviewFormat; +enum _BMD3DPreviewFormat { + bmd3DPreviewFormatDefault = 'defa', + bmd3DPreviewFormatLeftOnly = 'left', + bmd3DPreviewFormatRightOnly = 'righ', + bmd3DPreviewFormatSideBySide = 'side', + bmd3DPreviewFormatTopBottom = 'topb' +}; + +#if defined(__cplusplus) + +// Forward Declarations + +class IDeckLinkVideoOutputCallback; +class IDeckLinkInputCallback; +class IDeckLinkMemoryAllocator; +class IDeckLinkAudioOutputCallback; +class IDeckLinkIterator; +class IDeckLinkAPIInformation; +class IDeckLinkOutput; +class IDeckLinkInput; +class IDeckLinkVideoFrame; +class IDeckLinkMutableVideoFrame; +class IDeckLinkVideoFrame3DExtensions; +class IDeckLinkVideoInputFrame; +class IDeckLinkVideoFrameAncillary; +class IDeckLinkAudioInputPacket; +class IDeckLinkScreenPreviewCallback; +class IDeckLinkCocoaScreenPreviewCallback; +class IDeckLinkGLScreenPreviewHelper; +class IDeckLinkAttributes; +class IDeckLinkKeyer; +class IDeckLinkVideoConversion; + +/* Interface IDeckLinkVideoOutputCallback - Frame completion callback. */ + +class IDeckLinkVideoOutputCallback : public IUnknown +{ +public: + virtual HRESULT ScheduledFrameCompleted (/* in */ IDeckLinkVideoFrame *completedFrame, /* in */ BMDOutputFrameCompletionResult result) = 0; + virtual HRESULT ScheduledPlaybackHasStopped (void) = 0; + +protected: + virtual ~IDeckLinkVideoOutputCallback () {}; // call Release method to drop reference count +}; + +/* Interface IDeckLinkInputCallback - Frame arrival callback. */ + +class IDeckLinkInputCallback : public IUnknown +{ +public: + virtual HRESULT VideoInputFormatChanged (/* in */ BMDVideoInputFormatChangedEvents notificationEvents, /* in */ IDeckLinkDisplayMode *newDisplayMode, /* in */ BMDDetectedVideoInputFormatFlags detectedSignalFlags) = 0; + virtual HRESULT VideoInputFrameArrived (/* in */ IDeckLinkVideoInputFrame* videoFrame, /* in */ IDeckLinkAudioInputPacket* audioPacket) = 0; + +protected: + virtual ~IDeckLinkInputCallback () {}; // call Release method to drop reference count +}; + +/* Interface IDeckLinkMemoryAllocator - Memory allocator for video frames. */ + +class IDeckLinkMemoryAllocator : public IUnknown +{ +public: + virtual HRESULT AllocateBuffer (/* in */ uint32_t bufferSize, /* out */ void **allocatedBuffer) = 0; + virtual HRESULT ReleaseBuffer (/* in */ void *buffer) = 0; + + virtual HRESULT Commit (void) = 0; + virtual HRESULT Decommit (void) = 0; +}; + +/* Interface IDeckLinkAudioOutputCallback - Optional callback to allow audio samples to be pulled as required. */ + +class IDeckLinkAudioOutputCallback : public IUnknown +{ +public: + virtual HRESULT RenderAudioSamples (/* in */ bool preroll) = 0; +}; + +/* Interface IDeckLinkIterator - enumerates installed DeckLink hardware */ + +class IDeckLinkIterator : public IUnknown +{ +public: + virtual HRESULT Next (/* out */ IDeckLink **deckLinkInstance) = 0; +}; + +/* Interface IDeckLinkAPIInformation - DeckLinkAPI attribute interface */ + +class IDeckLinkAPIInformation : public IUnknown +{ +public: + virtual HRESULT GetFlag (/* in */ BMDDeckLinkAPIInformationID cfgID, /* out */ bool *value) = 0; + virtual HRESULT GetInt (/* in */ BMDDeckLinkAPIInformationID cfgID, /* out */ int64_t *value) = 0; + virtual HRESULT GetFloat (/* in */ BMDDeckLinkAPIInformationID cfgID, /* out */ double *value) = 0; + virtual HRESULT GetString (/* in */ BMDDeckLinkAPIInformationID cfgID, /* out */ CFStringRef *value) = 0; + +protected: + virtual ~IDeckLinkAPIInformation () {}; // call Release method to drop reference count +}; + +/* Interface IDeckLinkOutput - Created by QueryInterface from IDeckLink. */ + +class IDeckLinkOutput : public IUnknown +{ +public: + virtual HRESULT DoesSupportVideoMode (/* in */ BMDDisplayMode displayMode, /* in */ BMDPixelFormat pixelFormat, /* in */ BMDVideoOutputFlags flags, /* out */ BMDDisplayModeSupport *result, /* out */ IDeckLinkDisplayMode **resultDisplayMode) = 0; + virtual HRESULT GetDisplayModeIterator (/* out */ IDeckLinkDisplayModeIterator **iterator) = 0; + + virtual HRESULT SetScreenPreviewCallback (/* in */ IDeckLinkScreenPreviewCallback *previewCallback) = 0; + + /* Video Output */ + + virtual HRESULT EnableVideoOutput (/* in */ BMDDisplayMode displayMode, /* in */ BMDVideoOutputFlags flags) = 0; + virtual HRESULT DisableVideoOutput (void) = 0; + + virtual HRESULT SetVideoOutputFrameMemoryAllocator (/* in */ IDeckLinkMemoryAllocator *theAllocator) = 0; + virtual HRESULT CreateVideoFrame (/* in */ int32_t width, /* in */ int32_t height, /* in */ int32_t rowBytes, /* in */ BMDPixelFormat pixelFormat, /* in */ BMDFrameFlags flags, /* out */ IDeckLinkMutableVideoFrame **outFrame) = 0; + virtual HRESULT CreateAncillaryData (/* in */ BMDPixelFormat pixelFormat, /* out */ IDeckLinkVideoFrameAncillary **outBuffer) = 0; + + virtual HRESULT DisplayVideoFrameSync (/* in */ IDeckLinkVideoFrame *theFrame) = 0; + virtual HRESULT ScheduleVideoFrame (/* in */ IDeckLinkVideoFrame *theFrame, /* in */ BMDTimeValue displayTime, /* in */ BMDTimeValue displayDuration, /* in */ BMDTimeScale timeScale) = 0; + virtual HRESULT SetScheduledFrameCompletionCallback (/* in */ IDeckLinkVideoOutputCallback *theCallback) = 0; + virtual HRESULT GetBufferedVideoFrameCount (/* out */ uint32_t *bufferedFrameCount) = 0; + + /* Audio Output */ + + virtual HRESULT EnableAudioOutput (/* in */ BMDAudioSampleRate sampleRate, /* in */ BMDAudioSampleType sampleType, /* in */ uint32_t channelCount, /* in */ BMDAudioOutputStreamType streamType) = 0; + virtual HRESULT DisableAudioOutput (void) = 0; + + virtual HRESULT WriteAudioSamplesSync (/* in */ void *buffer, /* in */ uint32_t sampleFrameCount, /* out */ uint32_t *sampleFramesWritten) = 0; + + virtual HRESULT BeginAudioPreroll (void) = 0; + virtual HRESULT EndAudioPreroll (void) = 0; + virtual HRESULT ScheduleAudioSamples (/* in */ void *buffer, /* in */ uint32_t sampleFrameCount, /* in */ BMDTimeValue streamTime, /* in */ BMDTimeScale timeScale, /* out */ uint32_t *sampleFramesWritten) = 0; + + virtual HRESULT GetBufferedAudioSampleFrameCount (/* out */ uint32_t *bufferedSampleFrameCount) = 0; + virtual HRESULT FlushBufferedAudioSamples (void) = 0; + + virtual HRESULT SetAudioCallback (/* in */ IDeckLinkAudioOutputCallback *theCallback) = 0; + + /* Output Control */ + + virtual HRESULT StartScheduledPlayback (/* in */ BMDTimeValue playbackStartTime, /* in */ BMDTimeScale timeScale, /* in */ double playbackSpeed) = 0; + virtual HRESULT StopScheduledPlayback (/* in */ BMDTimeValue stopPlaybackAtTime, /* out */ BMDTimeValue *actualStopTime, /* in */ BMDTimeScale timeScale) = 0; + virtual HRESULT IsScheduledPlaybackRunning (/* out */ bool *active) = 0; + virtual HRESULT GetScheduledStreamTime (/* in */ BMDTimeScale desiredTimeScale, /* out */ BMDTimeValue *streamTime, /* out */ double *playbackSpeed) = 0; + virtual HRESULT GetReferenceStatus (/* out */ BMDReferenceStatus *referenceStatus) = 0; + + /* Hardware Timing */ + + virtual HRESULT GetHardwareReferenceClock (/* in */ BMDTimeScale desiredTimeScale, /* out */ BMDTimeValue *hardwareTime, /* out */ BMDTimeValue *timeInFrame, /* out */ BMDTimeValue *ticksPerFrame) = 0; + +protected: + virtual ~IDeckLinkOutput () {}; // call Release method to drop reference count +}; + +/* Interface IDeckLinkInput - Created by QueryInterface from IDeckLink. */ + +class IDeckLinkInput : public IUnknown +{ +public: + virtual HRESULT DoesSupportVideoMode (/* in */ BMDDisplayMode displayMode, /* in */ BMDPixelFormat pixelFormat, /* in */ BMDVideoInputFlags flags, /* out */ BMDDisplayModeSupport *result, /* out */ IDeckLinkDisplayMode **resultDisplayMode) = 0; + virtual HRESULT GetDisplayModeIterator (/* out */ IDeckLinkDisplayModeIterator **iterator) = 0; + + virtual HRESULT SetScreenPreviewCallback (/* in */ IDeckLinkScreenPreviewCallback *previewCallback) = 0; + + /* Video Input */ + + virtual HRESULT EnableVideoInput (/* in */ BMDDisplayMode displayMode, /* in */ BMDPixelFormat pixelFormat, /* in */ BMDVideoInputFlags flags) = 0; + virtual HRESULT DisableVideoInput (void) = 0; + virtual HRESULT GetAvailableVideoFrameCount (/* out */ uint32_t *availableFrameCount) = 0; + + /* Audio Input */ + + virtual HRESULT EnableAudioInput (/* in */ BMDAudioSampleRate sampleRate, /* in */ BMDAudioSampleType sampleType, /* in */ uint32_t channelCount) = 0; + virtual HRESULT DisableAudioInput (void) = 0; + virtual HRESULT GetAvailableAudioSampleFrameCount (/* out */ uint32_t *availableSampleFrameCount) = 0; + + /* Input Control */ + + virtual HRESULT StartStreams (void) = 0; + virtual HRESULT StopStreams (void) = 0; + virtual HRESULT PauseStreams (void) = 0; + virtual HRESULT FlushStreams (void) = 0; + virtual HRESULT SetCallback (/* in */ IDeckLinkInputCallback *theCallback) = 0; + + /* Hardware Timing */ + + virtual HRESULT GetHardwareReferenceClock (/* in */ BMDTimeScale desiredTimeScale, /* out */ BMDTimeValue *hardwareTime, /* out */ BMDTimeValue *timeInFrame, /* out */ BMDTimeValue *ticksPerFrame) = 0; + +protected: + virtual ~IDeckLinkInput () {}; // call Release method to drop reference count +}; + +/* Interface IDeckLinkVideoFrame - Interface to encapsulate a video frame; can be caller-implemented. */ + +class IDeckLinkVideoFrame : public IUnknown +{ +public: + virtual long GetWidth (void) = 0; + virtual long GetHeight (void) = 0; + virtual long GetRowBytes (void) = 0; + virtual BMDPixelFormat GetPixelFormat (void) = 0; + virtual BMDFrameFlags GetFlags (void) = 0; + virtual HRESULT GetBytes (/* out */ void **buffer) = 0; + + virtual HRESULT GetTimecode (/* in */ BMDTimecodeFormat format, /* out */ IDeckLinkTimecode **timecode) = 0; + virtual HRESULT GetAncillaryData (/* out */ IDeckLinkVideoFrameAncillary **ancillary) = 0; + +protected: + virtual ~IDeckLinkVideoFrame () {}; // call Release method to drop reference count +}; + +/* Interface IDeckLinkMutableVideoFrame - Created by IDeckLinkOutput::CreateVideoFrame. */ + +class IDeckLinkMutableVideoFrame : public IDeckLinkVideoFrame +{ +public: + virtual HRESULT SetFlags (/* in */ BMDFrameFlags newFlags) = 0; + + virtual HRESULT SetTimecode (/* in */ BMDTimecodeFormat format, /* in */ IDeckLinkTimecode *timecode) = 0; + virtual HRESULT SetTimecodeFromComponents (/* in */ BMDTimecodeFormat format, /* in */ uint8_t hours, /* in */ uint8_t minutes, /* in */ uint8_t seconds, /* in */ uint8_t frames, /* in */ BMDTimecodeFlags flags) = 0; + virtual HRESULT SetAncillaryData (/* in */ IDeckLinkVideoFrameAncillary *ancillary) = 0; + virtual HRESULT SetTimecodeUserBits (/* in */ BMDTimecodeFormat format, /* in */ BMDTimecodeUserBits userBits) = 0; + +protected: + virtual ~IDeckLinkMutableVideoFrame () {}; // call Release method to drop reference count +}; + +/* Interface IDeckLinkVideoFrame3DExtensions - Optional interface implemented on IDeckLinkVideoFrame to support 3D frames */ + +class IDeckLinkVideoFrame3DExtensions : public IUnknown +{ +public: + virtual BMDVideo3DPackingFormat Get3DPackingFormat (void) = 0; + virtual HRESULT GetFrameForRightEye (/* out */ IDeckLinkVideoFrame* *rightEyeFrame) = 0; + +protected: + virtual ~IDeckLinkVideoFrame3DExtensions () {}; // call Release method to drop reference count +}; + +/* Interface IDeckLinkVideoInputFrame - Provided by the IDeckLinkVideoInput frame arrival callback. */ + +class IDeckLinkVideoInputFrame : public IDeckLinkVideoFrame +{ +public: + virtual HRESULT GetStreamTime (/* out */ BMDTimeValue *frameTime, /* out */ BMDTimeValue *frameDuration, /* in */ BMDTimeScale timeScale) = 0; + virtual HRESULT GetHardwareReferenceTimestamp (/* in */ BMDTimeScale timeScale, /* out */ BMDTimeValue *frameTime, /* out */ BMDTimeValue *frameDuration) = 0; + +protected: + virtual ~IDeckLinkVideoInputFrame () {}; // call Release method to drop reference count +}; + +/* Interface IDeckLinkVideoFrameAncillary - Obtained through QueryInterface() on an IDeckLinkVideoFrame object. */ + +class IDeckLinkVideoFrameAncillary : public IUnknown +{ +public: + + virtual HRESULT GetBufferForVerticalBlankingLine (/* in */ uint32_t lineNumber, /* out */ void **buffer) = 0; + virtual BMDPixelFormat GetPixelFormat (void) = 0; + virtual BMDDisplayMode GetDisplayMode (void) = 0; + +protected: + virtual ~IDeckLinkVideoFrameAncillary () {}; // call Release method to drop reference count +}; + +/* Interface IDeckLinkAudioInputPacket - Provided by the IDeckLinkInput callback. */ + +class IDeckLinkAudioInputPacket : public IUnknown +{ +public: + virtual long GetSampleFrameCount (void) = 0; + virtual HRESULT GetBytes (/* out */ void **buffer) = 0; + virtual HRESULT GetPacketTime (/* out */ BMDTimeValue *packetTime, /* in */ BMDTimeScale timeScale) = 0; + +protected: + virtual ~IDeckLinkAudioInputPacket () {}; // call Release method to drop reference count +}; + +/* Interface IDeckLinkScreenPreviewCallback - Screen preview callback */ + +class IDeckLinkScreenPreviewCallback : public IUnknown +{ +public: + virtual HRESULT DrawFrame (/* in */ IDeckLinkVideoFrame *theFrame) = 0; + +protected: + virtual ~IDeckLinkScreenPreviewCallback () {}; // call Release method to drop reference count +}; + +/* Interface IDeckLinkCocoaScreenPreviewCallback - Screen preview callback for Cocoa-based applications */ + +class IDeckLinkCocoaScreenPreviewCallback : public IDeckLinkScreenPreviewCallback +{ +public: + +protected: + virtual ~IDeckLinkCocoaScreenPreviewCallback () {}; // call Release method to drop reference count +}; + +/* Interface IDeckLinkGLScreenPreviewHelper - Created with CoCreateInstance(). */ + +class IDeckLinkGLScreenPreviewHelper : public IUnknown +{ +public: + + /* Methods must be called with OpenGL context set */ + + virtual HRESULT InitializeGL (void) = 0; + virtual HRESULT PaintGL (void) = 0; + virtual HRESULT SetFrame (/* in */ IDeckLinkVideoFrame *theFrame) = 0; + virtual HRESULT Set3DPreviewFormat (/* in */ BMD3DPreviewFormat previewFormat) = 0; + +protected: + virtual ~IDeckLinkGLScreenPreviewHelper () {}; // call Release method to drop reference count +}; + +/* Interface IDeckLinkAttributes - DeckLink Attribute interface */ + +class IDeckLinkAttributes : public IUnknown +{ +public: + virtual HRESULT GetFlag (/* in */ BMDDeckLinkAttributeID cfgID, /* out */ bool *value) = 0; + virtual HRESULT GetInt (/* in */ BMDDeckLinkAttributeID cfgID, /* out */ int64_t *value) = 0; + virtual HRESULT GetFloat (/* in */ BMDDeckLinkAttributeID cfgID, /* out */ double *value) = 0; + virtual HRESULT GetString (/* in */ BMDDeckLinkAttributeID cfgID, /* out */ CFStringRef *value) = 0; + +protected: + virtual ~IDeckLinkAttributes () {}; // call Release method to drop reference count +}; + +/* Interface IDeckLinkKeyer - DeckLink Keyer interface */ + +class IDeckLinkKeyer : public IUnknown +{ +public: + virtual HRESULT Enable (/* in */ bool isExternal) = 0; + virtual HRESULT SetLevel (/* in */ uint8_t level) = 0; + virtual HRESULT RampUp (/* in */ uint32_t numberOfFrames) = 0; + virtual HRESULT RampDown (/* in */ uint32_t numberOfFrames) = 0; + virtual HRESULT Disable (void) = 0; + +protected: + virtual ~IDeckLinkKeyer () {}; // call Release method to drop reference count +}; + +/* Interface IDeckLinkVideoConversion - Created with CoCreateInstance(). */ + +class IDeckLinkVideoConversion : public IUnknown +{ +public: + virtual HRESULT ConvertFrame (/* in */ IDeckLinkVideoFrame* srcFrame, /* in */ IDeckLinkVideoFrame* dstFrame) = 0; + +protected: + virtual ~IDeckLinkVideoConversion () {}; // call Release method to drop reference count +}; + +/* Functions */ + +extern "C" { + + IDeckLinkIterator* CreateDeckLinkIteratorInstance (void); + IDeckLinkAPIInformation* CreateDeckLinkAPIInformationInstance (void); + IDeckLinkGLScreenPreviewHelper* CreateOpenGLScreenPreviewHelper (void); + IDeckLinkCocoaScreenPreviewCallback* CreateCocoaScreenPreview (void* /* (NSView*) */ parentView); + IDeckLinkVideoConversion* CreateVideoConversionInstance (void); + +}; + + +#endif // defined(__cplusplus) +#endif /* defined(BMD_DECKLINKAPI_H) */ diff --git a/sys/decklink/osx/DeckLinkAPIConfiguration.h b/sys/decklink/osx/DeckLinkAPIConfiguration.h new file mode 100644 index 000000000..f026e7334 --- /dev/null +++ b/sys/decklink/osx/DeckLinkAPIConfiguration.h @@ -0,0 +1,167 @@ +/* -LICENSE-START- +** Copyright (c) 2011 Blackmagic Design +** +** Permission is hereby granted, free of charge, to any person or organization +** obtaining a copy of the software and accompanying documentation covered by +** this license (the "Software") to use, reproduce, display, distribute, +** execute, and transmit the Software, and to prepare derivative works of the +** Software, and to permit third-parties to whom the Software is furnished to +** do so, all subject to the following: +** +** The copyright notices in the Software and this entire statement, including +** the above license grant, this restriction and the following disclaimer, +** must be included in all copies of the Software, in whole or in part, and +** all derivative works of the Software, unless such copies or derivative +** works are solely in the form of machine-executable object code generated by +** a source language processor. +** +** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +** DEALINGS IN THE SOFTWARE. +** -LICENSE-END- +*/ + +#ifndef BMD_DECKLINKAPICONFIGURATION_H +#define BMD_DECKLINKAPICONFIGURATION_H + +// Type Declarations + + +// Interface ID Declarations + +#define IID_IDeckLinkConfiguration /* C679A35B-610C-4D09-B748-1D0478100FC0 */ (REFIID){0xC6,0x79,0xA3,0x5B,0x61,0x0C,0x4D,0x09,0xB7,0x48,0x1D,0x04,0x78,0x10,0x0F,0xC0} + +/* Enum BMDDeckLinkConfigurationID - DeckLink Configuration ID */ + +typedef uint32_t BMDDeckLinkConfigurationID; +enum _BMDDeckLinkConfigurationID { + + /* Serial port Flags */ + + bmdDeckLinkConfigSwapSerialRxTx = 'ssrt', + + /* Video Input/Output Flags */ + + bmdDeckLinkConfigUse1080pNotPsF = 'fpro', + + /* Video Input/Output Integers */ + + bmdDeckLinkConfigHDMI3DPackingFormat = '3dpf', + bmdDeckLinkConfigBypass = 'byps', + + /* Audio Input/Output Flags */ + + bmdDeckLinkConfigAnalogAudioConsumerLevels = 'aacl', + + /* Video output flags */ + + bmdDeckLinkConfigFieldFlickerRemoval = 'fdfr', + bmdDeckLinkConfigHD1080p24ToHD1080i5994Conversion = 'to59', + bmdDeckLinkConfig444SDIVideoOutput = '444o', + bmdDeckLinkConfig3GBpsVideoOutput = '3gbs', + bmdDeckLinkConfigBlackVideoOutputDuringCapture = 'bvoc', + bmdDeckLinkConfigLowLatencyVideoOutput = 'llvo', + + /* Video Output Integers */ + + bmdDeckLinkConfigVideoOutputConnection = 'vocn', + bmdDeckLinkConfigVideoOutputConversionMode = 'vocm', + bmdDeckLinkConfigAnalogVideoOutputFlags = 'avof', + bmdDeckLinkConfigReferenceInputTimingOffset = 'glot', + bmdDeckLinkConfigVideoOutputIdleOperation = 'voio', + + /* Video Output Floats */ + + bmdDeckLinkConfigVideoOutputComponentLumaGain = 'oclg', + bmdDeckLinkConfigVideoOutputComponentChromaBlueGain = 'occb', + bmdDeckLinkConfigVideoOutputComponentChromaRedGain = 'occr', + bmdDeckLinkConfigVideoOutputCompositeLumaGain = 'oilg', + bmdDeckLinkConfigVideoOutputCompositeChromaGain = 'oicg', + bmdDeckLinkConfigVideoOutputSVideoLumaGain = 'oslg', + bmdDeckLinkConfigVideoOutputSVideoChromaGain = 'oscg', + + /* Video Input Flags */ + + bmdDeckLinkConfigVideoInputScanning = 'visc', // Applicable to H264 Pro Recorder only + + /* Video Input Integers */ + + bmdDeckLinkConfigVideoInputConnection = 'vicn', + bmdDeckLinkConfigAnalogVideoInputFlags = 'avif', + bmdDeckLinkConfigVideoInputConversionMode = 'vicm', + bmdDeckLinkConfig32PulldownSequenceInitialTimecodeFrame = 'pdif', + bmdDeckLinkConfigVANCSourceLine1Mapping = 'vsl1', + bmdDeckLinkConfigVANCSourceLine2Mapping = 'vsl2', + bmdDeckLinkConfigVANCSourceLine3Mapping = 'vsl3', + + /* Video Input Floats */ + + bmdDeckLinkConfigVideoInputComponentLumaGain = 'iclg', + bmdDeckLinkConfigVideoInputComponentChromaBlueGain = 'iccb', + bmdDeckLinkConfigVideoInputComponentChromaRedGain = 'iccr', + bmdDeckLinkConfigVideoInputCompositeLumaGain = 'iilg', + bmdDeckLinkConfigVideoInputCompositeChromaGain = 'iicg', + bmdDeckLinkConfigVideoInputSVideoLumaGain = 'islg', + bmdDeckLinkConfigVideoInputSVideoChromaGain = 'iscg', + + /* Audio Input Integers */ + + bmdDeckLinkConfigAudioInputConnection = 'aicn', + + /* Audio Input Floats */ + + bmdDeckLinkConfigAnalogAudioInputScaleChannel1 = 'ais1', + bmdDeckLinkConfigAnalogAudioInputScaleChannel2 = 'ais2', + bmdDeckLinkConfigAnalogAudioInputScaleChannel3 = 'ais3', + bmdDeckLinkConfigAnalogAudioInputScaleChannel4 = 'ais4', + bmdDeckLinkConfigDigitalAudioInputScale = 'dais', + + /* Audio Output Integers */ + + bmdDeckLinkConfigAudioOutputAESAnalogSwitch = 'aoaa', + + /* Audio Output Floats */ + + bmdDeckLinkConfigAnalogAudioOutputScaleChannel1 = 'aos1', + bmdDeckLinkConfigAnalogAudioOutputScaleChannel2 = 'aos2', + bmdDeckLinkConfigAnalogAudioOutputScaleChannel3 = 'aos3', + bmdDeckLinkConfigAnalogAudioOutputScaleChannel4 = 'aos4', + bmdDeckLinkConfigDigitalAudioOutputScale = 'daos' +}; + +// Forward Declarations + +class IDeckLinkConfiguration; + +/* Interface IDeckLinkConfiguration - DeckLink Configuration interface */ + +class IDeckLinkConfiguration : public IUnknown +{ +public: + virtual HRESULT SetFlag (/* in */ BMDDeckLinkConfigurationID cfgID, /* in */ bool value) = 0; + virtual HRESULT GetFlag (/* in */ BMDDeckLinkConfigurationID cfgID, /* out */ bool *value) = 0; + virtual HRESULT SetInt (/* in */ BMDDeckLinkConfigurationID cfgID, /* in */ int64_t value) = 0; + virtual HRESULT GetInt (/* in */ BMDDeckLinkConfigurationID cfgID, /* out */ int64_t *value) = 0; + virtual HRESULT SetFloat (/* in */ BMDDeckLinkConfigurationID cfgID, /* in */ double value) = 0; + virtual HRESULT GetFloat (/* in */ BMDDeckLinkConfigurationID cfgID, /* out */ double *value) = 0; + virtual HRESULT SetString (/* in */ BMDDeckLinkConfigurationID cfgID, /* in */ CFStringRef value) = 0; + virtual HRESULT GetString (/* in */ BMDDeckLinkConfigurationID cfgID, /* out */ CFStringRef *value) = 0; + virtual HRESULT WriteConfigurationToPreferences (void) = 0; + +protected: + virtual ~IDeckLinkConfiguration () {}; // call Release method to drop reference count +}; + +/* Functions */ + +extern "C" { + + +}; + + +#endif /* defined(BMD_DECKLINKAPICONFIGURATION_H) */ diff --git a/sys/decklink/osx/DeckLinkAPIDeckControl.h b/sys/decklink/osx/DeckLinkAPIDeckControl.h new file mode 100644 index 000000000..ea32657d8 --- /dev/null +++ b/sys/decklink/osx/DeckLinkAPIDeckControl.h @@ -0,0 +1,206 @@ +/* -LICENSE-START- +** Copyright (c) 2011 Blackmagic Design +** +** Permission is hereby granted, free of charge, to any person or organization +** obtaining a copy of the software and accompanying documentation covered by +** this license (the "Software") to use, reproduce, display, distribute, +** execute, and transmit the Software, and to prepare derivative works of the +** Software, and to permit third-parties to whom the Software is furnished to +** do so, all subject to the following: +** +** The copyright notices in the Software and this entire statement, including +** the above license grant, this restriction and the following disclaimer, +** must be included in all copies of the Software, in whole or in part, and +** all derivative works of the Software, unless such copies or derivative +** works are solely in the form of machine-executable object code generated by +** a source language processor. +** +** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +** DEALINGS IN THE SOFTWARE. +** -LICENSE-END- +*/ + +#ifndef BMD_DECKLINKAPIDECKCONTROL_H +#define BMD_DECKLINKAPIDECKCONTROL_H + +// Type Declarations + + +// Interface ID Declarations + +#define IID_IDeckLinkDeckControlStatusCallback /* 53436FFB-B434-4906-BADC-AE3060FFE8EF */ (REFIID){0x53,0x43,0x6F,0xFB,0xB4,0x34,0x49,0x06,0xBA,0xDC,0xAE,0x30,0x60,0xFF,0xE8,0xEF} +#define IID_IDeckLinkDeckControl /* 8E1C3ACE-19C7-4E00-8B92-D80431D958BE */ (REFIID){0x8E,0x1C,0x3A,0xCE,0x19,0xC7,0x4E,0x00,0x8B,0x92,0xD8,0x04,0x31,0xD9,0x58,0xBE} + +/* Enum BMDDeckControlMode - DeckControl mode */ + +typedef uint32_t BMDDeckControlMode; +enum _BMDDeckControlMode { + bmdDeckControlNotOpened = 'ntop', + bmdDeckControlVTRControlMode = 'vtrc', + bmdDeckControlExportMode = 'expm', + bmdDeckControlCaptureMode = 'capm' +}; + +/* Enum BMDDeckControlEvent - DeckControl event */ + +typedef uint32_t BMDDeckControlEvent; +enum _BMDDeckControlEvent { + bmdDeckControlAbortedEvent = 'abte', // This event is triggered when a capture or edit-to-tape operation is aborted. + + /* Export-To-Tape events */ + + bmdDeckControlPrepareForExportEvent = 'pfee', // This event is triggered a few frames before reaching the in-point. IDeckLinkInput::StartScheduledPlayback() should be called at this point. + bmdDeckControlExportCompleteEvent = 'exce', // This event is triggered a few frames after reaching the out-point. At this point, it is safe to stop playback. + + /* Capture events */ + + bmdDeckControlPrepareForCaptureEvent = 'pfce', // This event is triggered a few frames before reaching the in-point. The serial timecode attached to IDeckLinkVideoInputFrames is now valid. + bmdDeckControlCaptureCompleteEvent = 'ccev' // This event is triggered a few frames after reaching the out-point. +}; + +/* Enum BMDDeckControlVTRControlState - VTR Control state */ + +typedef uint32_t BMDDeckControlVTRControlState; +enum _BMDDeckControlVTRControlState { + bmdDeckControlNotInVTRControlMode = 'nvcm', + bmdDeckControlVTRControlPlaying = 'vtrp', + bmdDeckControlVTRControlRecording = 'vtrr', + bmdDeckControlVTRControlStill = 'vtra', + bmdDeckControlVTRControlShuttleForward = 'vtsf', + bmdDeckControlVTRControlShuttleReverse = 'vtsr', + bmdDeckControlVTRControlJogForward = 'vtjf', + bmdDeckControlVTRControlJogReverse = 'vtjr', + bmdDeckControlVTRControlStopped = 'vtro' +}; + +/* Enum BMDDeckControlStatusFlags - Deck Control status flags */ + +typedef uint32_t BMDDeckControlStatusFlags; +enum _BMDDeckControlStatusFlags { + bmdDeckControlStatusDeckConnected = 1 << 0, + bmdDeckControlStatusRemoteMode = 1 << 1, + bmdDeckControlStatusRecordInhibited = 1 << 2, + bmdDeckControlStatusCassetteOut = 1 << 3 +}; + +/* Enum BMDDeckControlExportModeOpsFlags - Export mode flags */ + +typedef uint32_t BMDDeckControlExportModeOpsFlags; +enum _BMDDeckControlExportModeOpsFlags { + bmdDeckControlExportModeInsertVideo = 1 << 0, + bmdDeckControlExportModeInsertAudio1 = 1 << 1, + bmdDeckControlExportModeInsertAudio2 = 1 << 2, + bmdDeckControlExportModeInsertAudio3 = 1 << 3, + bmdDeckControlExportModeInsertAudio4 = 1 << 4, + bmdDeckControlExportModeInsertAudio5 = 1 << 5, + bmdDeckControlExportModeInsertAudio6 = 1 << 6, + bmdDeckControlExportModeInsertAudio7 = 1 << 7, + bmdDeckControlExportModeInsertAudio8 = 1 << 8, + bmdDeckControlExportModeInsertAudio9 = 1 << 9, + bmdDeckControlExportModeInsertAudio10 = 1 << 10, + bmdDeckControlExportModeInsertAudio11 = 1 << 11, + bmdDeckControlExportModeInsertAudio12 = 1 << 12, + bmdDeckControlExportModeInsertTimeCode = 1 << 13, + bmdDeckControlExportModeInsertAssemble = 1 << 14, + bmdDeckControlExportModeInsertPreview = 1 << 15, + bmdDeckControlUseManualExport = 1 << 16 +}; + +/* Enum BMDDeckControlError - Deck Control error */ + +typedef uint32_t BMDDeckControlError; +enum _BMDDeckControlError { + bmdDeckControlNoError = 'noer', + bmdDeckControlModeError = 'moer', + bmdDeckControlMissedInPointError = 'mier', + bmdDeckControlDeckTimeoutError = 'dter', + bmdDeckControlCommandFailedError = 'cfer', + bmdDeckControlDeviceAlreadyOpenedError = 'dalo', + bmdDeckControlFailedToOpenDeviceError = 'fder', + bmdDeckControlInLocalModeError = 'lmer', + bmdDeckControlEndOfTapeError = 'eter', + bmdDeckControlUserAbortError = 'uaer', + bmdDeckControlNoTapeInDeckError = 'nter', + bmdDeckControlNoVideoFromCardError = 'nvfc', + bmdDeckControlNoCommunicationError = 'ncom', + bmdDeckControlBufferTooSmallError = 'btsm', + bmdDeckControlBadChecksumError = 'chks', + bmdDeckControlUnknownError = 'uner' +}; + +// Forward Declarations + +class IDeckLinkDeckControlStatusCallback; +class IDeckLinkDeckControl; + +/* Interface IDeckLinkDeckControlStatusCallback - Deck control state change callback. */ + +class IDeckLinkDeckControlStatusCallback : public IUnknown +{ +public: + virtual HRESULT TimecodeUpdate (/* in */ BMDTimecodeBCD currentTimecode) = 0; + virtual HRESULT VTRControlStateChanged (/* in */ BMDDeckControlVTRControlState newState, /* in */ BMDDeckControlError error) = 0; + virtual HRESULT DeckControlEventReceived (/* in */ BMDDeckControlEvent event, /* in */ BMDDeckControlError error) = 0; + virtual HRESULT DeckControlStatusChanged (/* in */ BMDDeckControlStatusFlags flags, /* in */ uint32_t mask) = 0; + +protected: + virtual ~IDeckLinkDeckControlStatusCallback () {}; // call Release method to drop reference count +}; + +/* Interface IDeckLinkDeckControl - Deck Control main interface */ + +class IDeckLinkDeckControl : public IUnknown +{ +public: + virtual HRESULT Open (/* in */ BMDTimeScale timeScale, /* in */ BMDTimeValue timeValue, /* in */ bool timecodeIsDropFrame, /* out */ BMDDeckControlError *error) = 0; + virtual HRESULT Close (/* in */ bool standbyOn) = 0; + virtual HRESULT GetCurrentState (/* out */ BMDDeckControlMode *mode, /* out */ BMDDeckControlVTRControlState *vtrControlState, /* out */ BMDDeckControlStatusFlags *flags) = 0; + virtual HRESULT SetStandby (/* in */ bool standbyOn) = 0; + virtual HRESULT SendCommand (/* in */ uint8_t *inBuffer, /* in */ uint32_t inBufferSize, /* out */ uint8_t *outBuffer, /* out */ uint32_t *outDataSize, /* in */ uint32_t outBufferSize, /* out */ BMDDeckControlError *error) = 0; + virtual HRESULT Play (/* out */ BMDDeckControlError *error) = 0; + virtual HRESULT Stop (/* out */ BMDDeckControlError *error) = 0; + virtual HRESULT TogglePlayStop (/* out */ BMDDeckControlError *error) = 0; + virtual HRESULT Eject (/* out */ BMDDeckControlError *error) = 0; + virtual HRESULT GoToTimecode (/* in */ BMDTimecodeBCD timecode, /* out */ BMDDeckControlError *error) = 0; + virtual HRESULT FastForward (/* in */ bool viewTape, /* out */ BMDDeckControlError *error) = 0; + virtual HRESULT Rewind (/* in */ bool viewTape, /* out */ BMDDeckControlError *error) = 0; + virtual HRESULT StepForward (/* out */ BMDDeckControlError *error) = 0; + virtual HRESULT StepBack (/* out */ BMDDeckControlError *error) = 0; + virtual HRESULT Jog (/* in */ double rate, /* out */ BMDDeckControlError *error) = 0; + virtual HRESULT Shuttle (/* in */ double rate, /* out */ BMDDeckControlError *error) = 0; + virtual HRESULT GetTimecodeString (/* out */ CFStringRef *currentTimeCode, /* out */ BMDDeckControlError *error) = 0; + virtual HRESULT GetTimecode (/* out */ IDeckLinkTimecode **currentTimecode, /* out */ BMDDeckControlError *error) = 0; + virtual HRESULT GetTimecodeBCD (/* out */ BMDTimecodeBCD *currentTimecode, /* out */ BMDDeckControlError *error) = 0; + virtual HRESULT SetPreroll (/* in */ uint32_t prerollSeconds) = 0; + virtual HRESULT GetPreroll (/* out */ uint32_t *prerollSeconds) = 0; + virtual HRESULT SetExportOffset (/* in */ int32_t exportOffsetFields) = 0; + virtual HRESULT GetExportOffset (/* out */ int32_t *exportOffsetFields) = 0; + virtual HRESULT GetManualExportOffset (/* out */ int32_t *deckManualExportOffsetFields) = 0; + virtual HRESULT SetCaptureOffset (/* in */ int32_t captureOffsetFields) = 0; + virtual HRESULT GetCaptureOffset (/* out */ int32_t *captureOffsetFields) = 0; + virtual HRESULT StartExport (/* in */ BMDTimecodeBCD inTimecode, /* in */ BMDTimecodeBCD outTimecode, /* in */ BMDDeckControlExportModeOpsFlags exportModeOps, /* out */ BMDDeckControlError *error) = 0; + virtual HRESULT StartCapture (/* in */ bool useVITC, /* in */ BMDTimecodeBCD inTimecode, /* in */ BMDTimecodeBCD outTimecode, /* out */ BMDDeckControlError *error) = 0; + virtual HRESULT GetDeviceID (/* out */ uint16_t *deviceId, /* out */ BMDDeckControlError *error) = 0; + virtual HRESULT Abort (void) = 0; + virtual HRESULT CrashRecordStart (/* out */ BMDDeckControlError *error) = 0; + virtual HRESULT CrashRecordStop (/* out */ BMDDeckControlError *error) = 0; + virtual HRESULT SetCallback (/* in */ IDeckLinkDeckControlStatusCallback *callback) = 0; + +protected: + virtual ~IDeckLinkDeckControl () {}; // call Release method to drop reference count +}; + +/* Functions */ + +extern "C" { + + +}; + + +#endif /* defined(BMD_DECKLINKAPIDECKCONTROL_H) */ diff --git a/sys/decklink/osx/DeckLinkAPIDiscovery.h b/sys/decklink/osx/DeckLinkAPIDiscovery.h new file mode 100644 index 000000000..99fc0feb9 --- /dev/null +++ b/sys/decklink/osx/DeckLinkAPIDiscovery.h @@ -0,0 +1,62 @@ +/* -LICENSE-START- +** Copyright (c) 2011 Blackmagic Design +** +** Permission is hereby granted, free of charge, to any person or organization +** obtaining a copy of the software and accompanying documentation covered by +** this license (the "Software") to use, reproduce, display, distribute, +** execute, and transmit the Software, and to prepare derivative works of the +** Software, and to permit third-parties to whom the Software is furnished to +** do so, all subject to the following: +** +** The copyright notices in the Software and this entire statement, including +** the above license grant, this restriction and the following disclaimer, +** must be included in all copies of the Software, in whole or in part, and +** all derivative works of the Software, unless such copies or derivative +** works are solely in the form of machine-executable object code generated by +** a source language processor. +** +** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +** DEALINGS IN THE SOFTWARE. +** -LICENSE-END- +*/ + +#ifndef BMD_DECKLINKAPIDISCOVERY_H +#define BMD_DECKLINKAPIDISCOVERY_H + +// Type Declarations + + +// Interface ID Declarations + +#define IID_IDeckLink /* C418FBDD-0587-48ED-8FE5-640F0A14AF91 */ (REFIID){0xC4,0x18,0xFB,0xDD,0x05,0x87,0x48,0xED,0x8F,0xE5,0x64,0x0F,0x0A,0x14,0xAF,0x91} + +// Forward Declarations + +class IDeckLink; + +/* Interface IDeckLink - represents a DeckLink device */ + +class IDeckLink : public IUnknown +{ +public: + virtual HRESULT GetModelName (/* out */ CFStringRef *modelName) = 0; + virtual HRESULT GetDisplayName (/* out */ CFStringRef *displayName) = 0; + +protected: + virtual ~IDeckLink () {}; // call Release method to drop reference count +}; + +/* Functions */ + +extern "C" { + + +}; + + +#endif /* defined(BMD_DECKLINKAPIDISCOVERY_H) */ diff --git a/sys/decklink/osx/DeckLinkAPIDispatch-osx.cpp b/sys/decklink/osx/DeckLinkAPIDispatch-osx.cpp new file mode 100644 index 000000000..18b0122fa --- /dev/null +++ b/sys/decklink/osx/DeckLinkAPIDispatch-osx.cpp @@ -0,0 +1,178 @@ +/* -LICENSE-START- +** Copyright (c) 2009 Blackmagic Design +** +** Permission is hereby granted, free of charge, to any person or organization +** obtaining a copy of the software and accompanying documentation covered by +** this license (the "Software") to use, reproduce, display, distribute, +** execute, and transmit the Software, and to prepare derivative works of the +** Software, and to permit third-parties to whom the Software is furnished to +** do so, all subject to the following: +** +** The copyright notices in the Software and this entire statement, including +** the above license grant, this restriction and the following disclaimer, +** must be included in all copies of the Software, in whole or in part, and +** all derivative works of the Software, unless such copies or derivative +** works are solely in the form of machine-executable object code generated by +** a source language processor. +** +** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +** DEALINGS IN THE SOFTWARE. +** -LICENSE-END- +*/ +/* DeckLinkAPIDispatch.cpp */ + +#include "DeckLinkAPI.h" +#include <pthread.h> + +#if BLACKMAGIC_DECKLINK_API_MAGIC != 1 + #error The DeckLink API version of DeckLinkAPIDispatch.cpp is not the same version as DeckLinkAPI.h +#endif + +#define kDeckLinkAPI_BundlePath "/Library/Application Support/Blackmagic Design/Blackmagic DeckLink/DeckLinkAPI.bundle" + +typedef IDeckLinkIterator* (*CreateIteratorFunc)(void); +typedef IDeckLinkAPIInformation* (*CreateAPIInformationFunc)(void); +typedef IDeckLinkGLScreenPreviewHelper* (*CreateOpenGLScreenPreviewHelperFunc)(void); +typedef IDeckLinkCocoaScreenPreviewCallback* (*CreateCocoaScreenPreviewFunc)(void*); +typedef IDeckLinkVideoConversion* (*CreateVideoConversionInstanceFunc)(void); + +static pthread_once_t gDeckLinkOnceControl = PTHREAD_ONCE_INIT; +static CFBundleRef gDeckLinkAPIBundleRef = NULL; +static CreateIteratorFunc gCreateIteratorFunc = NULL; +static CreateAPIInformationFunc gCreateAPIInformationFunc = NULL; +static CreateOpenGLScreenPreviewHelperFunc gCreateOpenGLPreviewFunc = NULL; +static CreateCocoaScreenPreviewFunc gCreateCocoaPreviewFunc = NULL; +static CreateVideoConversionInstanceFunc gCreateVideoConversionFunc = NULL; + + +void InitDeckLinkAPI (void) +{ + CFURLRef bundleURL; + + bundleURL = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, CFSTR(kDeckLinkAPI_BundlePath), kCFURLPOSIXPathStyle, true); + if (bundleURL != NULL) + { + gDeckLinkAPIBundleRef = CFBundleCreate(kCFAllocatorDefault, bundleURL); + if (gDeckLinkAPIBundleRef != NULL) + { + gCreateIteratorFunc = (CreateIteratorFunc)CFBundleGetFunctionPointerForName(gDeckLinkAPIBundleRef, CFSTR("CreateDeckLinkIteratorInstance_0002")); + gCreateAPIInformationFunc = (CreateAPIInformationFunc)CFBundleGetFunctionPointerForName(gDeckLinkAPIBundleRef, CFSTR("CreateDeckLinkAPIInformationInstance_0001")); + gCreateOpenGLPreviewFunc = (CreateOpenGLScreenPreviewHelperFunc)CFBundleGetFunctionPointerForName(gDeckLinkAPIBundleRef, CFSTR("CreateOpenGLScreenPreviewHelper_0001")); + gCreateCocoaPreviewFunc = (CreateCocoaScreenPreviewFunc)CFBundleGetFunctionPointerForName(gDeckLinkAPIBundleRef, CFSTR("CreateCocoaScreenPreview_0001")); + gCreateVideoConversionFunc = (CreateVideoConversionInstanceFunc)CFBundleGetFunctionPointerForName(gDeckLinkAPIBundleRef, CFSTR("CreateVideoConversionInstance_0001")); + } + CFRelease(bundleURL); + } +} + +bool IsDeckLinkAPIPresent (void) +{ + // If the DeckLink API bundle was successfully loaded, return this knowledge to the caller + if (gDeckLinkAPIBundleRef != NULL) + return true; + + return false; +} + +IDeckLinkIterator* CreateDeckLinkIteratorInstance (void) +{ + pthread_once(&gDeckLinkOnceControl, InitDeckLinkAPI); + + if (gCreateIteratorFunc == NULL) + return NULL; + + return gCreateIteratorFunc(); +} + +IDeckLinkAPIInformation* CreateDeckLinkAPIInformationInstance (void) +{ + pthread_once(&gDeckLinkOnceControl, InitDeckLinkAPI); + + if (gCreateAPIInformationFunc == NULL) + return NULL; + + return gCreateAPIInformationFunc(); +} + +IDeckLinkGLScreenPreviewHelper* CreateOpenGLScreenPreviewHelper (void) +{ + pthread_once(&gDeckLinkOnceControl, InitDeckLinkAPI); + + if (gCreateOpenGLPreviewFunc == NULL) + return NULL; + + return gCreateOpenGLPreviewFunc(); +} + +IDeckLinkCocoaScreenPreviewCallback* CreateCocoaScreenPreview (void* parentView) +{ + pthread_once(&gDeckLinkOnceControl, InitDeckLinkAPI); + + if (gCreateCocoaPreviewFunc == NULL) + return NULL; + + return gCreateCocoaPreviewFunc(parentView); +} + +IDeckLinkVideoConversion* CreateVideoConversionInstance (void) +{ + pthread_once(&gDeckLinkOnceControl, InitDeckLinkAPI); + + if (gCreateVideoConversionFunc == NULL) + return NULL; + + return gCreateVideoConversionFunc(); +} + +#define kBMDStreamingAPI_BundlePath "/Library/Application Support/Blackmagic Design/Streaming/BMDStreamingAPI.bundle" + +typedef IBMDStreamingDiscovery* (*CreateDiscoveryFunc)(void); +typedef IBMDStreamingH264NALParser* (*CreateNALParserFunc)(void); + +static pthread_once_t gBMDStreamingOnceControl = PTHREAD_ONCE_INIT; +static CFBundleRef gBMDStreamingAPIBundleRef = NULL; +static CreateDiscoveryFunc gCreateDiscoveryFunc = NULL; +static CreateNALParserFunc gCreateNALParserFunc = NULL; + +void InitBMDStreamingAPI(void) +{ + CFURLRef bundleURL; + + bundleURL = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, CFSTR(kBMDStreamingAPI_BundlePath), kCFURLPOSIXPathStyle, true); + if (bundleURL != NULL) + { + gBMDStreamingAPIBundleRef = CFBundleCreate(kCFAllocatorDefault, bundleURL); + if (gBMDStreamingAPIBundleRef != NULL) + { + gCreateDiscoveryFunc = (CreateDiscoveryFunc)CFBundleGetFunctionPointerForName(gBMDStreamingAPIBundleRef, CFSTR("CreateBMDStreamingDiscoveryInstance_0001")); + gCreateNALParserFunc = (CreateNALParserFunc)CFBundleGetFunctionPointerForName(gBMDStreamingAPIBundleRef, CFSTR("CreateBMDStreamingH264NALParser_0001")); + } + + CFRelease(bundleURL); + } +} + +IBMDStreamingDiscovery* CreateBMDStreamingDiscoveryInstance() +{ + pthread_once(&gBMDStreamingOnceControl, InitBMDStreamingAPI); + + if (gCreateDiscoveryFunc == NULL) + return NULL; + + return gCreateDiscoveryFunc(); +} + +IBMDStreamingH264NALParser* CreateBMDStreamingH264NALParser() +{ + pthread_once(&gBMDStreamingOnceControl, InitBMDStreamingAPI); + + if (gCreateNALParserFunc == NULL) + return NULL; + + return gCreateNALParserFunc(); +} diff --git a/sys/decklink/osx/DeckLinkAPIModes.h b/sys/decklink/osx/DeckLinkAPIModes.h new file mode 100644 index 000000000..8b0759236 --- /dev/null +++ b/sys/decklink/osx/DeckLinkAPIModes.h @@ -0,0 +1,155 @@ +/* -LICENSE-START- +** Copyright (c) 2011 Blackmagic Design +** +** Permission is hereby granted, free of charge, to any person or organization +** obtaining a copy of the software and accompanying documentation covered by +** this license (the "Software") to use, reproduce, display, distribute, +** execute, and transmit the Software, and to prepare derivative works of the +** Software, and to permit third-parties to whom the Software is furnished to +** do so, all subject to the following: +** +** The copyright notices in the Software and this entire statement, including +** the above license grant, this restriction and the following disclaimer, +** must be included in all copies of the Software, in whole or in part, and +** all derivative works of the Software, unless such copies or derivative +** works are solely in the form of machine-executable object code generated by +** a source language processor. +** +** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +** DEALINGS IN THE SOFTWARE. +** -LICENSE-END- +*/ + +#ifndef BMD_DECKLINKAPIMODES_H +#define BMD_DECKLINKAPIMODES_H + +// Type Declarations + + +// Interface ID Declarations + +#define IID_IDeckLinkDisplayModeIterator /* 9C88499F-F601-4021-B80B-032E4EB41C35 */ (REFIID){0x9C,0x88,0x49,0x9F,0xF6,0x01,0x40,0x21,0xB8,0x0B,0x03,0x2E,0x4E,0xB4,0x1C,0x35} +#define IID_IDeckLinkDisplayMode /* 3EB2C1AB-0A3D-4523-A3AD-F40D7FB14E78 */ (REFIID){0x3E,0xB2,0xC1,0xAB,0x0A,0x3D,0x45,0x23,0xA3,0xAD,0xF4,0x0D,0x7F,0xB1,0x4E,0x78} + +/* Enum BMDDisplayMode - Video display modes */ + +typedef uint32_t BMDDisplayMode; +enum _BMDDisplayMode { + + /* SD Modes */ + + bmdModeNTSC = 'ntsc', + bmdModeNTSC2398 = 'nt23', // 3:2 pulldown + bmdModePAL = 'pal ', + bmdModeNTSCp = 'ntsp', + bmdModePALp = 'palp', + + /* HD 1080 Modes */ + + bmdModeHD1080p2398 = '23ps', + bmdModeHD1080p24 = '24ps', + bmdModeHD1080p25 = 'Hp25', + bmdModeHD1080p2997 = 'Hp29', + bmdModeHD1080p30 = 'Hp30', + bmdModeHD1080i50 = 'Hi50', + bmdModeHD1080i5994 = 'Hi59', + bmdModeHD1080i6000 = 'Hi60', // N.B. This _really_ is 60.00 Hz. + bmdModeHD1080p50 = 'Hp50', + bmdModeHD1080p5994 = 'Hp59', + bmdModeHD1080p6000 = 'Hp60', // N.B. This _really_ is 60.00 Hz. + + /* HD 720 Modes */ + + bmdModeHD720p50 = 'hp50', + bmdModeHD720p5994 = 'hp59', + bmdModeHD720p60 = 'hp60', + + /* 2k Modes */ + + bmdMode2k2398 = '2k23', + bmdMode2k24 = '2k24', + bmdMode2k25 = '2k25', + + /* Special Modes */ + + bmdModeUnknown = 'iunk' +}; + +/* Enum BMDFieldDominance - Video field dominance */ + +typedef uint32_t BMDFieldDominance; +enum _BMDFieldDominance { + bmdUnknownFieldDominance = 0, + bmdLowerFieldFirst = 'lowr', + bmdUpperFieldFirst = 'uppr', + bmdProgressiveFrame = 'prog', + bmdProgressiveSegmentedFrame = 'psf ' +}; + +/* Enum BMDPixelFormat - Video pixel formats supported for output/input */ + +typedef uint32_t BMDPixelFormat; +enum _BMDPixelFormat { + bmdFormat8BitYUV = '2vuy', + bmdFormat10BitYUV = 'v210', + bmdFormat8BitARGB = 32, + bmdFormat8BitBGRA = 'BGRA', + bmdFormat10BitRGB = 'r210' // Big-endian RGB 10-bit per component with SMPTE video levels (64-960). Packed as 2:10:10:10 +}; + +/* Enum BMDDisplayModeFlags - Flags to describe the characteristics of an IDeckLinkDisplayMode. */ + +typedef uint32_t BMDDisplayModeFlags; +enum _BMDDisplayModeFlags { + bmdDisplayModeSupports3D = 1 << 0, + bmdDisplayModeColorspaceRec601 = 1 << 1, + bmdDisplayModeColorspaceRec709 = 1 << 2 +}; + +// Forward Declarations + +class IDeckLinkDisplayModeIterator; +class IDeckLinkDisplayMode; + +/* Interface IDeckLinkDisplayModeIterator - enumerates over supported input/output display modes. */ + +class IDeckLinkDisplayModeIterator : public IUnknown +{ +public: + virtual HRESULT Next (/* out */ IDeckLinkDisplayMode **deckLinkDisplayMode) = 0; + +protected: + virtual ~IDeckLinkDisplayModeIterator () {}; // call Release method to drop reference count +}; + +/* Interface IDeckLinkDisplayMode - represents a display mode */ + +class IDeckLinkDisplayMode : public IUnknown +{ +public: + virtual HRESULT GetName (/* out */ CFStringRef *name) = 0; + virtual BMDDisplayMode GetDisplayMode (void) = 0; + virtual long GetWidth (void) = 0; + virtual long GetHeight (void) = 0; + virtual HRESULT GetFrameRate (/* out */ BMDTimeValue *frameDuration, /* out */ BMDTimeScale *timeScale) = 0; + virtual BMDFieldDominance GetFieldDominance (void) = 0; + virtual BMDDisplayModeFlags GetFlags (void) = 0; + +protected: + virtual ~IDeckLinkDisplayMode () {}; // call Release method to drop reference count +}; + +/* Functions */ + +extern "C" { + + +}; + + +#endif /* defined(BMD_DECKLINKAPIMODES_H) */ diff --git a/sys/decklink/osx/DeckLinkAPIStreaming.h b/sys/decklink/osx/DeckLinkAPIStreaming.h new file mode 100644 index 000000000..ecffb8def --- /dev/null +++ b/sys/decklink/osx/DeckLinkAPIStreaming.h @@ -0,0 +1,366 @@ +/* -LICENSE-START- +** Copyright (c) 2011 Blackmagic Design +** +** Permission is hereby granted, free of charge, to any person or organization +** obtaining a copy of the software and accompanying documentation covered by +** this license (the "Software") to use, reproduce, display, distribute, +** execute, and transmit the Software, and to prepare derivative works of the +** Software, and to permit third-parties to whom the Software is furnished to +** do so, all subject to the following: +** +** The copyright notices in the Software and this entire statement, including +** the above license grant, this restriction and the following disclaimer, +** must be included in all copies of the Software, in whole or in part, and +** all derivative works of the Software, unless such copies or derivative +** works are solely in the form of machine-executable object code generated by +** a source language processor. +** +** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +** DEALINGS IN THE SOFTWARE. +** -LICENSE-END- +*/ + +#ifndef BMD_DECKLINKAPISTREAMING_H +#define BMD_DECKLINKAPISTREAMING_H + +// Type Declarations + + +// Interface ID Declarations + +#define IID_IBMDStreamingDeviceNotificationCallback /* F9531D64-3305-4B29-A387-7F74BB0D0E84 */ (REFIID){0xF9,0x53,0x1D,0x64,0x33,0x05,0x4B,0x29,0xA3,0x87,0x7F,0x74,0xBB,0x0D,0x0E,0x84} +#define IID_IBMDStreamingH264InputCallback /* 823C475F-55AE-46F9-890C-537CC5CEDCCA */ (REFIID){0x82,0x3C,0x47,0x5F,0x55,0xAE,0x46,0xF9,0x89,0x0C,0x53,0x7C,0xC5,0xCE,0xDC,0xCA} +#define IID_IBMDStreamingDiscovery /* 2C837444-F989-4D87-901A-47C8A36D096D */ (REFIID){0x2C,0x83,0x74,0x44,0xF9,0x89,0x4D,0x87,0x90,0x1A,0x47,0xC8,0xA3,0x6D,0x09,0x6D} +#define IID_IBMDStreamingVideoEncodingMode /* 1AB8035B-CD13-458D-B6DF-5E8F7C2141D9 */ (REFIID){0x1A,0xB8,0x03,0x5B,0xCD,0x13,0x45,0x8D,0xB6,0xDF,0x5E,0x8F,0x7C,0x21,0x41,0xD9} +#define IID_IBMDStreamingMutableVideoEncodingMode /* 19BF7D90-1E0A-400D-B2C6-FFC4E78AD49D */ (REFIID){0x19,0xBF,0x7D,0x90,0x1E,0x0A,0x40,0x0D,0xB2,0xC6,0xFF,0xC4,0xE7,0x8A,0xD4,0x9D} +#define IID_IBMDStreamingVideoEncodingModePresetIterator /* 7AC731A3-C950-4AD0-804A-8377AA51C6C4 */ (REFIID){0x7A,0xC7,0x31,0xA3,0xC9,0x50,0x4A,0xD0,0x80,0x4A,0x83,0x77,0xAA,0x51,0xC6,0xC4} +#define IID_IBMDStreamingDeviceInput /* 24B6B6EC-1727-44BB-9818-34FF086ACF98 */ (REFIID){0x24,0xB6,0xB6,0xEC,0x17,0x27,0x44,0xBB,0x98,0x18,0x34,0xFF,0x08,0x6A,0xCF,0x98} +#define IID_IBMDStreamingH264NALPacket /* E260E955-14BE-4395-9775-9F02CC0A9D89 */ (REFIID){0xE2,0x60,0xE9,0x55,0x14,0xBE,0x43,0x95,0x97,0x75,0x9F,0x02,0xCC,0x0A,0x9D,0x89} +#define IID_IBMDStreamingAudioPacket /* D9EB5902-1AD2-43F4-9E2C-3CFA50B5EE19 */ (REFIID){0xD9,0xEB,0x59,0x02,0x1A,0xD2,0x43,0xF4,0x9E,0x2C,0x3C,0xFA,0x50,0xB5,0xEE,0x19} +#define IID_IBMDStreamingMPEG2TSPacket /* 91810D1C-4FB3-4AAA-AE56-FA301D3DFA4C */ (REFIID){0x91,0x81,0x0D,0x1C,0x4F,0xB3,0x4A,0xAA,0xAE,0x56,0xFA,0x30,0x1D,0x3D,0xFA,0x4C} +#define IID_IBMDStreamingH264NALParser /* 5867F18C-5BFA-4CCC-B2A7-9DFD140417D2 */ (REFIID){0x58,0x67,0xF1,0x8C,0x5B,0xFA,0x4C,0xCC,0xB2,0xA7,0x9D,0xFD,0x14,0x04,0x17,0xD2} + +/* Enum BMDStreamingDeviceMode - Device modes */ + +typedef uint32_t BMDStreamingDeviceMode; +enum _BMDStreamingDeviceMode { + bmdStreamingDeviceIdle = 'idle', + bmdStreamingDeviceEncoding = 'enco', + bmdStreamingDeviceStopping = 'stop', + bmdStreamingDeviceUnknown = 'munk' +}; + +/* Enum BMDStreamingEncodingFrameRate - Encoded frame rates */ + +typedef uint32_t BMDStreamingEncodingFrameRate; +enum _BMDStreamingEncodingFrameRate { + + /* Interlaced rates */ + + bmdStreamingEncodedFrameRate50i = 'e50i', + bmdStreamingEncodedFrameRate5994i = 'e59i', + bmdStreamingEncodedFrameRate60i = 'e60i', + + /* Progressive rates */ + + bmdStreamingEncodedFrameRate2398p = 'e23p', + bmdStreamingEncodedFrameRate24p = 'e24p', + bmdStreamingEncodedFrameRate25p = 'e25p', + bmdStreamingEncodedFrameRate2997p = 'e29p', + bmdStreamingEncodedFrameRate30p = 'e30p', + bmdStreamingEncodedFrameRate50p = 'e50p', + bmdStreamingEncodedFrameRate5994p = 'e59p', + bmdStreamingEncodedFrameRate60p = 'e60p' +}; + +/* Enum BMDStreamingEncodingSupport - Output encoding mode supported flag */ + +typedef uint32_t BMDStreamingEncodingSupport; +enum _BMDStreamingEncodingSupport { + bmdStreamingEncodingModeNotSupported = 0, + bmdStreamingEncodingModeSupported, + bmdStreamingEncodingModeSupportedWithChanges +}; + +/* Enum BMDStreamingVideoCodec - Video codecs */ + +typedef uint32_t BMDStreamingVideoCodec; +enum _BMDStreamingVideoCodec { + bmdStreamingVideoCodecH264 = 'H264' +}; + +/* Enum BMDStreamingH264Profile - H264 encoding profile */ + +typedef uint32_t BMDStreamingH264Profile; +enum _BMDStreamingH264Profile { + bmdStreamingH264ProfileHigh = 'high', + bmdStreamingH264ProfileMain = 'main', + bmdStreamingH264ProfileBaseline = 'base' +}; + +/* Enum BMDStreamingH264Level - H264 encoding level */ + +typedef uint32_t BMDStreamingH264Level; +enum _BMDStreamingH264Level { + bmdStreamingH264Level12 = 'lv12', + bmdStreamingH264Level13 = 'lv13', + bmdStreamingH264Level2 = 'lv2 ', + bmdStreamingH264Level21 = 'lv21', + bmdStreamingH264Level22 = 'lv22', + bmdStreamingH264Level3 = 'lv3 ', + bmdStreamingH264Level31 = 'lv31', + bmdStreamingH264Level32 = 'lv32', + bmdStreamingH264Level4 = 'lv4 ', + bmdStreamingH264Level41 = 'lv41', + bmdStreamingH264Level42 = 'lv42' +}; + +/* Enum BMDStreamingH264EntropyCoding - H264 entropy coding */ + +typedef uint32_t BMDStreamingH264EntropyCoding; +enum _BMDStreamingH264EntropyCoding { + bmdStreamingH264EntropyCodingCAVLC = 'EVLC', + bmdStreamingH264EntropyCodingCABAC = 'EBAC' +}; + +/* Enum BMDStreamingAudioCodec - Audio codecs */ + +typedef uint32_t BMDStreamingAudioCodec; +enum _BMDStreamingAudioCodec { + bmdStreamingAudioCodecAAC = 'AAC ' +}; + +/* Enum BMDStreamingEncodingModePropertyID - Encoding mode properties */ + +typedef uint32_t BMDStreamingEncodingModePropertyID; +enum _BMDStreamingEncodingModePropertyID { + + /* Integers, Video Properties */ + + bmdStreamingEncodingPropertyVideoFrameRate = 'vfrt', // Uses values of type BMDStreamingEncodingFrameRate + bmdStreamingEncodingPropertyVideoBitRateKbps = 'vbrt', + + /* Integers, H264 Properties */ + + bmdStreamingEncodingPropertyH264Profile = 'hprf', + bmdStreamingEncodingPropertyH264Level = 'hlvl', + bmdStreamingEncodingPropertyH264EntropyCoding = 'hent', + + /* Flags, H264 Properties */ + + bmdStreamingEncodingPropertyH264HasBFrames = 'hBfr', + + /* Integers, Audio Properties */ + + bmdStreamingEncodingPropertyAudioCodec = 'acdc', + bmdStreamingEncodingPropertyAudioSampleRate = 'asrt', + bmdStreamingEncodingPropertyAudioChannelCount = 'achc', + bmdStreamingEncodingPropertyAudioBitRateKbps = 'abrt' +}; + +// Forward Declarations + +class IBMDStreamingDeviceNotificationCallback; +class IBMDStreamingH264InputCallback; +class IBMDStreamingDiscovery; +class IBMDStreamingVideoEncodingMode; +class IBMDStreamingMutableVideoEncodingMode; +class IBMDStreamingVideoEncodingModePresetIterator; +class IBMDStreamingDeviceInput; +class IBMDStreamingH264NALPacket; +class IBMDStreamingAudioPacket; +class IBMDStreamingMPEG2TSPacket; +class IBMDStreamingH264NALParser; + +/* Interface IBMDStreamingDeviceNotificationCallback - Device notification callbacks. */ + +class IBMDStreamingDeviceNotificationCallback : public IUnknown +{ +public: + virtual HRESULT StreamingDeviceArrived (/* in */ IDeckLink* device) = 0; + virtual HRESULT StreamingDeviceRemoved (/* in */ IDeckLink* device) = 0; + virtual HRESULT StreamingDeviceModeChanged (/* in */ IDeckLink* device, /* in */ BMDStreamingDeviceMode mode) = 0; + +protected: + virtual ~IBMDStreamingDeviceNotificationCallback () {}; // call Release method to drop reference count +}; + +/* Interface IBMDStreamingH264InputCallback - H264 input callbacks. */ + +class IBMDStreamingH264InputCallback : public IUnknown +{ +public: + virtual HRESULT H264NALPacketArrived (/* in */ IBMDStreamingH264NALPacket* nalPacket) = 0; + virtual HRESULT H264AudioPacketArrived (/* in */ IBMDStreamingAudioPacket* audioPacket) = 0; + virtual HRESULT MPEG2TSPacketArrived (/* in */ IBMDStreamingMPEG2TSPacket* tsPacket) = 0; + virtual HRESULT H264VideoInputConnectorScanningChanged (void) = 0; + virtual HRESULT H264VideoInputConnectorChanged (void) = 0; + virtual HRESULT H264VideoInputModeChanged (void) = 0; + +protected: + virtual ~IBMDStreamingH264InputCallback () {}; // call Release method to drop reference count +}; + +/* Interface IBMDStreamingDiscovery - Installs device notifications */ + +class IBMDStreamingDiscovery : public IUnknown +{ +public: + virtual HRESULT InstallDeviceNotifications (/* in */ IBMDStreamingDeviceNotificationCallback* theCallback) = 0; + virtual HRESULT UninstallDeviceNotifications (void) = 0; + +protected: + virtual ~IBMDStreamingDiscovery () {}; // call Release method to drop reference count +}; + +/* Interface IBMDStreamingVideoEncodingMode - Represents an encoded video mode. */ + +class IBMDStreamingVideoEncodingMode : public IUnknown +{ +public: + virtual HRESULT GetName (/* out */ CFStringRef *name) = 0; + virtual unsigned int GetPresetID (void) = 0; + virtual unsigned int GetSourcePositionX (void) = 0; + virtual unsigned int GetSourcePositionY (void) = 0; + virtual unsigned int GetSourceWidth (void) = 0; + virtual unsigned int GetSourceHeight (void) = 0; + virtual unsigned int GetDestWidth (void) = 0; + virtual unsigned int GetDestHeight (void) = 0; + virtual HRESULT GetFlag (/* in */ BMDStreamingEncodingModePropertyID cfgID, /* out */ bool* value) = 0; + virtual HRESULT GetInt (/* in */ BMDStreamingEncodingModePropertyID cfgID, /* out */ int64_t* value) = 0; + virtual HRESULT GetFloat (/* in */ BMDStreamingEncodingModePropertyID cfgID, /* out */ double* value) = 0; + virtual HRESULT GetString (/* in */ BMDStreamingEncodingModePropertyID cfgID, /* out */ CFStringRef *value) = 0; + virtual HRESULT CreateMutableVideoEncodingMode (/* out */ IBMDStreamingMutableVideoEncodingMode** newEncodingMode) = 0; // Creates a mutable copy of the encoding mode + +protected: + virtual ~IBMDStreamingVideoEncodingMode () {}; // call Release method to drop reference count +}; + +/* Interface IBMDStreamingMutableVideoEncodingMode - Represents a mutable encoded video mode. */ + +class IBMDStreamingMutableVideoEncodingMode : public IBMDStreamingVideoEncodingMode +{ +public: + virtual HRESULT SetSourceRect (/* in */ uint32_t posX, /* in */ uint32_t posY, /* in */ uint32_t width, /* in */ uint32_t height) = 0; + virtual HRESULT SetDestSize (/* in */ uint32_t width, /* in */ uint32_t height) = 0; + virtual HRESULT SetFlag (/* in */ BMDStreamingEncodingModePropertyID cfgID, /* in */ bool value) = 0; + virtual HRESULT SetInt (/* in */ BMDStreamingEncodingModePropertyID cfgID, /* in */ int64_t value) = 0; + virtual HRESULT SetFloat (/* in */ BMDStreamingEncodingModePropertyID cfgID, /* in */ double value) = 0; + virtual HRESULT SetString (/* in */ BMDStreamingEncodingModePropertyID cfgID, /* in */ CFStringRef value) = 0; + +protected: + virtual ~IBMDStreamingMutableVideoEncodingMode () {}; // call Release method to drop reference count +}; + +/* Interface IBMDStreamingVideoEncodingModePresetIterator - Enumerates encoding mode presets */ + +class IBMDStreamingVideoEncodingModePresetIterator : public IUnknown +{ +public: + virtual HRESULT Next (/* out */ IBMDStreamingVideoEncodingMode** videoEncodingMode) = 0; + +protected: + virtual ~IBMDStreamingVideoEncodingModePresetIterator () {}; // call Release method to drop reference count +}; + +/* Interface IBMDStreamingDeviceInput - Created by QueryInterface from IDeckLink */ + +class IBMDStreamingDeviceInput : public IUnknown +{ +public: + + /* Input modes */ + + virtual HRESULT DoesSupportVideoInputMode (/* in */ BMDDisplayMode inputMode, /* out */ bool* result) = 0; + virtual HRESULT GetVideoInputModeIterator (/* out */ IDeckLinkDisplayModeIterator** iterator) = 0; + virtual HRESULT SetVideoInputMode (/* in */ BMDDisplayMode inputMode) = 0; + virtual HRESULT GetCurrentDetectedVideoInputMode (/* out */ BMDDisplayMode* detectedMode) = 0; + + /* Capture modes */ + + virtual HRESULT GetVideoEncodingMode (/* out */ IBMDStreamingVideoEncodingMode** encodingMode) = 0; + virtual HRESULT GetVideoEncodingModePresetIterator (/* in */ BMDDisplayMode inputMode, /* out */ IBMDStreamingVideoEncodingModePresetIterator** iterator) = 0; + virtual HRESULT DoesSupportVideoEncodingMode (/* in */ BMDDisplayMode inputMode, /* in */ IBMDStreamingVideoEncodingMode* encodingMode, /* out */ BMDStreamingEncodingSupport* result, /* out */ IBMDStreamingVideoEncodingMode** changedEncodingMode) = 0; + virtual HRESULT SetVideoEncodingMode (/* in */ IBMDStreamingVideoEncodingMode* encodingMode) = 0; + + /* Input control */ + + virtual HRESULT StartCapture (void) = 0; + virtual HRESULT StopCapture (void) = 0; + virtual HRESULT SetCallback (/* in */ IUnknown* theCallback) = 0; + +protected: + virtual ~IBMDStreamingDeviceInput () {}; // call Release method to drop reference count +}; + +/* Interface IBMDStreamingH264NALPacket - Represent an H.264 NAL packet */ + +class IBMDStreamingH264NALPacket : public IUnknown +{ +public: + virtual long GetPayloadSize (void) = 0; + virtual HRESULT GetBytes (/* out */ void** buffer) = 0; + virtual HRESULT GetBytesWithSizePrefix (/* out */ void** buffer) = 0; // Contains a 32-bit unsigned big endian size prefix + virtual HRESULT GetDisplayTime (/* in */ uint64_t requestedTimeScale, /* out */ uint64_t* displayTime) = 0; + virtual HRESULT GetPacketIndex (/* out */ uint32_t* packetIndex) = 0; + +protected: + virtual ~IBMDStreamingH264NALPacket () {}; // call Release method to drop reference count +}; + +/* Interface IBMDStreamingAudioPacket - Represents a chunk of audio data */ + +class IBMDStreamingAudioPacket : public IUnknown +{ +public: + virtual BMDStreamingAudioCodec GetCodec (void) = 0; + virtual long GetPayloadSize (void) = 0; + virtual HRESULT GetBytes (/* out */ void** buffer) = 0; + virtual HRESULT GetPlayTime (/* in */ uint64_t requestedTimeScale, /* out */ uint64_t* playTime) = 0; + virtual HRESULT GetPacketIndex (/* out */ uint32_t* packetIndex) = 0; + +protected: + virtual ~IBMDStreamingAudioPacket () {}; // call Release method to drop reference count +}; + +/* Interface IBMDStreamingMPEG2TSPacket - Represent an MPEG2 Transport Stream packet */ + +class IBMDStreamingMPEG2TSPacket : public IUnknown +{ +public: + virtual long GetPayloadSize (void) = 0; + virtual HRESULT GetBytes (/* out */ void** buffer) = 0; + +protected: + virtual ~IBMDStreamingMPEG2TSPacket () {}; // call Release method to drop reference count +}; + +/* Interface IBMDStreamingH264NALParser - For basic NAL parsing */ + +class IBMDStreamingH264NALParser : public IUnknown +{ +public: + virtual HRESULT IsNALSequenceParameterSet (/* in */ IBMDStreamingH264NALPacket* nal) = 0; + virtual HRESULT IsNALPictureParameterSet (/* in */ IBMDStreamingH264NALPacket* nal) = 0; + virtual HRESULT GetProfileAndLevelFromSPS (/* in */ IBMDStreamingH264NALPacket* nal, /* out */ uint32_t* profileIdc, /* out */ uint32_t* profileCompatability, /* out */ uint32_t* levelIdc) = 0; + +protected: + virtual ~IBMDStreamingH264NALParser () {}; // call Release method to drop reference count +}; + +/* Functions */ + +extern "C" { + + IBMDStreamingDiscovery* CreateBMDStreamingDiscoveryInstance (void); + IBMDStreamingH264NALParser* CreateBMDStreamingH264NALParser (void); + +}; + + +#endif /* defined(BMD_DECKLINKAPISTREAMING_H) */ diff --git a/sys/decklink/osx/DeckLinkAPITypes.h b/sys/decklink/osx/DeckLinkAPITypes.h new file mode 100644 index 000000000..ed54d8e81 --- /dev/null +++ b/sys/decklink/osx/DeckLinkAPITypes.h @@ -0,0 +1,89 @@ +/* -LICENSE-START- +** Copyright (c) 2011 Blackmagic Design +** +** Permission is hereby granted, free of charge, to any person or organization +** obtaining a copy of the software and accompanying documentation covered by +** this license (the "Software") to use, reproduce, display, distribute, +** execute, and transmit the Software, and to prepare derivative works of the +** Software, and to permit third-parties to whom the Software is furnished to +** do so, all subject to the following: +** +** The copyright notices in the Software and this entire statement, including +** the above license grant, this restriction and the following disclaimer, +** must be included in all copies of the Software, in whole or in part, and +** all derivative works of the Software, unless such copies or derivative +** works are solely in the form of machine-executable object code generated by +** a source language processor. +** +** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +** DEALINGS IN THE SOFTWARE. +** -LICENSE-END- +*/ + +#ifndef BMD_DECKLINKAPITYPES_H +#define BMD_DECKLINKAPITYPES_H + +// Type Declarations + +typedef int64_t BMDTimeValue; +typedef int64_t BMDTimeScale; +typedef uint32_t BMDTimecodeBCD; +typedef uint32_t BMDTimecodeUserBits; + +// Interface ID Declarations + +#define IID_IDeckLinkTimecode /* BC6CFBD3-8317-4325-AC1C-1216391E9340 */ (REFIID){0xBC,0x6C,0xFB,0xD3,0x83,0x17,0x43,0x25,0xAC,0x1C,0x12,0x16,0x39,0x1E,0x93,0x40} + +/* Enum BMDTimecodeFlags - Timecode flags */ + +typedef uint32_t BMDTimecodeFlags; +enum _BMDTimecodeFlags { + bmdTimecodeFlagDefault = 0, + bmdTimecodeIsDropFrame = 1 << 0 +}; + +/* Enum BMDVideoConnection - Video connection types */ + +typedef uint32_t BMDVideoConnection; +enum _BMDVideoConnection { + bmdVideoConnectionSDI = 1 << 0, + bmdVideoConnectionHDMI = 1 << 1, + bmdVideoConnectionOpticalSDI = 1 << 2, + bmdVideoConnectionComponent = 1 << 3, + bmdVideoConnectionComposite = 1 << 4, + bmdVideoConnectionSVideo = 1 << 5 +}; + +// Forward Declarations + +class IDeckLinkTimecode; + +/* Interface IDeckLinkTimecode - Used for video frame timecode representation. */ + +class IDeckLinkTimecode : public IUnknown +{ +public: + virtual BMDTimecodeBCD GetBCD (void) = 0; + virtual HRESULT GetComponents (/* out */ uint8_t *hours, /* out */ uint8_t *minutes, /* out */ uint8_t *seconds, /* out */ uint8_t *frames) = 0; + virtual HRESULT GetString (/* out */ CFStringRef *timecode) = 0; + virtual BMDTimecodeFlags GetFlags (void) = 0; + virtual HRESULT GetTimecodeUserBits (/* out */ BMDTimecodeUserBits *userBits) = 0; + +protected: + virtual ~IDeckLinkTimecode () {}; // call Release method to drop reference count +}; + +/* Functions */ + +extern "C" { + + +}; + + +#endif /* defined(BMD_DECKLINKAPITYPES_H) */ diff --git a/sys/decklink/osx/DeckLinkAPIVersion.h b/sys/decklink/osx/DeckLinkAPIVersion.h new file mode 100644 index 000000000..2681ed0a0 --- /dev/null +++ b/sys/decklink/osx/DeckLinkAPIVersion.h @@ -0,0 +1,37 @@ +/* -LICENSE-START- + * ** Copyright (c) 2011 Blackmagic Design + * ** + * ** Permission is hereby granted, free of charge, to any person or organization + * ** obtaining a copy of the software and accompanying documentation covered by + * ** this license (the "Software") to use, reproduce, display, distribute, + * ** execute, and transmit the Software, and to prepare derivative works of the + * ** Software, and to permit third-parties to whom the Software is furnished to + * ** do so, all subject to the following: + * ** + * ** The copyright notices in the Software and this entire statement, including + * ** the above license grant, this restriction and the following disclaimer, + * ** must be included in all copies of the Software, in whole or in part, and + * ** all derivative works of the Software, unless such copies or derivative + * ** works are solely in the form of machine-executable object code generated by + * ** a source language processor. + * ** + * ** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * ** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * ** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT + * ** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE + * ** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, + * ** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * ** DEALINGS IN THE SOFTWARE. + * ** -LICENSE-END- + * */ + +/* DeckLinkAPIVersion.h */ + +#ifndef __DeckLink_API_Verison_h__ +#define __DeckLink_API_Version_h__ + +#define BLACKMAGIC_DECKLINK_API_VERSION 0x09000000 +#define BLACKMAGIC_DECKLINK_API_VERSION_STRING "9.0" + +#endif // __DeckLink_API_Version_h__ + diff --git a/sys/dvb/camutils.c b/sys/dvb/camutils.c index b3062b597..721b5cd96 100644 --- a/sys/dvb/camutils.c +++ b/sys/dvb/camutils.c @@ -21,6 +21,10 @@ * Boston, MA 02111-1307, USA. */ +/* FIXME 0.11: suppress warnings for deprecated API such as GStaticRecMutex + * with newer GLib versions (>= 2.31.0) */ +#define GLIB_DISABLE_DEPRECATION_WARNINGS + #include <gst/gst.h> #include <string.h> diff --git a/sys/dvb/gstdvbsrc.c b/sys/dvb/gstdvbsrc.c index 5f2ddd996..c13f33639 100644 --- a/sys/dvb/gstdvbsrc.c +++ b/sys/dvb/gstdvbsrc.c @@ -462,6 +462,8 @@ gst_dvbsrc_init (GstDvbSrc * object) /* We are a live source */ gst_base_src_set_live (GST_BASE_SRC (object), TRUE); + /* And we wanted timestamped output */ + gst_base_src_set_do_timestamp (GST_BASE_SRC (object), TRUE); object->fd_frontend = -1; object->fd_dvr = -1; @@ -940,7 +942,7 @@ gst_dvbsrc_read_device (GstDvbSrc * object, int size) } gst_buffer_unmap (buf, &map); gst_buffer_resize (buf, 0, count); - GST_BUFFER_TIMESTAMP (buf) = GST_CLOCK_TIME_NONE; + return buf; stopped: diff --git a/sys/shm/gstshmsink.c b/sys/shm/gstshmsink.c index d37c28d85..605e79871 100644 --- a/sys/shm/gstshmsink.c +++ b/sys/shm/gstshmsink.c @@ -18,8 +18,18 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ - - +/** + * SECTION:element-shmsink + * + * Send data over shared memory to the matching source. + * + * <refsect2> + * <title>Example launch lines</title> + * |[ + * gst-launch -v videotestsrc ! shmsink socket-path=/tmp/blah shm-size=1000000 + * ]| Send video to shm buffers. + * </refsect2> + */ #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/sys/shm/gstshmsrc.c b/sys/shm/gstshmsrc.c index b7537f436..672f4f3a4 100644 --- a/sys/shm/gstshmsrc.c +++ b/sys/shm/gstshmsrc.c @@ -18,6 +18,20 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ +/** + * SECTION:element-shmsrc + * + * Receive data from the shared memory sink. + * + * <refsect2> + * <title>Example launch lines</title> + * |[ + * gst-launch shmsrc socket-path=/tmp/blah ! \ + * "video/x-raw-yuv, format=(fourcc)YUY2, color-matrix=(string)sdtv, \ + * chroma-site=(string)mpeg2, width=(int)320, height=(int)240, framerate=(fraction)30/1" ! autovideosink + * ]| Render video from shm buffers. + * </refsect2> + */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -120,10 +134,10 @@ gst_shm_src_class_init (GstShmSrcClass * klass) gst_element_class_add_pad_template (gstelement_class, gst_static_pad_template_get (&srctemplate)); - gst_element_class_set_details_simple (gstelement_class, + gst_element_class_set_details_simple (element_class, "Shared Memory Source", "Source", - "Receive data from the sharem memory sink", + "Receive data from the shared memory sink", "Olivier Crete <olivier.crete@collabora.co.uk>"); GST_DEBUG_CATEGORY_INIT (shmsrc_debug, "shmsrc", 0, "Shared Memory Source"); diff --git a/sys/vdpau/gstvdp/gstvdpbufferpool.c b/sys/vdpau/gstvdp/gstvdpbufferpool.c index fea8aea4f..61c706b23 100644 --- a/sys/vdpau/gstvdp/gstvdpbufferpool.c +++ b/sys/vdpau/gstvdp/gstvdpbufferpool.c @@ -18,6 +18,9 @@ * Boston, MA 02111-1307, USA. */ +/* FIXME 0.11: suppress warnings for deprecated API such as GStaticRecMutex + * with newer GLib versions (>= 2.31.0) */ +#define GLIB_DISABLE_DEPRECATION_WARNINGS #include "gstvdpbufferpool.h" diff --git a/sys/vdpau/gstvdp/gstvdpdevice.c b/sys/vdpau/gstvdp/gstvdpdevice.c index 359874b16..eb5451800 100644 --- a/sys/vdpau/gstvdp/gstvdpdevice.c +++ b/sys/vdpau/gstvdp/gstvdpdevice.c @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +/* FIXME 0.11: suppress warnings for deprecated API such as GStaticRecMutex + * with newer GLib versions (>= 2.31.0) */ +#define GLIB_DISABLE_DEPRECATION_WARNINGS + #include "gstvdpdevice.h" GST_DEBUG_CATEGORY_STATIC (gst_vdp_device_debug); diff --git a/sys/vdpau/gstvdp/gstvdpoutputbufferpool.c b/sys/vdpau/gstvdp/gstvdpoutputbufferpool.c index 826ef218b..27f668988 100644 --- a/sys/vdpau/gstvdp/gstvdpoutputbufferpool.c +++ b/sys/vdpau/gstvdp/gstvdpoutputbufferpool.c @@ -3,18 +3,20 @@ * gst-plugins-bad * Copyright (C) Carl-Anton Ingmarsson 2010 <ca.ingmarsson@gmail.com> * - * gst-plugins-bad is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * gst-plugins-bad 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see <http://www.gnu.org/licenses/>. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. */ #include "gstvdpdevice.h" diff --git a/sys/vdpau/gstvdp/gstvdpoutputbufferpool.h b/sys/vdpau/gstvdp/gstvdpoutputbufferpool.h index 354461c0e..7c40684b4 100644 --- a/sys/vdpau/gstvdp/gstvdpoutputbufferpool.h +++ b/sys/vdpau/gstvdp/gstvdpoutputbufferpool.h @@ -3,18 +3,20 @@ * gst-plugins-bad * Copyright (C) Carl-Anton Ingmarsson 2010 <ca.ingmarsson@gmail.com> * - * gst-plugins-bad is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * gst-plugins-bad 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see <http://www.gnu.org/licenses/>. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. */ #ifndef _GST_VDP_OUTPUT_BUFFER_POOL_H_ diff --git a/sys/vdpau/gstvdp/gstvdpvideobufferpool.c b/sys/vdpau/gstvdp/gstvdpvideobufferpool.c index 889367d98..fdecb0d48 100644 --- a/sys/vdpau/gstvdp/gstvdpvideobufferpool.c +++ b/sys/vdpau/gstvdp/gstvdpvideobufferpool.c @@ -3,18 +3,20 @@ * gst-plugins-bad * Copyright (C) Carl-Anton Ingmarsson 2010 <ca.ingmarsson@gmail.com> * - * gst-plugins-bad is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * gst-plugins-bad 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see <http://www.gnu.org/licenses/>. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. */ #include "gstvdpdevice.h" diff --git a/sys/vdpau/gstvdp/gstvdpvideobufferpool.h b/sys/vdpau/gstvdp/gstvdpvideobufferpool.h index e22e9b939..8676102f1 100644 --- a/sys/vdpau/gstvdp/gstvdpvideobufferpool.h +++ b/sys/vdpau/gstvdp/gstvdpvideobufferpool.h @@ -3,18 +3,20 @@ * gst-plugins-bad * Copyright (C) Carl-Anton Ingmarsson 2010 <ca.ingmarsson@gmail.com> * - * gst-plugins-bad is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * gst-plugins-bad 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see <http://www.gnu.org/licenses/>. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. */ #ifndef _GST_VDP_VIDEO_BUFFERPOOL_H_ diff --git a/sys/vdpau/gstvdpsink.c b/sys/vdpau/gstvdpsink.c index c3d097fdd..5a5677eb4 100644 --- a/sys/vdpau/gstvdpsink.c +++ b/sys/vdpau/gstvdpsink.c @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +/* FIXME 0.11: suppress warnings for deprecated API such as GStaticRecMutex + * with newer GLib versions (>= 2.31.0) */ +#define GLIB_DISABLE_DEPRECATION_WARNINGS + #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/sys/vdpau/h264/gstvdph264dec.c b/sys/vdpau/h264/gstvdph264dec.c index 6c181aff0..ab5479794 100644 --- a/sys/vdpau/h264/gstvdph264dec.c +++ b/sys/vdpau/h264/gstvdph264dec.c @@ -687,23 +687,25 @@ gst_vdp_h264_dec_parse_data (GstBaseVideoDecoder * base_video_decoder, gst_bit_reader_init_from_buffer (&reader, buf); + if (gst_bit_reader_get_remaining (&reader) < + h264_dec->nal_length_size * 8 + 7) + goto invalid_packet; + /* skip nal_length or sync code */ - gst_bit_reader_skip (&reader, h264_dec->nal_length_size * 8); + gst_bit_reader_skip_unchecked (&reader, h264_dec->nal_length_size * 8); + + forbidden_zero_bit = gst_bit_reader_get_bits_uint8_unchecked (&reader, 1); - if (!gst_bit_reader_get_bits_uint8 (&reader, &forbidden_zero_bit, 1)) - goto invalid_packet; if (forbidden_zero_bit != 0) { GST_WARNING ("forbidden_zero_bit != 0"); return GST_FLOW_ERROR; } - if (!gst_bit_reader_get_bits_uint16 (&reader, &nal_unit.ref_idc, 2)) - goto invalid_packet; + nal_unit.ref_idc = gst_bit_reader_get_bits_uint16_unchecked (&reader, 2); GST_DEBUG ("nal_ref_idc: %u", nal_unit.ref_idc); /* read nal_unit_type */ - if (!gst_bit_reader_get_bits_uint16 (&reader, &nal_unit.type, 5)) - goto invalid_packet; + nal_unit.type = gst_bit_reader_get_bits_uint16_unchecked (&reader, 5); GST_DEBUG ("nal_unit_type: %u", nal_unit.type); if (nal_unit.type == 14 || nal_unit.type == 20) { @@ -716,7 +718,7 @@ gst_vdp_h264_dec_parse_data (GstBaseVideoDecoder * base_video_decoder, size = gst_bit_reader_get_remaining (&reader) / 8; i = size - 1; - while (size >= 0 && data[i] == 0x00) { + while ((gint) size > 0 && data[i] == 0x00) { size--; i--; } diff --git a/sys/vdpau/mpeg/gstvdpmpegdec.c b/sys/vdpau/mpeg/gstvdpmpegdec.c index 3de0eec65..96c04c8ce 100644 --- a/sys/vdpau/mpeg/gstvdpmpegdec.c +++ b/sys/vdpau/mpeg/gstvdpmpegdec.c @@ -415,12 +415,14 @@ gst_vdp_mpeg_dec_parse_data (GstBaseVideoDecoder * base_video_decoder, GstBitReader b_reader = GST_BIT_READER_INIT_FROM_BUFFER (buf); guint8 start_code; + if (gst_bit_reader_get_remaining (&b_reader) < 8 * 3 + 8) + return GST_FLOW_ERROR; + /* skip sync_code */ - gst_bit_reader_skip (&b_reader, 8 * 3); + gst_bit_reader_skip_unchecked (&b_reader, 8 * 3); /* start_code */ - if (!gst_bit_reader_get_bits_uint8 (&b_reader, &start_code, 8)) - return GST_FLOW_ERROR; + start_code = gst_bit_reader_get_bits_uint8_unchecked (&b_reader, 8); mpeg_frame = GST_VDP_MPEG_FRAME_CAST (frame); diff --git a/sys/winscreencap/Makefile.am b/sys/winscreencap/Makefile.am index d14273b38..09d80d2c0 100644 --- a/sys/winscreencap/Makefile.am +++ b/sys/winscreencap/Makefile.am @@ -1,8 +1,11 @@ -# This plugin isn't buildable with autotools at this point in time, so just -# ensure everything's listed in EXTRA_DIST +plugin_LTLIBRARIES = libgstwinscreencap.la -EXTRA_DIST = \ - gstdx9screencapsrc.c gstdx9screencapsrc.h \ - gstgdiscreencapsrc.c gstgdiscreencapsrc.h \ - gstwinscreencap.c gstwinscreencap.h +libgstwinscreencap_la_SOURCES = gstdx9screencapsrc.c gstgdiscreencapsrc.c gstwinscreencap.c +libgstwinscreencap_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \ + $(GST_PLUGINS_BASE_CFLAGS) +libgstwinscreencap_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \ + $(DIRECT3D9_LIBS) +libgstwinscreencap_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +libgstwinscreencap_la_LIBTOOLFLAGS = --tag=disable-static +noinst_HEADERS= gstwinscreencap.h diff --git a/sys/winscreencap/gstdx9screencapsrc.c b/sys/winscreencap/gstdx9screencapsrc.c index 83bcea277..5283376a1 100644 --- a/sys/winscreencap/gstdx9screencapsrc.c +++ b/sys/winscreencap/gstdx9screencapsrc.c @@ -297,14 +297,15 @@ gst_dx9screencapsrc_set_caps (GstBaseSrc * bsrc, GstCaps * caps) src->src_rect.bottom = src->src_rect.top + src->capture_h; } - if (framerate = gst_structure_get_value (structure, "framerate")) { + framerate = gst_structure_get_value (structure, "framerate"); + if (framerate) { src->rate_numerator = gst_value_get_fraction_numerator (framerate); src->rate_denominator = gst_value_get_fraction_denominator (framerate); } GST_DEBUG_OBJECT (src, "size %dx%d, %d/%d fps", - src->src_rect.right - src->src_rect.left, - src->src_rect.bottom - src->src_rect.top, + (gint) (src->src_rect.right - src->src_rect.left), + (gint) (src->src_rect.bottom - src->src_rect.top), src->rate_numerator, src->rate_denominator); return TRUE; @@ -391,26 +392,26 @@ gst_dx9screencapsrc_create_caps_from_format (D3DFORMAT fmt, depth = 15; endianness = G_BYTE_ORDER; alpha = GST_VIDEO_ALPHA_MASK_15_INT; - red = GST_VIDEO_RED_MASK_15_INT; - green = GST_VIDEO_GREEN_MASK_15_INT; - blue = GST_VIDEO_BLUE_MASK_15_INT; + red = GST_VIDEO_COMP1_MASK_15_INT; + green = GST_VIDEO_COMP2_MASK_15_INT; + blue = GST_VIDEO_COMP3_MASK_15_INT; break; case D3DFMT_X1R5G5B5: bpp = 16; depth = 15; endianness = G_BYTE_ORDER; alpha = 0; - red = GST_VIDEO_RED_MASK_15_INT; - green = GST_VIDEO_GREEN_MASK_15_INT; - blue = GST_VIDEO_BLUE_MASK_15_INT; + red = GST_VIDEO_COMP1_MASK_15_INT; + green = GST_VIDEO_COMP2_MASK_15_INT; + blue = GST_VIDEO_COMP3_MASK_15_INT; break; case D3DFMT_R5G6B5: bpp = depth = 16; endianness = G_BYTE_ORDER; alpha = 0; - red = GST_VIDEO_RED_MASK_16_INT; - green = GST_VIDEO_GREEN_MASK_16_INT; - blue = GST_VIDEO_BLUE_MASK_16_INT; + red = GST_VIDEO_COMP1_MASK_15_INT; + green = GST_VIDEO_COMP2_MASK_15_INT; + blue = GST_VIDEO_COMP3_MASK_15_INT; break; default: return NULL; @@ -479,7 +480,6 @@ static void gst_dx9screencapsrc_get_times (GstBaseSrc * basesrc, GstBuffer * buffer, GstClockTime * start, GstClockTime * end) { - GstDX9ScreenCapSrc *src = GST_DX9SCREENCAPSRC (basesrc); GstClockTime timestamp; timestamp = GST_BUFFER_TIMESTAMP (buffer); @@ -502,7 +502,8 @@ gst_dx9screencapsrc_create (GstPushSrc * push_src, GstBuffer ** buf) gint new_buf_size, i; gint width, height, stride; GstClock *clock; - GstClockTime time, buf_time; + GstClockTime time = GST_CLOCK_TIME_NONE; + GstClockTime buf_time; D3DLOCKED_RECT locked_rect; LPBYTE p_dst, p_src; HRESULT hres; @@ -537,7 +538,7 @@ gst_dx9screencapsrc_create (GstPushSrc * push_src, GstBuffer ** buf) } GST_LOG_OBJECT (src, - "creating buffer of %lu bytes with %dx%d image for frame %d", + "creating buffer of %d bytes with %dx%d image for frame %d", new_buf_size, width, height, (gint) src->frames); res = gst_pad_alloc_buffer_and_set_caps (GST_BASE_SRC_PAD (src), diff --git a/sys/winscreencap/gstgdiscreencapsrc.c b/sys/winscreencap/gstgdiscreencapsrc.c index ff9ea7b72..7658b2ea2 100644 --- a/sys/winscreencap/gstgdiscreencapsrc.c +++ b/sys/winscreencap/gstgdiscreencapsrc.c @@ -316,7 +316,8 @@ gst_gdiscreencapsrc_set_caps (GstBaseSrc * bsrc, GstCaps * caps) src->src_rect.bottom = src->src_rect.top + src->capture_h; } - if (framerate = gst_structure_get_value (structure, "framerate")) { + framerate = gst_structure_get_value (structure, "framerate"); + if (framerate) { src->rate_numerator = gst_value_get_fraction_numerator (framerate); src->rate_denominator = gst_value_get_fraction_denominator (framerate); } @@ -350,8 +351,8 @@ gst_gdiscreencapsrc_set_caps (GstBaseSrc * bsrc, GstCaps * caps) ReleaseDC (capture, device); GST_DEBUG_OBJECT (src, "size %dx%d, %d/%d fps", - src->info.bmiHeader.biWidth, - -src->info.bmiHeader.biHeight, + (gint) src->info.bmiHeader.biWidth, + (gint) (-src->info.bmiHeader.biHeight), src->rate_numerator, src->rate_denominator); return TRUE; @@ -379,7 +380,8 @@ gst_gdiscreencapsrc_get_caps (GstBaseSrc * bsrc) } GST_DEBUG ("width = %d, height=%d", - rect_dst.right - rect_dst.left, rect_dst.bottom - rect_dst.top); + (gint) (rect_dst.right - rect_dst.left), + (gint) (rect_dst.bottom - rect_dst.top)); return gst_caps_new_simple ("video/x-raw-rgb", "bpp", G_TYPE_INT, 24, @@ -417,7 +419,6 @@ static void gst_gdiscreencapsrc_get_times (GstBaseSrc * basesrc, GstBuffer * buffer, GstClockTime * start, GstClockTime * end) { - GstGDIScreenCapSrc *src = GST_GDISCREENCAPSRC (basesrc); GstClockTime timestamp; timestamp = GST_BUFFER_TIMESTAMP (buffer); @@ -439,7 +440,7 @@ gst_gdiscreencapsrc_create (GstPushSrc * push_src, GstBuffer ** buf) GstFlowReturn res; gint new_buf_size; GstClock *clock; - GstClockTime time; + GstClockTime time = GST_CLOCK_TIME_NONE; GstClockTime base_time; if (G_UNLIKELY (!src->info.bmiHeader.biWidth || @@ -456,9 +457,9 @@ gst_gdiscreencapsrc_create (GstPushSrc * push_src, GstBuffer ** buf) (-src->info.bmiHeader.biHeight); GST_LOG_OBJECT (src, - "creating buffer of %lu bytes with %dx%d image for frame %d", - new_buf_size, src->info.bmiHeader.biWidth, - -src->info.bmiHeader.biHeight, (gint) src->frames); + "creating buffer of %d bytes with %dx%d image for frame %d", + new_buf_size, (gint) src->info.bmiHeader.biWidth, + (gint) (-src->info.bmiHeader.biHeight), (gint) src->frames); res = gst_pad_alloc_buffer_and_set_caps (GST_BASE_SRC_PAD (src), |