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

deltacast_dvi: improve code flow for HDMI boards

Browse Source 
The original sample code uses cascadding if-ladder evaluating Result. The
derived code was just slightly derived but it was maybe even worse because
the error handling (message) was coupled in one if/else with subsequent
API call.

This is mostly a refactor but:
1. two-times VHD_DV_SP_REFRESH_RATE removed
2. perhaps fixed misaligned error message prints to wrong calls, eg. when
board type was not HDMI, the error was print even though the previous
call didn't fail (but continued, anyways)
This commit is contained in:
Martin Pulec
2025-11-07 12:27:29 +01:00
parent 8b6825b554
commit ccbe130d5e
1 changed files with 32 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
src/video_capture/deltacast_dvi.cpp
View File

@@ -3,6 +3,8 @@
* @author Martin Piatka <445597@mail.muni.cz>
* @author Martin Pulec <pulec@cesnet.cz>
*
* code is written by DELTACAST's VideoMaster SDK example Sample_RX_DVI
*
* @sa deltacast_common.hpp for common DELTACAST information
*/
/*
@@ -386,49 +388,40 @@ static bool wait_for_channel_locked(struct vidcap_deltacast_dvi_state *s, bool h
VHD_DV_CS InputCS;
ULONG PxlClk = 0;
/* Get auto-detected resolution */
Result = VHD_GetStreamProperty(s->StreamHandle,VHD_DV_SP_ACTIVE_WIDTH,&Width);
if(Result == VHDERR_NOERROR)
Result = VHD_GetStreamProperty(s->StreamHandle,VHD_DV_SP_ACTIVE_HEIGHT,&Height);
else
if ((Result = VHD_GetStreamProperty(s->StreamHandle,VHD_DV_SP_ACTIVE_WIDTH,&Width)) != VHDERR_NOERROR) {
printf("ERROR : Cannot detect incoming active width from RX0. "
"Result = 0x%08" PRIX_ULONG "\n", Result);
if(Result == VHDERR_NOERROR)
Result = VHD_GetStreamProperty(s->StreamHandle,VHD_DV_SP_INTERLACED,(ULONG*)&Interlaced_B);
else
printf("ERROR : Cannot detect incoming active height from RX0. "
"Result = 0x%08" PRIX_ULONG "\n", Result);
if(Result == VHDERR_NOERROR)
Result = VHD_GetStreamProperty(s->StreamHandle,VHD_DV_SP_REFRESH_RATE,&RefreshRate);
else
printf("ERROR : Cannot detect if incoming stream from RX0 is "
"interlaced or progressive. Result = 0x%08" PRIX_ULONG "\n", Result);
if (Result == VHDERR_NOERROR) {
Result = VHD_GetStreamProperty(s->StreamHandle,VHD_DV_SP_REFRESH_RATE,&RefreshRate);
if(s->BoardType == VHD_BOARDTYPE_HDMI)
Result = VHD_GetStreamProperty(s->StreamHandle,VHD_DV_SP_INPUT_CS,(ULONG*)&InputCS);
else
printf("ERROR : Cannot detect incoming color space from RX0. Result = 0x%08" PRIX_ULONG " (%s)\n", Result,
delta_get_error_description(Result));
}
if (Result == VHDERR_NOERROR) {
if (s->BoardType == VHD_BOARDTYPE_HDMI)
Result = VHD_GetStreamProperty(s->StreamHandle,VHD_DV_SP_PIXEL_CLOCK,&PxlClk);
else
printf("ERROR : Cannot detect incoming pixel clock from RX0. Result = 0x%08" PRIX_ULONG " (%s)\n", Result,
delta_get_error_description(Result));
}
if(Result == VHDERR_NOERROR)
printf("\nIncoming graphic resolution : %" PRIu_ULONG "x%" PRIu_ULONG " @%" PRIu_ULONG "Hz (%s)\n", Width, Height, RefreshRate, Interlaced_B ? "Interlaced" : "Progressive");
else
printf("ERROR : Cannot detect incoming refresh rate from RX0. "
"Result = 0x%08" PRIX_ULONG "\n", Result);
if(Result != VHDERR_NOERROR) {
return false;
}
if ((Result = VHD_GetStreamProperty(s->StreamHandle,VHD_DV_SP_ACTIVE_HEIGHT,&Height)) != VHDERR_NOERROR) {
printf("ERROR : Cannot detect incoming active height from RX0. "
"Result = 0x%08" PRIX_ULONG "\n", Result);
return false;
}
if ((Result = VHD_GetStreamProperty(s->StreamHandle,VHD_DV_SP_INTERLACED,(ULONG*)&Interlaced_B)) != VHDERR_NOERROR) {
printf("ERROR : Cannot detect if incoming stream from RX0 is "
"interlaced or progressive. Result = 0x%08" PRIX_ULONG "\n", Result);
return false;
}
if ((Result = VHD_GetStreamProperty(s->StreamHandle,VHD_DV_SP_REFRESH_RATE,&RefreshRate)) != VHDERR_NOERROR) {
printf("ERROR : Cannot detect incoming refresh rate from RX0. Result = 0x%08" PRIX_ULONG "\n",Result);
return false;
}
if (s->BoardType == VHD_BOARDTYPE_HDMI) {
if ((Result = VHD_GetStreamProperty(s->StreamHandle,VHD_DV_SP_INPUT_CS,(ULONG*)&InputCS)) != VHDERR_NOERROR) {
printf("ERROR : Cannot detect incoming color space from RX0. Result = 0x%08" PRIX_ULONG " (%s)\n", Result,
delta_get_error_description(Result));
return false;
}
if ((Result = VHD_GetStreamProperty(s->StreamHandle,VHD_DV_SP_PIXEL_CLOCK,&PxlClk)) != VHDERR_NOERROR) {
printf("ERROR : Cannot detect incoming pixel clock from RX0. Result = 0x%08" PRIX_ULONG " (%s)\n", Result,
delta_get_error_description(Result));
return false
}
}
printf("\nIncoming graphic resolution : %" PRIu_ULONG "x%" PRIu_ULONG " @%" PRIu_ULONG "Hz (%s)\n", Width, Height, RefreshRate, Interlaced_B ? "Interlaced" : "Progressive");
/* Configure stream. Only VHD_DVI_SP_ACTIVE_WIDTH, VHD_DVI_SP_ACTIVE_HEIGHT and
VHD_DVI_SP_INTERLACED properties are required for HDMI and Component