mirror of
https://github.com/nyanmisaka/ffmpeg-rockchip.git
synced 2025-10-23 17:05:00 +08:00
avdevice/decklink: Add support for EIA-708 output over SDI
Hook in libklvanc and use it for output of EIA-708 captions over SDI. The bulk of this patch is just general support for ancillary data for the Decklink SDI module - the real work for construction of the EIA-708 CDP and VANC line construction is done by libklvanc. Libklvanc can be found at: https://github.com/stoth68000/libklvanc Updated to reflect feedback from Marton Balint <cus@passwd.hu>, Carl Eugen Hoyos <ceffmpeg@gmail.com>, Aaron Levinson <alevinsn_dev@levland.net>, and Moritz Barsnick <barsnick@gmx.net> Signed-off-by: Devin Heitmueller <dheitmueller@ltnglobal.com> Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:

committed by
Marton Balint

parent
6a9abe9ec3
commit
8732dfa995
4
configure
vendored
4
configure
vendored
@@ -239,6 +239,7 @@ External library support:
|
|||||||
--enable-libiec61883 enable iec61883 via libiec61883 [no]
|
--enable-libiec61883 enable iec61883 via libiec61883 [no]
|
||||||
--enable-libilbc enable iLBC de/encoding via libilbc [no]
|
--enable-libilbc enable iLBC de/encoding via libilbc [no]
|
||||||
--enable-libjack enable JACK audio sound server [no]
|
--enable-libjack enable JACK audio sound server [no]
|
||||||
|
--enable-libklvanc enable Kernel Labs VANC processing [no]
|
||||||
--enable-libkvazaar enable HEVC encoding via libkvazaar [no]
|
--enable-libkvazaar enable HEVC encoding via libkvazaar [no]
|
||||||
--enable-liblensfun enable lensfun lens correction [no]
|
--enable-liblensfun enable lensfun lens correction [no]
|
||||||
--enable-libmodplug enable ModPlug via libmodplug [no]
|
--enable-libmodplug enable ModPlug via libmodplug [no]
|
||||||
@@ -1720,6 +1721,7 @@ EXTERNAL_LIBRARY_LIST="
|
|||||||
libiec61883
|
libiec61883
|
||||||
libilbc
|
libilbc
|
||||||
libjack
|
libjack
|
||||||
|
libklvanc
|
||||||
libkvazaar
|
libkvazaar
|
||||||
libmodplug
|
libmodplug
|
||||||
libmp3lame
|
libmp3lame
|
||||||
@@ -3234,6 +3236,7 @@ decklink_deps_any="libdl LoadLibrary"
|
|||||||
decklink_indev_deps="decklink threads"
|
decklink_indev_deps="decklink threads"
|
||||||
decklink_indev_extralibs="-lstdc++"
|
decklink_indev_extralibs="-lstdc++"
|
||||||
decklink_outdev_deps="decklink threads"
|
decklink_outdev_deps="decklink threads"
|
||||||
|
decklink_outdev_suggest="libklvanc"
|
||||||
decklink_outdev_extralibs="-lstdc++"
|
decklink_outdev_extralibs="-lstdc++"
|
||||||
libndi_newtek_indev_deps="libndi_newtek"
|
libndi_newtek_indev_deps="libndi_newtek"
|
||||||
libndi_newtek_indev_extralibs="-lndi"
|
libndi_newtek_indev_extralibs="-lndi"
|
||||||
@@ -6069,6 +6072,7 @@ enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
|
|||||||
check_lib libgsm "${gsm_hdr}" gsm_create -lgsm && break;
|
check_lib libgsm "${gsm_hdr}" gsm_create -lgsm && break;
|
||||||
done || die "ERROR: libgsm not found"; }
|
done || die "ERROR: libgsm not found"; }
|
||||||
enabled libilbc && require libilbc ilbc.h WebRtcIlbcfix_InitDecode -lilbc $pthreads_extralibs
|
enabled libilbc && require libilbc ilbc.h WebRtcIlbcfix_InitDecode -lilbc $pthreads_extralibs
|
||||||
|
enabled libklvanc && require libklvanc libklvanc/vanc.h klvanc_context_create -lklvanc
|
||||||
enabled libkvazaar && require_pkg_config libkvazaar "kvazaar >= 0.8.1" kvazaar.h kvz_api_get
|
enabled libkvazaar && require_pkg_config libkvazaar "kvazaar >= 0.8.1" kvazaar.h kvz_api_get
|
||||||
enabled liblensfun && require_pkg_config liblensfun lensfun lensfun.h lf_db_new
|
enabled liblensfun && require_pkg_config liblensfun lensfun lensfun.h lf_db_new
|
||||||
# While it may appear that require is being used as a pkg-config
|
# While it may appear that require is being used as a pkg-config
|
||||||
|
@@ -239,10 +239,18 @@ int ff_decklink_set_format(AVFormatContext *avctx,
|
|||||||
&support, NULL) != S_OK)
|
&support, NULL) != S_OK)
|
||||||
return -1;
|
return -1;
|
||||||
} else {
|
} else {
|
||||||
if (ctx->dlo->DoesSupportVideoMode(ctx->bmd_mode, bmdFormat8BitYUV,
|
if (!ctx->supports_vanc || ctx->dlo->DoesSupportVideoMode(ctx->bmd_mode, ctx->raw_format,
|
||||||
bmdVideoOutputFlagDefault,
|
bmdVideoOutputVANC,
|
||||||
&support, NULL) != S_OK)
|
&support, NULL) != S_OK) {
|
||||||
return -1;
|
/* Try without VANC enabled */
|
||||||
|
if (ctx->dlo->DoesSupportVideoMode(ctx->bmd_mode, ctx->raw_format,
|
||||||
|
bmdVideoOutputFlagDefault,
|
||||||
|
&support, NULL) != S_OK) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
ctx->supports_vanc = 0;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
if (support == bmdDisplayModeSupported)
|
if (support == bmdDisplayModeSupported)
|
||||||
return 0;
|
return 0;
|
||||||
|
@@ -27,6 +27,9 @@
|
|||||||
|
|
||||||
#include "libavutil/thread.h"
|
#include "libavutil/thread.h"
|
||||||
#include "decklink_common_c.h"
|
#include "decklink_common_c.h"
|
||||||
|
#if CONFIG_LIBKLVANC
|
||||||
|
#include "libklvanc/vanc.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#define DECKLINK_BOOL BOOL
|
#define DECKLINK_BOOL BOOL
|
||||||
@@ -97,6 +100,7 @@ struct decklink_ctx {
|
|||||||
int bmd_width;
|
int bmd_width;
|
||||||
int bmd_height;
|
int bmd_height;
|
||||||
int bmd_field_dominance;
|
int bmd_field_dominance;
|
||||||
|
int supports_vanc;
|
||||||
|
|
||||||
/* Capture buffer queue */
|
/* Capture buffer queue */
|
||||||
AVPacketQueue queue;
|
AVPacketQueue queue;
|
||||||
@@ -114,6 +118,7 @@ struct decklink_ctx {
|
|||||||
AVStream *audio_st;
|
AVStream *audio_st;
|
||||||
AVStream *video_st;
|
AVStream *video_st;
|
||||||
AVStream *teletext_st;
|
AVStream *teletext_st;
|
||||||
|
uint16_t cdp_sequence_num;
|
||||||
|
|
||||||
/* Options */
|
/* Options */
|
||||||
int list_devices;
|
int list_devices;
|
||||||
@@ -124,6 +129,7 @@ struct decklink_ctx {
|
|||||||
DecklinkPtsSource audio_pts_source;
|
DecklinkPtsSource audio_pts_source;
|
||||||
DecklinkPtsSource video_pts_source;
|
DecklinkPtsSource video_pts_source;
|
||||||
int draw_bars;
|
int draw_bars;
|
||||||
|
BMDPixelFormat raw_format;
|
||||||
|
|
||||||
int frames_preroll;
|
int frames_preroll;
|
||||||
int frames_buffer;
|
int frames_buffer;
|
||||||
@@ -133,6 +139,10 @@ struct decklink_ctx {
|
|||||||
int frames_buffer_available_spots;
|
int frames_buffer_available_spots;
|
||||||
int autodetect;
|
int autodetect;
|
||||||
|
|
||||||
|
#if CONFIG_LIBKLVANC
|
||||||
|
struct klvanc_context_s *vanc_ctx;
|
||||||
|
#endif
|
||||||
|
|
||||||
int channels;
|
int channels;
|
||||||
int audio_depth;
|
int audio_depth;
|
||||||
};
|
};
|
||||||
|
@@ -38,17 +38,20 @@ extern "C" {
|
|||||||
|
|
||||||
#include "decklink_common.h"
|
#include "decklink_common.h"
|
||||||
#include "decklink_enc.h"
|
#include "decklink_enc.h"
|
||||||
|
#if CONFIG_LIBKLVANC
|
||||||
|
#include "libklvanc/vanc.h"
|
||||||
|
#include "libklvanc/vanc-lines.h"
|
||||||
|
#include "libklvanc/pixels.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
/* DeckLink callback class declaration */
|
/* DeckLink callback class declaration */
|
||||||
class decklink_frame : public IDeckLinkVideoFrame
|
class decklink_frame : public IDeckLinkVideoFrame
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
decklink_frame(struct decklink_ctx *ctx, AVFrame *avframe, AVCodecID codec_id, int height, int width) :
|
decklink_frame(struct decklink_ctx *ctx, AVFrame *avframe, AVCodecID codec_id, int height, int width) :
|
||||||
_ctx(ctx), _avframe(avframe), _avpacket(NULL), _codec_id(codec_id), _height(height), _width(width), _refs(1) { }
|
_ctx(ctx), _avframe(avframe), _avpacket(NULL), _codec_id(codec_id), _ancillary(NULL), _height(height), _width(width), _refs(1) { }
|
||||||
decklink_frame(struct decklink_ctx *ctx, AVPacket *avpacket, AVCodecID codec_id, int height, int width) :
|
decklink_frame(struct decklink_ctx *ctx, AVPacket *avpacket, AVCodecID codec_id, int height, int width) :
|
||||||
_ctx(ctx), _avframe(NULL), _avpacket(avpacket), _codec_id(codec_id), _height(height), _width(width), _refs(1) { }
|
_ctx(ctx), _avframe(NULL), _avpacket(avpacket), _codec_id(codec_id), _ancillary(NULL), _height(height), _width(width), _refs(1) { }
|
||||||
|
|
||||||
virtual long STDMETHODCALLTYPE GetWidth (void) { return _width; }
|
virtual long STDMETHODCALLTYPE GetWidth (void) { return _width; }
|
||||||
virtual long STDMETHODCALLTYPE GetHeight (void) { return _height; }
|
virtual long STDMETHODCALLTYPE GetHeight (void) { return _height; }
|
||||||
virtual long STDMETHODCALLTYPE GetRowBytes (void)
|
virtual long STDMETHODCALLTYPE GetRowBytes (void)
|
||||||
@@ -87,8 +90,24 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
virtual HRESULT STDMETHODCALLTYPE GetTimecode (BMDTimecodeFormat format, IDeckLinkTimecode **timecode) { return S_FALSE; }
|
virtual HRESULT STDMETHODCALLTYPE GetTimecode (BMDTimecodeFormat format, IDeckLinkTimecode **timecode) { return S_FALSE; }
|
||||||
virtual HRESULT STDMETHODCALLTYPE GetAncillaryData(IDeckLinkVideoFrameAncillary **ancillary) { return S_FALSE; }
|
virtual HRESULT STDMETHODCALLTYPE GetAncillaryData(IDeckLinkVideoFrameAncillary **ancillary)
|
||||||
|
{
|
||||||
|
*ancillary = _ancillary;
|
||||||
|
if (_ancillary) {
|
||||||
|
_ancillary->AddRef();
|
||||||
|
return S_OK;
|
||||||
|
} else {
|
||||||
|
return S_FALSE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
virtual HRESULT STDMETHODCALLTYPE SetAncillaryData(IDeckLinkVideoFrameAncillary *ancillary)
|
||||||
|
{
|
||||||
|
if (_ancillary)
|
||||||
|
_ancillary->Release();
|
||||||
|
_ancillary = ancillary;
|
||||||
|
_ancillary->AddRef();
|
||||||
|
return S_OK;
|
||||||
|
}
|
||||||
virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, LPVOID *ppv) { return E_NOINTERFACE; }
|
virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, LPVOID *ppv) { return E_NOINTERFACE; }
|
||||||
virtual ULONG STDMETHODCALLTYPE AddRef(void) { return ++_refs; }
|
virtual ULONG STDMETHODCALLTYPE AddRef(void) { return ++_refs; }
|
||||||
virtual ULONG STDMETHODCALLTYPE Release(void)
|
virtual ULONG STDMETHODCALLTYPE Release(void)
|
||||||
@@ -97,6 +116,8 @@ public:
|
|||||||
if (!ret) {
|
if (!ret) {
|
||||||
av_frame_free(&_avframe);
|
av_frame_free(&_avframe);
|
||||||
av_packet_free(&_avpacket);
|
av_packet_free(&_avpacket);
|
||||||
|
if (_ancillary)
|
||||||
|
_ancillary->Release();
|
||||||
delete this;
|
delete this;
|
||||||
}
|
}
|
||||||
return ret;
|
return ret;
|
||||||
@@ -106,6 +127,7 @@ public:
|
|||||||
AVFrame *_avframe;
|
AVFrame *_avframe;
|
||||||
AVPacket *_avpacket;
|
AVPacket *_avpacket;
|
||||||
AVCodecID _codec_id;
|
AVCodecID _codec_id;
|
||||||
|
IDeckLinkVideoFrameAncillary *_ancillary;
|
||||||
int _height;
|
int _height;
|
||||||
int _width;
|
int _width;
|
||||||
|
|
||||||
@@ -156,10 +178,13 @@ static int decklink_setup_video(AVFormatContext *avctx, AVStream *st)
|
|||||||
" Only AV_PIX_FMT_UYVY422 is supported.\n");
|
" Only AV_PIX_FMT_UYVY422 is supported.\n");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
ctx->raw_format = bmdFormat8BitYUV;
|
||||||
} else if (c->codec_id != AV_CODEC_ID_V210) {
|
} else if (c->codec_id != AV_CODEC_ID_V210) {
|
||||||
av_log(avctx, AV_LOG_ERROR, "Unsupported codec type!"
|
av_log(avctx, AV_LOG_ERROR, "Unsupported codec type!"
|
||||||
" Only V210 and wrapped frame with AV_PIX_FMT_UYVY422 are supported.\n");
|
" Only V210 and wrapped frame with AV_PIX_FMT_UYVY422 are supported.\n");
|
||||||
return -1;
|
return -1;
|
||||||
|
} else {
|
||||||
|
ctx->raw_format = bmdFormat10BitYUV;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ff_decklink_set_configs(avctx, DIRECTION_OUT) < 0) {
|
if (ff_decklink_set_configs(avctx, DIRECTION_OUT) < 0) {
|
||||||
@@ -173,7 +198,7 @@ static int decklink_setup_video(AVFormatContext *avctx, AVStream *st)
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
if (ctx->dlo->EnableVideoOutput(ctx->bmd_mode,
|
if (ctx->dlo->EnableVideoOutput(ctx->bmd_mode,
|
||||||
bmdVideoOutputFlagDefault) != S_OK) {
|
ctx->supports_vanc ? bmdVideoOutputVANC : bmdVideoOutputFlagDefault) != S_OK) {
|
||||||
av_log(avctx, AV_LOG_ERROR, "Could not enable video output!\n");
|
av_log(avctx, AV_LOG_ERROR, "Could not enable video output!\n");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
@@ -267,11 +292,139 @@ av_cold int ff_decklink_write_trailer(AVFormatContext *avctx)
|
|||||||
pthread_mutex_destroy(&ctx->mutex);
|
pthread_mutex_destroy(&ctx->mutex);
|
||||||
pthread_cond_destroy(&ctx->cond);
|
pthread_cond_destroy(&ctx->cond);
|
||||||
|
|
||||||
|
#if CONFIG_LIBKLVANC
|
||||||
|
klvanc_context_destroy(ctx->vanc_ctx);
|
||||||
|
#endif
|
||||||
|
|
||||||
av_freep(&cctx->ctx);
|
av_freep(&cctx->ctx);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if CONFIG_LIBKLVANC
|
||||||
|
static void construct_cc(AVFormatContext *avctx, struct decklink_ctx *ctx,
|
||||||
|
AVPacket *pkt, struct klvanc_line_set_s *vanc_lines)
|
||||||
|
{
|
||||||
|
struct klvanc_packet_eia_708b_s *cdp;
|
||||||
|
uint16_t *cdp_words;
|
||||||
|
uint16_t len;
|
||||||
|
uint8_t cc_count;
|
||||||
|
int size, ret, i;
|
||||||
|
|
||||||
|
const uint8_t *data = av_packet_get_side_data(pkt, AV_PKT_DATA_A53_CC, &size);
|
||||||
|
if (!data)
|
||||||
|
return;
|
||||||
|
|
||||||
|
cc_count = size / 3;
|
||||||
|
|
||||||
|
ret = klvanc_create_eia708_cdp(&cdp);
|
||||||
|
if (ret)
|
||||||
|
return;
|
||||||
|
|
||||||
|
ret = klvanc_set_framerate_EIA_708B(cdp, ctx->bmd_tb_num, ctx->bmd_tb_den);
|
||||||
|
if (ret) {
|
||||||
|
av_log(avctx, AV_LOG_ERROR, "Invalid framerate specified: %lld/%lld\n",
|
||||||
|
ctx->bmd_tb_num, ctx->bmd_tb_den);
|
||||||
|
klvanc_destroy_eia708_cdp(cdp);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (cc_count > KLVANC_MAX_CC_COUNT) {
|
||||||
|
av_log(avctx, AV_LOG_ERROR, "Illegal cc_count received: %d\n", cc_count);
|
||||||
|
cc_count = KLVANC_MAX_CC_COUNT;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* CC data */
|
||||||
|
cdp->header.ccdata_present = 1;
|
||||||
|
cdp->header.caption_service_active = 1;
|
||||||
|
cdp->ccdata.cc_count = cc_count;
|
||||||
|
for (i = 0; i < cc_count; i++) {
|
||||||
|
if (data [3*i] & 0x04)
|
||||||
|
cdp->ccdata.cc[i].cc_valid = 1;
|
||||||
|
cdp->ccdata.cc[i].cc_type = data[3*i] & 0x03;
|
||||||
|
cdp->ccdata.cc[i].cc_data[0] = data[3*i+1];
|
||||||
|
cdp->ccdata.cc[i].cc_data[1] = data[3*i+2];
|
||||||
|
}
|
||||||
|
|
||||||
|
klvanc_finalize_EIA_708B(cdp, ctx->cdp_sequence_num++);
|
||||||
|
ret = klvanc_convert_EIA_708B_to_words(cdp, &cdp_words, &len);
|
||||||
|
klvanc_destroy_eia708_cdp(cdp);
|
||||||
|
if (ret != 0) {
|
||||||
|
av_log(avctx, AV_LOG_ERROR, "Failed converting 708 packet to words\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
ret = klvanc_line_insert(ctx->vanc_ctx, vanc_lines, cdp_words, len, 11, 0);
|
||||||
|
free(cdp_words);
|
||||||
|
if (ret != 0) {
|
||||||
|
av_log(avctx, AV_LOG_ERROR, "VANC line insertion failed\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static int decklink_construct_vanc(AVFormatContext *avctx, struct decklink_ctx *ctx,
|
||||||
|
AVPacket *pkt, decklink_frame *frame)
|
||||||
|
{
|
||||||
|
struct klvanc_line_set_s vanc_lines = { 0 };
|
||||||
|
int ret = 0, i;
|
||||||
|
|
||||||
|
if (!ctx->supports_vanc)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
construct_cc(avctx, ctx, pkt, &vanc_lines);
|
||||||
|
|
||||||
|
IDeckLinkVideoFrameAncillary *vanc;
|
||||||
|
int result = ctx->dlo->CreateAncillaryData(bmdFormat10BitYUV, &vanc);
|
||||||
|
if (result != S_OK) {
|
||||||
|
av_log(avctx, AV_LOG_ERROR, "Failed to create vanc\n");
|
||||||
|
ret = AVERROR(EIO);
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Now that we've got all the VANC lines in a nice orderly manner, generate the
|
||||||
|
final VANC sections for the Decklink output */
|
||||||
|
for (i = 0; i < vanc_lines.num_lines; i++) {
|
||||||
|
struct klvanc_line_s *line = vanc_lines.lines[i];
|
||||||
|
int real_line;
|
||||||
|
void *buf;
|
||||||
|
|
||||||
|
if (!line)
|
||||||
|
break;
|
||||||
|
|
||||||
|
/* FIXME: include hack for certain Decklink cards which mis-represent
|
||||||
|
line numbers for pSF frames */
|
||||||
|
real_line = line->line_number;
|
||||||
|
|
||||||
|
result = vanc->GetBufferForVerticalBlankingLine(real_line, &buf);
|
||||||
|
if (result != S_OK) {
|
||||||
|
av_log(avctx, AV_LOG_ERROR, "Failed to get VANC line %d: %d", real_line, result);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Generate the full line taking into account all VANC packets on that line */
|
||||||
|
result = klvanc_generate_vanc_line_v210(ctx->vanc_ctx, line, (uint8_t *) buf,
|
||||||
|
ctx->bmd_width);
|
||||||
|
if (result) {
|
||||||
|
av_log(avctx, AV_LOG_ERROR, "Failed to generate VANC line\n");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
result = frame->SetAncillaryData(vanc);
|
||||||
|
vanc->Release();
|
||||||
|
if (result != S_OK) {
|
||||||
|
av_log(avctx, AV_LOG_ERROR, "Failed to set vanc: %d", result);
|
||||||
|
ret = AVERROR(EIO);
|
||||||
|
}
|
||||||
|
|
||||||
|
done:
|
||||||
|
for (i = 0; i < vanc_lines.num_lines; i++)
|
||||||
|
klvanc_line_free(vanc_lines.lines[i]);
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
static int decklink_write_video_packet(AVFormatContext *avctx, AVPacket *pkt)
|
static int decklink_write_video_packet(AVFormatContext *avctx, AVPacket *pkt)
|
||||||
{
|
{
|
||||||
struct decklink_cctx *cctx = (struct decklink_cctx *)avctx->priv_data;
|
struct decklink_cctx *cctx = (struct decklink_cctx *)avctx->priv_data;
|
||||||
@@ -306,6 +459,11 @@ static int decklink_write_video_packet(AVFormatContext *avctx, AVPacket *pkt)
|
|||||||
}
|
}
|
||||||
|
|
||||||
frame = new decklink_frame(ctx, avpacket, st->codecpar->codec_id, ctx->bmd_height, ctx->bmd_width);
|
frame = new decklink_frame(ctx, avpacket, st->codecpar->codec_id, ctx->bmd_height, ctx->bmd_width);
|
||||||
|
|
||||||
|
#if CONFIG_LIBKLVANC
|
||||||
|
if (decklink_construct_vanc(avctx, ctx, pkt, frame))
|
||||||
|
av_log(avctx, AV_LOG_ERROR, "Failed to construct VANC\n");
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!frame) {
|
if (!frame) {
|
||||||
@@ -397,6 +555,13 @@ av_cold int ff_decklink_write_header(AVFormatContext *avctx)
|
|||||||
ctx->preroll = cctx->preroll;
|
ctx->preroll = cctx->preroll;
|
||||||
ctx->duplex_mode = cctx->duplex_mode;
|
ctx->duplex_mode = cctx->duplex_mode;
|
||||||
cctx->ctx = ctx;
|
cctx->ctx = ctx;
|
||||||
|
#if CONFIG_LIBKLVANC
|
||||||
|
if (klvanc_context_create(&ctx->vanc_ctx) < 0) {
|
||||||
|
av_log(avctx, AV_LOG_ERROR, "Cannot create VANC library context\n");
|
||||||
|
return AVERROR(ENOMEM);
|
||||||
|
}
|
||||||
|
ctx->supports_vanc = 1;
|
||||||
|
#endif
|
||||||
|
|
||||||
/* List available devices and exit. */
|
/* List available devices and exit. */
|
||||||
if (ctx->list_devices) {
|
if (ctx->list_devices) {
|
||||||
|
@@ -29,7 +29,7 @@
|
|||||||
|
|
||||||
#define LIBAVDEVICE_VERSION_MAJOR 58
|
#define LIBAVDEVICE_VERSION_MAJOR 58
|
||||||
#define LIBAVDEVICE_VERSION_MINOR 4
|
#define LIBAVDEVICE_VERSION_MINOR 4
|
||||||
#define LIBAVDEVICE_VERSION_MICRO 102
|
#define LIBAVDEVICE_VERSION_MICRO 103
|
||||||
|
|
||||||
#define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \
|
#define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \
|
||||||
LIBAVDEVICE_VERSION_MINOR, \
|
LIBAVDEVICE_VERSION_MINOR, \
|
||||||
|
Reference in New Issue
Block a user