scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 14:40:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

vcap/deck: separate mode name query

Browse Source 
for further use + related changes:

- if the name doesn't succeed, use "(ERROR)" placeholder but do not skip
the mode (it may be used or the situation may be evaulated rather than
skipped) -> unindent
- use snprintf_ch
- fixed clang tidy warnings
This commit is contained in:
Martin Pulec
2026-03-13 12:03:21 +01:00
parent 6f33737f3d
commit abdb7945db
1 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/video_capture/decklink.cpp
View File

@@ -1814,6 +1814,19 @@ vidcap_decklink_grab(void *state, struct audio_frame **audio)
return s->frame;
}
static string
display_mode_get_name(IDeckLinkDisplayMode *displayMode)
{
BMD_STR displayModeString = nullptr;
HRESULT result = displayMode->GetName(&displayModeString);
if (result != S_OK) {
return "(ERROR)";
}
string name = get_str_from_bmd_api_str(displayModeString);
release_bmd_api_str(displayModeString);
return name;
}
/* function from DeckLink SDK sample DeviceList */
static list<tuple<int, string, string, string>> get_input_modes (IDeckLink* deckLink)
{
@@ -1842,38 +1855,29 @@ static list<tuple<int, string, string, string>> get_input_modes (IDeckLink* deck
// List all supported output display modes
while (displayModeIterator->Next(&displayMode) == S_OK)
{
BMD_STR displayModeString = NULL;
result = displayMode->GetName((BMD_STR *) &displayModeString);
BMDTimeValue frameRateDuration = 0;
BMDTimeScale frameRateScale = 0;
if (result == S_OK)
{
BMDTimeValue frameRateDuration;
BMDTimeScale frameRateScale;
// Obtain the display mode's properties
string flags_str = bmd_get_flags_str(displayMode->GetFlags());
long modeWidth = displayMode->GetWidth();
long modeHeight = displayMode->GetHeight();
displayMode->GetFrameRate(&frameRateDuration, &frameRateScale);
uint32_t mode = ntohl(displayMode->GetDisplayMode());
uint32_t field_dominance_n = ntohl(displayMode->GetFieldDominance());
string fcc{(char *) &mode, 4};
char buf[1024];
snprintf_ch(buf,"%ld x %ld\t%2.2f FPS, flgs: %.4s, %s", modeWidth, modeHeight,
(float) ((double)frameRateScale / (double)frameRateDuration),
(char *) &field_dominance_n, flags_str.c_str());
string details{buf};
ret.emplace_back(displayModeNumber, fcc,
display_mode_get_name(displayMode), details);
// Obtain the display mode's properties
string flags_str = bmd_get_flags_str(displayMode->GetFlags());
int modeWidth = displayMode->GetWidth();
int modeHeight = displayMode->GetHeight();
displayMode->GetFrameRate(&frameRateDuration, &frameRateScale);
uint32_t mode = ntohl(displayMode->GetDisplayMode());
uint32_t field_dominance_n = ntohl(displayMode->GetFieldDominance());
string fcc{(char *) &mode, 4};
string name{get_str_from_bmd_api_str(displayModeString)};
char buf[1024];
snprintf(buf, sizeof buf, "%d x %d\t%2.2f FPS, flgs: %.4s, %s", modeWidth, modeHeight,
(float) ((double)frameRateScale / (double)frameRateDuration),
(char *) &field_dominance_n, flags_str.c_str());
string details{buf};
ret.emplace_back(displayModeNumber, fcc, name, details);
release_bmd_api_str(displayModeString);
}
// Release the IDeckLinkDisplayMode object to prevent a leak
displayMode->Release();
displayModeNumber++;
// Release the IDeckLinkDisplayMode object to prevent a leak
displayMode->Release();
displayModeNumber++;
}
bail: