Remove std prefix from int types
std::int* -> int*
This commit is contained in:
@@ -18,9 +18,9 @@ static int pos_map_backlog_frames = 80000;
|
||||
|
||||
struct pos_map_t
|
||||
{
|
||||
std::int64_t m_iSourceFrame;
|
||||
std::int64_t m_iDestFrame;
|
||||
std::int64_t m_iFrames;
|
||||
int64_t m_iSourceFrame;
|
||||
int64_t m_iDestFrame;
|
||||
int64_t m_iFrames;
|
||||
double m_fSourceToDestRatio;
|
||||
|
||||
pos_map_t() { m_iSourceFrame = 0; m_iDestFrame = 0; m_iFrames = 0; m_fSourceToDestRatio = 1.0; }
|
||||
@@ -59,7 +59,7 @@ pos_map_queue &pos_map_queue::operator=( const pos_map_queue &rhs )
|
||||
return *this;
|
||||
}
|
||||
|
||||
void pos_map_queue::Insert(std::int64_t iSourceFrame, std::int64_t iFrames, std::int64_t iDestFrame, double fSourceToDestRatio)
|
||||
void pos_map_queue::Insert(int64_t iSourceFrame, int64_t iFrames, int64_t iDestFrame, double fSourceToDestRatio)
|
||||
{
|
||||
bool merged = false;
|
||||
if (!m_pImpl->m_Queue.empty())
|
||||
@@ -95,7 +95,7 @@ void pos_map_queue::Insert(std::int64_t iSourceFrame, std::int64_t iFrames, std:
|
||||
void pos_map_impl::Cleanup()
|
||||
{
|
||||
std::list<pos_map_t>::iterator it = m_Queue.end();
|
||||
std::int64_t iTotalFrames = 0;
|
||||
int64_t iTotalFrames = 0;
|
||||
// Scan backwards until we have at least pos_map_backlog_frames.
|
||||
while (iTotalFrames < pos_map_backlog_frames)
|
||||
{
|
||||
@@ -108,7 +108,7 @@ void pos_map_impl::Cleanup()
|
||||
m_Queue.erase(m_Queue.begin(), it);
|
||||
}
|
||||
|
||||
std::int64_t pos_map_queue::Search( std::int64_t iSourceFrame ) const
|
||||
int64_t pos_map_queue::Search( int64_t iSourceFrame ) const
|
||||
{
|
||||
if( IsEmpty() )
|
||||
{
|
||||
@@ -116,7 +116,7 @@ std::int64_t pos_map_queue::Search( std::int64_t iSourceFrame ) const
|
||||
}
|
||||
|
||||
// iSourceFrame is probably in pos_map. Search to figure out what position it maps to.
|
||||
std::int64_t iClosestPosition = 0, iClosestPositionDist = std::numeric_limits<int64_t>::max();
|
||||
int64_t iClosestPosition = 0, iClosestPositionDist = std::numeric_limits<int64_t>::max();
|
||||
for (pos_map_t const &pm : m_pImpl->m_Queue)
|
||||
{
|
||||
// Loop over the queue until we know generally where iSourceFrame is
|
||||
@@ -124,13 +124,13 @@ std::int64_t pos_map_queue::Search( std::int64_t iSourceFrame ) const
|
||||
iSourceFrame < pm.m_iSourceFrame+pm.m_iFrames )
|
||||
{
|
||||
// If we are in the correct block, calculate its current position
|
||||
std::int64_t iDiff = static_cast<std::int64_t>(iSourceFrame - pm.m_iSourceFrame);
|
||||
int64_t iDiff = static_cast<int64_t>(iSourceFrame - pm.m_iSourceFrame);
|
||||
iDiff = static_cast<int64_t>(( iDiff * pm.m_fSourceToDestRatio) + 0.5 );
|
||||
return pm.m_iDestFrame + iDiff;
|
||||
}
|
||||
|
||||
// See if the current position is close to the beginning of this block.
|
||||
std::int64_t dist = llabs( pm.m_iSourceFrame - iSourceFrame );
|
||||
int64_t dist = llabs( pm.m_iSourceFrame - iSourceFrame );
|
||||
if( dist < iClosestPositionDist )
|
||||
{
|
||||
iClosestPositionDist = dist;
|
||||
|
||||
Reference in New Issue
Block a user