Skip to content
This repository has been archived by the owner on Dec 16, 2024. It is now read-only.

minor fix in android ERPSelectRegion #73

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

minor fix in android ERPSelectRegion #73

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions src/360SCVP/360SCVPViewportImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1326,12 +1326,7 @@ int32_t TgenViewport::ERPSelectRegion(short inputWidth, short inputHeight, shor
float fPitch = m_codingSVideoInfo.viewPort.fPitch;
float vFOV = m_codingSVideoInfo.viewPort.vFOV;
float hFOV = m_codingSVideoInfo.viewPort.hFOV;
#ifndef _ANDROID_NDK_OPTION_
float leftCol[m_tileNumRow] = {float(m_tileNumCol)};
float rightCol[m_tileNumRow] = {-1};
#else
float leftCol[m_tileNumRow], rightCol[m_tileNumRow];
#endif
bool bHasOccupiedTile;
float horzStep = ERP_HORZ_ANGLE / (float)m_tileNumCol;
float vertStep = ERP_VERT_ANGLE / (float)m_tileNumRow;
Expand Down Expand Up @@ -1368,10 +1363,6 @@ int32_t TgenViewport::ERPSelectRegion(short inputWidth, short inputHeight, shor
centerCol = (clampAngle(fYaw, -ERP_HORZ_ANGLE / 2, ERP_HORZ_ANGLE / 2) + ERP_HORZ_ANGLE / 2) / horzStep;
int32_t row, tileIdx;
float col;
#ifndef _ANDROID_NDK_OPTION_
float distanceLeftToCenter[m_tileNumRow] = {-1.0};
float distanceRightToCenter[m_tileNumRow] = {-1.0};
#else
float distanceLeftToCenter[m_tileNumRow], distanceRightToCenter[m_tileNumRow];

for (uint32_t i = 0; i < m_tileNumRow; i++) {
Expand All @@ -1385,7 +1376,6 @@ int32_t TgenViewport::ERPSelectRegion(short inputWidth, short inputHeight, shor
distanceLeftToCenter[i] = -1;
distanceRightToCenter[i] = -1;
}
#endif
/* Search in top vertical boundary */
for (float offsetAngle = hFOV/2; offsetAngle >= 0; offsetAngle -= HORZ_BOUNDING_STEP) {
pVertBoundaryPoint->alpha = clampAngle(pVertBoundaryPoint->alpha, -ERP_HORZ_ANGLE/2, ERP_HORZ_ANGLE/2) + ERP_HORZ_ANGLE / 2;
Expand Down