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

aja: do not use CNTV2DeviceScanner::GetDeviceInfoList

Browse Source 
deprecated and removed from lib (undefined reference, at least in mac)
This commit is contained in:
Martin Pulec
2024-07-25 12:11:19 +02:00
parent 6d9f0618ed
commit 0ef9f00a4e
2 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/video_capture/aja.cpp
View File

@@ -353,7 +353,6 @@ void vidcap_state_aja::Init()
// Using a reference to the discovered device list, // Using a reference to the discovered device list,
// and the index number of the device of interest (mDeviceIndex), // and the index number of the device of interest (mDeviceIndex),
// get information about that particular device... // get information about that particular device...
NTV2DeviceInfo info (deviceScanner.GetDeviceInfoList () [mDeviceIndex]);
if (!mDevice.Open (mDeviceIndex)) if (!mDevice.Open (mDeviceIndex))
throw string("Unable to open device."); throw string("Unable to open device.");
@@ -1058,10 +1057,18 @@ static void show_help() {
printf("Available devices:\n"); printf("Available devices:\n");
CNTV2DeviceScanner deviceScanner; CNTV2DeviceScanner deviceScanner;
for (unsigned int i = 0; i < deviceScanner.GetNumDevices (); i++) { for (unsigned int i = 0; i < deviceScanner.GetNumDevices (); i++) {
NTV2DeviceInfo info (deviceScanner.GetDeviceInfoList () [i]); CNTV2Card device;
col() << "\t" << SBOLD(i) << ") " << SBOLD(info.deviceIdentifier) << ". " << info; if (!CNTV2DeviceScanner::GetDeviceAtIndex(i, device)) {
MSG(WARNING, "Cannot get device at index #%u!\n", i);
continue;
}
col() << "\t" << SBOLD(i) << ") "
<< SBOLD(device.GetDisplayName()) << ". "
<< device.GetDescription() << "\n";
const NTV2DeviceID deviceID = device.GetBaseDeviceID();
NTV2VideoFormatSet fmt_set; NTV2VideoFormatSet fmt_set;
if (NTV2DeviceGetSupportedVideoFormats(info.deviceID, fmt_set)) { if (NTV2DeviceGetSupportedVideoFormats(deviceID, fmt_set)) {
col() << SUNDERLINE("\tAvailable formats:"); col() << SUNDERLINE("\tAvailable formats:");
for (auto fmt : fmt_set) { for (auto fmt : fmt_set) {
if (fmt != *fmt_set.begin()) { if (fmt != *fmt_set.begin()) {
@@ -1073,8 +1080,8 @@ static void show_help() {
col() << "\n"; col() << "\n";
} }
NTV2FrameBufferFormatSet pix_fmts; NTV2FrameBufferFormatSet pix_fmts;
if (NTV2DeviceGetSupportedPixelFormats(info.deviceID, pix_fmts)) { if (NTV2DeviceGetSupportedPixelFormats(deviceID, pix_fmts)) {
if (pix_fmts.count(NTV2_FBF_10BIT_YCBCR) == 0 && NTV2DeviceCanDoFrameBufferFormat(info.deviceID, NTV2_FBF_10BIT_YCBCR)) { if (pix_fmts.count(NTV2_FBF_10BIT_YCBCR) == 0 && NTV2DeviceCanDoFrameBufferFormat(deviceID, NTV2_FBF_10BIT_YCBCR)) {
pix_fmts.insert(NTV2_FBF_10BIT_YCBCR); // workaround NTV2 bug pix_fmts.insert(NTV2_FBF_10BIT_YCBCR); // workaround NTV2 bug
} }
col() << SUNDERLINE("\tAvailable pixel formats:"); col() << SUNDERLINE("\tAvailable pixel formats:");
@@ -1096,7 +1103,7 @@ static void show_help() {
} }
col() << "\n"; col() << "\n";
} }
col() << SUNDERLINE("\tNumber of frame stores: ") << NTV2DeviceGetNumFrameStores (info.deviceID) << "\n"; col() << SUNDERLINE("\tNumber of frame stores: ") << NTV2DeviceGetNumFrameStores (deviceID) << "\n";
} }
if (deviceScanner.GetNumDevices() == 0) { if (deviceScanner.GetNumDevices() == 0) {
col() << SUNDERLINE("\tno devices found") "\n"; col() << SUNDERLINE("\tno devices found") "\n";
@@ -1164,7 +1171,11 @@ LINK_SPEC void vidcap_aja_probe(device_info **available_cards, int *count, void
CNTV2DeviceScanner deviceScanner; CNTV2DeviceScanner deviceScanner;
for (unsigned int i = 0; i < deviceScanner.GetNumDevices (); i++) { for (unsigned int i = 0; i < deviceScanner.GetNumDevices (); i++) {
NTV2DeviceInfo info (deviceScanner.GetDeviceInfoList () [i]); CNTV2Card device;
if (!CNTV2DeviceScanner::GetDeviceAtIndex(i, device)) {
MSG(WARNING, "Cannot get device at index #%u!\n", i);
continue;
}
card_count += 1; card_count += 1;
cards = (struct device_info *) cards = (struct device_info *)
realloc(cards, card_count * sizeof(struct device_info)); realloc(cards, card_count * sizeof(struct device_info));
@@ -1172,7 +1183,7 @@ LINK_SPEC void vidcap_aja_probe(device_info **available_cards, int *count, void
snprintf(cards[card_count - 1].dev, sizeof cards[card_count - 1].dev, snprintf(cards[card_count - 1].dev, sizeof cards[card_count - 1].dev,
":device=%d", i); ":device=%d", i);
snprintf(cards[card_count - 1].name, sizeof cards[card_count - 1].name, snprintf(cards[card_count - 1].name, sizeof cards[card_count - 1].name,
"AJA %s", info.deviceIdentifier.c_str()); "AJA %s", device.GetDisplayName().c_str());
snprintf(cards[card_count - 1].extra, sizeof cards[card_count - 1].extra, snprintf(cards[card_count - 1].extra, sizeof cards[card_count - 1].extra,
"\"embeddedAudioAvailable\":\"t\""); "\"embeddedAudioAvailable\":\"t\"");
} }

21
src/video_display/aja.cpp
View File

@@ -786,8 +786,15 @@ void aja::display::show_help() {
CNTV2DeviceScanner deviceScanner; CNTV2DeviceScanner deviceScanner;
for (unsigned int i = 0; i < deviceScanner.GetNumDevices (); i++) { for (unsigned int i = 0; i < deviceScanner.GetNumDevices (); i++) {
NTV2DeviceInfo info (deviceScanner.GetDeviceInfoList () [i]); CNTV2Card device;
col() << "\t" << SBOLD(i) << ") " << SBOLD(info.deviceIdentifier) << ". " << info; if (!CNTV2DeviceScanner::GetDeviceAtIndex(i, device)) {
MSG(WARNING, "Cannot get device at index #%u!\n", i);
continue;
}
col() << "\t" << SBOLD(i) << ") "
<< SBOLD(device.GetDisplayName()) << ". "
<< device.GetDescription() << "\n";
col() << "\n"; col() << "\n";
} }
if (deviceScanner.GetNumDevices() == 0) { if (deviceScanner.GetNumDevices() == 0) {
@@ -829,8 +836,14 @@ LINK_SPEC void display_aja_probe(struct device_info **available_cards, int *coun
for (unsigned int i = 0; i < deviceScanner.GetNumDevices (); i++) { for (unsigned int i = 0; i < deviceScanner.GetNumDevices (); i++) {
snprintf((*available_cards)[i].dev, sizeof (*available_cards)[i].dev, ":device=%d", i); snprintf((*available_cards)[i].dev, sizeof (*available_cards)[i].dev, ":device=%d", i);
snprintf((*available_cards)[i].extra, sizeof (*available_cards)[i].extra, "\"embeddedAudioAvailable\":\"t\""); snprintf((*available_cards)[i].extra, sizeof (*available_cards)[i].extra, "\"embeddedAudioAvailable\":\"t\"");
NTV2DeviceInfo info (deviceScanner.GetDeviceInfoList () [i]); CNTV2Card device;
strncpy((*available_cards)[i].name, info.deviceIdentifier.c_str(), sizeof (*available_cards)[0].name - 1); if (!CNTV2DeviceScanner::GetDeviceAtIndex(i, device)) {
MSG(WARNING, "Cannot get device at index #%u!\n", i);
continue;
}
strncpy((*available_cards)[i].name,
device.GetDisplayName().c_str(),
sizeof(*available_cards)[0].name - 1);
(*available_cards)[i].repeatable = false; (*available_cards)[i].repeatable = false;
} }
} }