eden-emu/FFmpeg
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

avdevice/decklink_common: add support for DeckLink SDK 11

Browse source 
Fixes ticket #7789.

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2019-03-14 01:37:11 +01:00
parent f3e22e3201
commit 63c2c83f6e
2 changed files with 55 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

53
libavdevice/decklink_common.cpp
View file

@ -81,9 +81,9 @@ static int decklink_get_attr_string(IDeckLink *dl, BMDDeckLinkAttributeID cfg_id
{ {
DECKLINK_STR tmp; DECKLINK_STR tmp;
HRESULT hr; HRESULT hr;
IDeckLinkAttributes *attr; IDeckLinkProfileAttributes *attr;
*s = NULL; *s = NULL;
if (dl->QueryInterface(IID_IDeckLinkAttributes, (void **)&attr) != S_OK) if (dl->QueryInterface(IID_IDeckLinkProfileAttributes, (void **)&attr) != S_OK)
return AVERROR_EXTERNAL; return AVERROR_EXTERNAL;
hr = attr->GetString(cfg_id, &tmp); hr = attr->GetString(cfg_id, &tmp);
attr->Release(); attr->Release();
@ -149,11 +149,28 @@ int ff_decklink_set_configs(AVFormatContext *avctx,
if (ctx->duplex_mode) { if (ctx->duplex_mode) {
DECKLINK_BOOL duplex_supported = false; DECKLINK_BOOL duplex_supported = false;
#if BLACKMAGIC_DECKLINK_API_VERSION >= 0x0b000000
IDeckLinkProfileManager *manager = NULL;
if (ctx->dl->QueryInterface(IID_IDeckLinkProfileManager, (void **)&manager) == S_OK)
duplex_supported = true;
#else
if (ctx->attr->GetFlag(BMDDeckLinkSupportsDuplexModeConfiguration, &duplex_supported) != S_OK) if (ctx->attr->GetFlag(BMDDeckLinkSupportsDuplexModeConfiguration, &duplex_supported) != S_OK)
duplex_supported = false; duplex_supported = false;
#endif
if (duplex_supported) { if (duplex_supported) {
#if BLACKMAGIC_DECKLINK_API_VERSION >= 0x0b000000
IDeckLinkProfile *profile = NULL;
BMDProfileID bmd_profile_id = ctx->duplex_mode == 2 ? bmdProfileOneSubDeviceFullDuplex : bmdProfileTwoSubDevicesHalfDuplex;
res = manager->GetProfile(bmd_profile_id, &profile);
if (res == S_OK) {
res = profile->SetActive();
profile->Release();
}
manager->Release();
#else
res = ctx->cfg->SetInt(bmdDeckLinkConfigDuplexMode, ctx->duplex_mode == 2 ? bmdDuplexModeFull : bmdDuplexModeHalf); res = ctx->cfg->SetInt(bmdDeckLinkConfigDuplexMode, ctx->duplex_mode == 2 ? bmdDuplexModeFull : bmdDuplexModeHalf);
#endif
if (res != S_OK) if (res != S_OK)
av_log(avctx, AV_LOG_WARNING, "Setting duplex mode failed.\n"); av_log(avctx, AV_LOG_WARNING, "Setting duplex mode failed.\n");
else else
@ -187,7 +204,11 @@ int ff_decklink_set_format(AVFormatContext *avctx,
{ {
struct decklink_cctx *cctx = (struct decklink_cctx *)avctx->priv_data; struct decklink_cctx *cctx = (struct decklink_cctx *)avctx->priv_data;
struct decklink_ctx *ctx = (struct decklink_ctx *)cctx->ctx; struct decklink_ctx *ctx = (struct decklink_ctx *)cctx->ctx;
#if BLACKMAGIC_DECKLINK_API_VERSION >= 0x0b000000
DECKLINK_BOOL support;
#else
BMDDisplayModeSupport support; BMDDisplayModeSupport support;
#endif
IDeckLinkDisplayModeIterator *itermode; IDeckLinkDisplayModeIterator *itermode;
IDeckLinkDisplayMode *mode; IDeckLinkDisplayMode *mode;
int i = 1; int i = 1;
@ -248,6 +269,31 @@ int ff_decklink_set_format(AVFormatContext *avctx,
if (ctx->bmd_mode == bmdModeUnknown) if (ctx->bmd_mode == bmdModeUnknown)
return -1; return -1;
#if BLACKMAGIC_DECKLINK_API_VERSION >= 0x0b000000
if (direction == DIRECTION_IN) {
if (ctx->dli->DoesSupportVideoMode(ctx->video_input, ctx->bmd_mode, (BMDPixelFormat) cctx->raw_format,
bmdVideoInputFlagDefault,
&support) != S_OK)
return -1;
} else {
BMDDisplayMode actualMode = ctx->bmd_mode;
if (!ctx->supports_vanc || ctx->dlo->DoesSupportVideoMode(bmdVideoConnectionUnspecified, ctx->bmd_mode, ctx->raw_format,
bmdVideoOutputVANC,
&actualMode, &support) != S_OK || !support || ctx->bmd_mode != actualMode) {
/* Try without VANC enabled */
if (ctx->dlo->DoesSupportVideoMode(bmdVideoConnectionUnspecified, ctx->bmd_mode, ctx->raw_format,
bmdVideoOutputFlagDefault,
&actualMode, &support) != S_OK || !support || ctx->bmd_mode != actualMode) {
return -1;
}
ctx->supports_vanc = 0;
}
}
if (support)
return 0;
#else
if (direction == DIRECTION_IN) { if (direction == DIRECTION_IN) {
if (ctx->dli->DoesSupportVideoMode(ctx->bmd_mode, (BMDPixelFormat) cctx->raw_format, if (ctx->dli->DoesSupportVideoMode(ctx->bmd_mode, (BMDPixelFormat) cctx->raw_format,
bmdVideoOutputFlagDefault, bmdVideoOutputFlagDefault,
@ -269,6 +315,7 @@ int ff_decklink_set_format(AVFormatContext *avctx,
} }
if (support == bmdDisplayModeSupported) if (support == bmdDisplayModeSupported)
return 0; return 0;
#endif
return -1; return -1;
} }
@ -473,7 +520,7 @@ int ff_decklink_init_device(AVFormatContext *avctx, const char* name)
return AVERROR_EXTERNAL; return AVERROR_EXTERNAL;
} }
if (ctx->dl->QueryInterface(IID_IDeckLinkAttributes, (void **)&ctx->attr) != S_OK) { if (ctx->dl->QueryInterface(IID_IDeckLinkProfileAttributes, (void **)&ctx->attr) != S_OK) {
av_log(avctx, AV_LOG_ERROR, "Could not get attributes interface for '%s'\n", name); av_log(avctx, AV_LOG_ERROR, "Could not get attributes interface for '%s'\n", name);
ff_decklink_cleanup(avctx); ff_decklink_cleanup(avctx);
return AVERROR_EXTERNAL; return AVERROR_EXTERNAL;

6
libavdevice/decklink_common.h
View file

@ -24,6 +24,10 @@
#define AVDEVICE_DECKLINK_COMMON_H #define AVDEVICE_DECKLINK_COMMON_H
#include <DeckLinkAPIVersion.h> #include <DeckLinkAPIVersion.h>
#if BLACKMAGIC_DECKLINK_API_VERSION < 0x0b000000
#define IID_IDeckLinkProfileAttributes IID_IDeckLinkAttributes
#define IDeckLinkProfileAttributes IDeckLinkAttributes
#endif
#include "libavutil/thread.h" #include "libavutil/thread.h"
#include "decklink_common_c.h" #include "decklink_common_c.h"
@ -87,7 +91,7 @@ struct decklink_ctx {
IDeckLinkOutput *dlo; IDeckLinkOutput *dlo;
IDeckLinkInput *dli; IDeckLinkInput *dli;
IDeckLinkConfiguration *cfg; IDeckLinkConfiguration *cfg;
IDeckLinkAttributes *attr; IDeckLinkProfileAttributes *attr;
decklink_output_callback *output_callback; decklink_output_callback *output_callback;
/* DeckLink mode information */ /* DeckLink mode information */