RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-11 18:09:36 +00:00
Code Issues Projects Releases Wiki Activity

decklink: enhancement: format selection with AVRational v2

Browse Source 
When finding a video mode based on frame size and frame rate,
use AVRational methods instead of simple comparison. Add debug information.

Signed-off-by: Matthias Hunstock <atze@fem.tu-ilmenau.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Matthias Hunstock 2016-07-10 13:02:37 +02:00 committed by Michael Niedermayer
parent 8431a6e654
commit d8ee02a071
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavdevice/decklink_common.cpp
View File

@ -143,6 +143,9 @@ int ff_decklink_set_format(AVFormatContext *avctx,
int i = 1; int i = 1;
HRESULT res; HRESULT res;
av_log(avctx, AV_LOG_DEBUG, "Trying to find mode for frame size %dx%d, frame timing %d/%d, direction %d, mode number %d\n",
width, height, tb_num, tb_den, direction, num);
if (ctx->duplex_mode) { if (ctx->duplex_mode) {
DECKLINK_BOOL duplex_supported = false; DECKLINK_BOOL duplex_supported = false;
@ -178,11 +181,7 @@ int ff_decklink_set_format(AVFormatContext *avctx,
return AVERROR(EIO); return AVERROR(EIO);
} }
AVRational target_tb = av_make_q(tb_num, tb_den);
if (tb_num == 1) {
tb_num *= 1000;
tb_den *= 1000;
}
ctx->bmd_mode = bmdModeUnknown; ctx->bmd_mode = bmdModeUnknown;
while ((ctx->bmd_mode == bmdModeUnknown) && itermode->Next(&mode) == S_OK) { while ((ctx->bmd_mode == bmdModeUnknown) && itermode->Next(&mode) == S_OK) {
BMDTimeValue bmd_tb_num, bmd_tb_den; BMDTimeValue bmd_tb_num, bmd_tb_den;
@ -190,9 +189,10 @@ int ff_decklink_set_format(AVFormatContext *avctx,
int bmd_height = mode->GetHeight(); int bmd_height = mode->GetHeight();
mode->GetFrameRate(&bmd_tb_num, &bmd_tb_den); mode->GetFrameRate(&bmd_tb_num, &bmd_tb_den);
AVRational mode_tb = av_make_q(bmd_tb_num, bmd_tb_den);
if ((bmd_width == width && bmd_height == height && if ((bmd_width == width && bmd_height == height &&
bmd_tb_num == tb_num && bmd_tb_den == tb_den) || i == num) { !av_cmp_q(mode_tb, target_tb)) || i == num) {
ctx->bmd_mode = mode->GetDisplayMode(); ctx->bmd_mode = mode->GetDisplayMode();
ctx->bmd_width = bmd_width; ctx->bmd_width = bmd_width;
ctx->bmd_height = bmd_height; ctx->bmd_height = bmd_height;
@ -200,7 +200,7 @@ int ff_decklink_set_format(AVFormatContext *avctx,
ctx->bmd_tb_num = bmd_tb_num; ctx->bmd_tb_num = bmd_tb_num;
ctx->bmd_field_dominance = mode->GetFieldDominance(); ctx->bmd_field_dominance = mode->GetFieldDominance();
av_log(avctx, AV_LOG_INFO, "Found Decklink mode %d x %d with rate %.2f%s\n", av_log(avctx, AV_LOG_INFO, "Found Decklink mode %d x %d with rate %.2f%s\n",
bmd_width, bmd_height, (float)bmd_tb_den/(float)bmd_tb_num, bmd_width, bmd_height, 1/av_q2d(mode_tb),
(ctx->bmd_field_dominance==bmdLowerFieldFirst || ctx->bmd_field_dominance==bmdUpperFieldFirst)?"(i)":""); (ctx->bmd_field_dominance==bmdLowerFieldFirst || ctx->bmd_field_dominance==bmdUpperFieldFirst)?"(i)":"");
} }