virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

avdevice/decklink_dec: use decklink_ctx->raw_format as bmdPixelFormat

Browse Source 
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2020-07-15 20:23:12 +02:00
parent a9ede0bde4
commit e33c0d8c69
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavdevice/decklink_common.cpp
View File

@ -272,7 +272,7 @@ int ff_decklink_set_format(AVFormatContext *avctx,
#if BLACKMAGIC_DECKLINK_API_VERSION >= 0x0b050000 #if BLACKMAGIC_DECKLINK_API_VERSION >= 0x0b050000
if (direction == DIRECTION_IN) { if (direction == DIRECTION_IN) {
BMDDisplayMode actualMode = ctx->bmd_mode; BMDDisplayMode actualMode = ctx->bmd_mode;
if (ctx->dli->DoesSupportVideoMode(ctx->video_input, ctx->bmd_mode, (BMDPixelFormat) cctx->raw_format, if (ctx->dli->DoesSupportVideoMode(ctx->video_input, ctx->bmd_mode, ctx->raw_format,
bmdNoVideoInputConversion, bmdSupportedVideoModeDefault, bmdNoVideoInputConversion, bmdSupportedVideoModeDefault,
&actualMode, &support) != S_OK || !support || ctx->bmd_mode != actualMode) &actualMode, &support) != S_OK || !support || ctx->bmd_mode != actualMode)
return -1; return -1;
@ -286,7 +286,7 @@ int ff_decklink_set_format(AVFormatContext *avctx,
return 0; return 0;
#elif BLACKMAGIC_DECKLINK_API_VERSION >= 0x0b000000 #elif BLACKMAGIC_DECKLINK_API_VERSION >= 0x0b000000
if (direction == DIRECTION_IN) { if (direction == DIRECTION_IN) {
if (ctx->dli->DoesSupportVideoMode(ctx->video_input, ctx->bmd_mode, (BMDPixelFormat) cctx->raw_format, if (ctx->dli->DoesSupportVideoMode(ctx->video_input, ctx->bmd_mode, ctx->raw_format,
bmdSupportedVideoModeDefault, bmdSupportedVideoModeDefault,
&support) != S_OK) &support) != S_OK)
return -1; return -1;
@ -303,7 +303,7 @@ int ff_decklink_set_format(AVFormatContext *avctx,
return 0; return 0;
#else #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, ctx->raw_format,
bmdVideoOutputFlagDefault, bmdVideoOutputFlagDefault,
&support, NULL) != S_OK) &support, NULL) != S_OK)
return -1; return -1;

9
libavdevice/decklink_dec.cpp
View File

@ -1148,6 +1148,7 @@ av_cold int ff_decklink_read_header(AVFormatContext *avctx)
ctx->video_pts_source = cctx->video_pts_source; ctx->video_pts_source = cctx->video_pts_source;
ctx->draw_bars = cctx->draw_bars; ctx->draw_bars = cctx->draw_bars;
ctx->audio_depth = cctx->audio_depth; ctx->audio_depth = cctx->audio_depth;
ctx->raw_format = (BMDPixelFormat)cctx->raw_format;
cctx->ctx = ctx; cctx->ctx = ctx;
/* Check audio channel option for valid values: 2, 8 or 16 */ /* Check audio channel option for valid values: 2, 8 or 16 */
@ -1270,7 +1271,7 @@ av_cold int ff_decklink_read_header(AVFormatContext *avctx)
st->time_base.num = ctx->bmd_tb_num; st->time_base.num = ctx->bmd_tb_num;
st->r_frame_rate = av_make_q(st->time_base.den, st->time_base.num); st->r_frame_rate = av_make_q(st->time_base.den, st->time_base.num);
switch((BMDPixelFormat)cctx->raw_format) { switch(ctx->raw_format) {
case bmdFormat8BitYUV: case bmdFormat8BitYUV:
st->codecpar->codec_id = AV_CODEC_ID_RAWVIDEO; st->codecpar->codec_id = AV_CODEC_ID_RAWVIDEO;
st->codecpar->codec_tag = MKTAG('U', 'Y', 'V', 'Y'); st->codecpar->codec_tag = MKTAG('U', 'Y', 'V', 'Y');
@ -1303,7 +1304,9 @@ av_cold int ff_decklink_read_header(AVFormatContext *avctx)
st->codecpar->bits_per_coded_sample = 10; st->codecpar->bits_per_coded_sample = 10;
break; break;
default: default:
av_log(avctx, AV_LOG_ERROR, "Raw Format %.4s not supported\n", (char*) &cctx->raw_format); char fourcc_str[AV_FOURCC_MAX_STRING_SIZE] = {0};
av_fourcc_make_string(fourcc_str, ctx->raw_format);
av_log(avctx, AV_LOG_ERROR, "Raw Format %s not supported\n", fourcc_str);
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto error; goto error;
} }
@ -1364,7 +1367,7 @@ av_cold int ff_decklink_read_header(AVFormatContext *avctx)
} }
result = ctx->dli->EnableVideoInput(ctx->bmd_mode, result = ctx->dli->EnableVideoInput(ctx->bmd_mode,
(BMDPixelFormat) cctx->raw_format, ctx->raw_format,
bmdVideoInputFlagDefault); bmdVideoInputFlagDefault);
if (result != S_OK) { if (result != S_OK) {