Skip to content

Commit

Permalink
Partially fixed C-ref for
Browse files Browse the repository at this point in the history 
16bit processing in sub-shifting. Something looks runs unstable and produces green frame at some combinations of params and/or script reload in VirtualDub.
  • Loading branch information
@DTL2020
DTL2020 committed Jul 10, 2022
1 parent 415823d commit ba3307f
Show file tree
Hide file tree
Showing 3 changed files with 95 additions and 44 deletions.
125 changes: 86 additions & 39 deletions Sources/Interpolation.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2788,48 +2788,70 @@ void SubShiftBlock_C(unsigned char* pSrc, unsigned char* pDst, int iBlockSizeX,
}
}


template<typename pixel_t>
void SubShiftBlock_Cs(unsigned char* _pSrc, unsigned char* pDst, int iBlockSizeX, int iBlockSizeY, short* sKernelH, short* sKernelV, int nSrcPitch, int nDstPitch, int iKS)
{
unsigned char CurrBlockShiftH[64 * (64 + 20)];// temp buf for H-shifted block, size of max block size + vertical margins about 10 ?
unsigned char* pSrc; // _pSrc - points to top left sample of block, need to add KS/2 borders
// unsigned char CurrBlockShiftH[64 * (64 + 20)];// temp buf for H-shifted block, size of max block size + vertical margins about 10 ?
float CurrBlockShiftH[64 * (64 + 20)];// temp buf for H-shifted block, size of max block size + vertical margins about 10 ?
// unsigned char* pSrc; // _pSrc - points to top left sample of block, need to add KS/2 borders
pixel_t* pctDst = reinterpret_cast<pixel_t*>(pDst);
const pixel_t* pSrc;

const int iKS_d2 = iKS / 2;
float fOut;

if (sKernelH != 0)
{
pSrc = _pSrc - (iKS_d2 - 1) - ((iKS_d2 - 1) * nSrcPitch);
pSrc = reinterpret_cast<const pixel_t*>(_pSrc) - (iKS_d2 - 1) - ((iKS_d2 - 1) * nSrcPitch);

for (int j = 0; j < (iBlockSizeY + iKS); j++)
{
for (int i = 0; i < iBlockSizeX; i++)
{
short sOut = 0;
// short sOut = 0;
fOut = 0;

for (int k = 0; k < iKS; k++)
{
short sSample = (short)pSrc[j * nSrcPitch + i + k];
sOut += sSample * sKernelH[k];
// short sSample = (short)pSrc[j * nSrcPitch + i + k];
// fOut += sSample * sKernelH[k];
fOut += (float)pSrc[j * nSrcPitch + i + k] * (float)sKernelH[k];
}

sOut += sKernelH[iKS]; // 16 for 0.25 and 0.75 and 32 for 0.5
sOut = sOut >> 6;
// sOut += sKernelH[iKS]; // 16 for 0.25 and 0.75 and 32 for 0.5
// sOut = sOut >> 6;
fOut += (float)sKernelH[iKS]; // 16 for 0.25 and 0.75 and 32 for 0.5
fOut = fOut / 64.0f;

if (sOut < 0) sOut = 0;
if (sOut > 255) sOut = 255;
// if (sOut < 0) sOut = 0;
// if (sOut > 255) sOut = 255;
if (sizeof(pixel_t) == 1)
{
if (fOut < 0.0f) fOut = 0.0f;
if (fOut > 255.0f) fOut = 255.0f;
}

CurrBlockShiftH[j * iBlockSizeX + i] = (unsigned char)sOut;
if (sizeof(pixel_t) == 2)
{
if (fOut < 0.0f) fOut = 0.0f;
if (fOut > 65535.0f) fOut = 65535.0f;
}

// CurrBlockShiftH[j * iBlockSizeX + i] = (unsigned char)sOut;
CurrBlockShiftH[j * iBlockSizeX + i] = fOut;
}
}
}
else // copy to CurrBlockShiftH temp buf
{
pSrc = _pSrc - ((iKS_d2 - 1) * nSrcPitch);
pSrc = reinterpret_cast<const pixel_t*>(_pSrc) - ((iKS_d2 - 1) * nSrcPitch);

for (int j = 0; j < (iBlockSizeY + iKS); j++)
{
for (int i = 0; i < iBlockSizeX; i++)
{
CurrBlockShiftH[j * iBlockSizeX + i] = (unsigned char)pSrc[j * nSrcPitch + i];
// CurrBlockShiftH[j * iBlockSizeX + i] = (unsigned char)pSrc[j * nSrcPitch + i];
CurrBlockShiftH[j * iBlockSizeX + i] = (float)pSrc[j * nSrcPitch + i];
}
}
}
Expand All @@ -2841,21 +2863,39 @@ void SubShiftBlock_Cs(unsigned char* _pSrc, unsigned char* pDst, int iBlockSizeX
{
for (int j = 0; j < iBlockSizeY; j++)
{
short sOut = 0;
// short sOut = 0;
fOut = 0;

for (int k = 0; k < iKS; k++)
{
short sSample = CurrBlockShiftH[(j + k) * iBlockSizeX + i];
sOut += sSample * sKernelV[k];
// short sSample = CurrBlockShiftH[(j + k) * iBlockSizeX + i];
// sOut += sSample * sKernelV[k];
fOut += CurrBlockShiftH[(j + k) * iBlockSizeX + i] * (float)sKernelV[k];
}

// sOut += sKernelV[iKS];
// sOut = sOut >> 6;
fOut += (float)sKernelV[iKS];
fOut = fOut / 64.0f;

// if (sOut < 0) sOut = 0;
// if (sOut > 255) sOut = 255;
if (sizeof(pixel_t) == 1)
{
if (fOut < 0.0f) fOut = 0.0f;
if (fOut > 255.0f) fOut = 255.0f;
}

sOut += sKernelV[iKS];
sOut = sOut >> 6;
if (sizeof(pixel_t) == 2)
{
if (fOut < 0.0f) fOut = 0.0f;
if (fOut > 65535.0f) fOut = 65535.0f;
}

if (sOut < 0) sOut = 0;
if (sOut > 255) sOut = 255;
// pDst[j * iBlockSizeX + i] = (unsigned char)(sOut);
if (sizeof(pixel_t) < 4) fOut += 0.5f;
pctDst[j * nDstPitch + i] = (pixel_t)(fOut);

pDst[j * iBlockSizeX + i] = (unsigned char)(sOut);
}
}
}
Expand All @@ -2865,8 +2905,12 @@ void SubShiftBlock_Cs(unsigned char* _pSrc, unsigned char* pDst, int iBlockSizeX
{
for (int j = 0; j < iBlockSizeY; j++)
{
unsigned char ucOut = CurrBlockShiftH[(j + (iKS_d2 - 1)) * iBlockSizeX + i];
pDst[j * iBlockSizeX + i] = ucOut;
// unsigned char ucOut = CurrBlockShiftH[(j + (iKS_d2 - 1)) * iBlockSizeX + i];
// pDst[j * iBlockSizeX + i] = ucOut;
fOut = CurrBlockShiftH[(j + (iKS_d2 - 1)) * iBlockSizeX + i];
if (sizeof(pixel_t) < 4) fOut += 0.5f;
pctDst[j * nDstPitch + i] = (pixel_t)fOut;

}
}
}
Expand Down Expand Up @@ -3394,10 +3438,10 @@ void SubShiftBlock4x4_KS6_i16_uint8_avx2(unsigned char* _pSrc, unsigned char* _p
// store and return
unsigned char* pucDst = _pDst;

_mm_storeu_si64(pucDst, _mm_packus_epi16(_mm256_castsi256_si128(ymm_outH_row0), xmm_zero)); // starting from row0
_mm_storeu_si64(pucDst + 1 * nDstPitch, _mm_packus_epi16(_mm256_castsi256_si128(ymm_outH_row1), xmm_zero));
_mm_storeu_si64(pucDst + 2 * nDstPitch, _mm_packus_epi16(_mm256_castsi256_si128(ymm_outH_row2), xmm_zero));
_mm_storeu_si64(pucDst + 3 * nDstPitch, _mm_packus_epi16(_mm256_castsi256_si128(ymm_outH_row3), xmm_zero));
_mm_storeu_si32(pucDst, _mm_packus_epi16(_mm256_castsi256_si128(ymm_outH_row0), xmm_zero)); // starting from row0
_mm_storeu_si32(pucDst + 1 * nDstPitch, _mm_packus_epi16(_mm256_castsi256_si128(ymm_outH_row1), xmm_zero));
_mm_storeu_si32(pucDst + 2 * nDstPitch, _mm_packus_epi16(_mm256_castsi256_si128(ymm_outH_row2), xmm_zero));
_mm_storeu_si32(pucDst + 3 * nDstPitch, _mm_packus_epi16(_mm256_castsi256_si128(ymm_outH_row3), xmm_zero));

return;
}
Expand Down Expand Up @@ -3457,10 +3501,10 @@ void SubShiftBlock4x4_KS6_i16_uint8_avx2(unsigned char* _pSrc, unsigned char* _p
// store and return
unsigned char* pucDst = _pDst;

_mm_storeu_si64(pucDst, _mm_packus_epi16(_mm256_castsi256_si128(outHV_row0), xmm_zero));
_mm_storeu_si64(pucDst + 1 * nDstPitch, _mm_packus_epi16(_mm256_castsi256_si128(outHV_row1), xmm_zero));
_mm_storeu_si64(pucDst + 2 * nDstPitch, _mm_packus_epi16(_mm256_castsi256_si128(outHV_row2), xmm_zero));
_mm_storeu_si64(pucDst + 3 * nDstPitch, _mm_packus_epi16(_mm256_castsi256_si128(outHV_row3), xmm_zero));
_mm_storeu_si32(pucDst, _mm_packus_epi16(_mm256_castsi256_si128(outHV_row0), xmm_zero));
_mm_storeu_si32(pucDst + 1 * nDstPitch, _mm_packus_epi16(_mm256_castsi256_si128(outHV_row1), xmm_zero));
_mm_storeu_si32(pucDst + 2 * nDstPitch, _mm_packus_epi16(_mm256_castsi256_si128(outHV_row2), xmm_zero));
_mm_storeu_si32(pucDst + 3 * nDstPitch, _mm_packus_epi16(_mm256_castsi256_si128(outHV_row3), xmm_zero));

return;
}
Expand Down Expand Up @@ -3620,10 +3664,10 @@ void SubShiftBlock4x4_KS6_i16_uint8_avx2(unsigned char* _pSrc, unsigned char* _p
// store and return
unsigned char* pucDst = _pDst;

_mm_storeu_si64(pucDst, _mm_packus_epi16(_mm256_castsi256_si128(outHV_row0), xmm_zero));
_mm_storeu_si64(pucDst + 1 * nDstPitch, _mm_packus_epi16(_mm256_castsi256_si128(outHV_row1), xmm_zero));
_mm_storeu_si64(pucDst + 2 * nDstPitch, _mm_packus_epi16(_mm256_castsi256_si128(outHV_row2), xmm_zero));
_mm_storeu_si64(pucDst + 3 * nDstPitch, _mm_packus_epi16(_mm256_castsi256_si128(outHV_row3), xmm_zero));
_mm_storeu_si32(pucDst, _mm_packus_epi16(_mm256_castsi256_si128(outHV_row0), xmm_zero));
_mm_storeu_si32(pucDst + 1 * nDstPitch, _mm_packus_epi16(_mm256_castsi256_si128(outHV_row1), xmm_zero));
_mm_storeu_si32(pucDst + 2 * nDstPitch, _mm_packus_epi16(_mm256_castsi256_si128(outHV_row2), xmm_zero));
_mm_storeu_si32(pucDst + 3 * nDstPitch, _mm_packus_epi16(_mm256_castsi256_si128(outHV_row3), xmm_zero));

return;

Expand Down Expand Up @@ -3726,8 +3770,11 @@ template void Average2<float>(unsigned char *pDst, const unsigned char *pSrc1, c
template void Average2_sse2<uint8_t>(unsigned char *pDst, const unsigned char *pSrc1, const unsigned char *pSrc2, int nPitch, int nWidth, int nHeight);
template void Average2_sse2<uint16_t>(unsigned char *pDst, const unsigned char *pSrc1, const unsigned char *pSrc2, int nPitch, int nWidth, int nHeight);

template void SubShiftBlock_C<uint8_t>(unsigned char* pSrc, unsigned char* pDst, int iBlockSizeX, int iBlockSizeY, float* fKernelH, float* fKernelV, int nSrcPitch, int nDstPitch, int iKS);
template void SubShiftBlock_C<uint16_t>(unsigned char* pSrc, unsigned char* pDst, int iBlockSizeX, int iBlockSizeY, float* fKernelH, float* fKernelV, int nSrcPitch, int nDstPitch, int iKS);
template void SubShiftBlock_C<float>(unsigned char* pSrc, unsigned char* pDst, int iBlockSizeX, int iBlockSizeY, float* fKernelH, float* fKernelV, int nSrcPitch, int nDstPitch, int iKS);
//template void SubShiftBlock_C<uint8_t>(unsigned char* pSrc, unsigned char* pDst, int iBlockSizeX, int iBlockSizeY, float* fKernelH, float* fKernelV, int nSrcPitch, int nDstPitch, int iKS);
//template void SubShiftBlock_C<uint16_t>(unsigned char* pSrc, unsigned char* pDst, int iBlockSizeX, int iBlockSizeY, float* fKernelH, float* fKernelV, int nSrcPitch, int nDstPitch, int iKS);
//template void SubShiftBlock_C<float>(unsigned char* pSrc, unsigned char* pDst, int iBlockSizeX, int iBlockSizeY, float* fKernelH, float* fKernelV, int nSrcPitch, int nDstPitch, int iKS);

template void SubShiftBlock_Cs<uint8_t>(unsigned char* _pSrc, unsigned char* pDst, int iBlockSizeX, int iBlockSizeY, short* sKernelH, short* sKernelV, int nSrcPitch, int nDstPitch, int iKS);
template void SubShiftBlock_Cs<uint16_t>(unsigned char* _pSrc, unsigned char* pDst, int iBlockSizeX, int iBlockSizeY, short* sKernelH, short* sKernelV, int nSrcPitch, int nDstPitch, int iKS);
template void SubShiftBlock_Cs<float>(unsigned char* _pSrc, unsigned char* pDst, int iBlockSizeX, int iBlockSizeY, short* sKernelH, short* sKernelV, int nSrcPitch, int nDstPitch, int iKS);

2 changes: 2 additions & 0 deletions Sources/Interpolation.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,8 @@ void Average2_sse2(unsigned char *pDst, const unsigned char *pSrc1, const unsign

//template<typename pixel_t>
//void SubShiftBlock_C(unsigned char* pSrc, unsigned char* pDst, int iBlockSizeX, int iBlockSizeY, float* fKernelH, float* fKernelV, int nSrcPitch, int nDstPitch, int iKS);

template<typename pixel_t>
void SubShiftBlock_Cs(unsigned char* _pSrc, unsigned char* pDst, int iBlockSizeX, int iBlockSizeY, short* sKernelH, short* sKernelV, int nSrcPitch, int nDstPitch, int iKS);

void SubShiftBlock8x8_KS6_i16_uint8_avx2(unsigned char* _pSrc, unsigned char* pDst, const int iBlockSizeX, const int iBlockSizeY, short* sKernelH, short* sKernelV, const int nSrcPitch, const int nDstPitch, const int iKS);
Expand Down
12 changes: 7 additions & 5 deletions Sources/MVPlane.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ MVPlane::MVPlane(int _nWidth, int _nHeight, int _nPel, int _nHPad, int _nVPad, i
_average_ptr = _isse ? Average2_sse2<uint8_t> : Average2<uint8_t>;
_reduce_ptr = &RB2BilinearFiltered<uint8_t>;

_sub_shift_ptr = SubShiftBlock_Cs;// <uint8_t>;
_sub_shift_ptr = SubShiftBlock_Cs<uint8_t>;
}
else if (pixelsize == 2) {
_bilin_hor_ptr = _isse ? HorizontalBilin_sse2<uint16_t> : HorizontalBilin<uint16_t>;
Expand All @@ -96,7 +96,7 @@ MVPlane::MVPlane(int _nWidth, int _nHeight, int _nPel, int _nHPad, int _nVPad, i
_average_ptr = _isse ? Average2_sse2<uint16_t> : Average2<uint16_t>;
_reduce_ptr = &RB2BilinearFiltered<uint16_t>;

_sub_shift_ptr = SubShiftBlock_Cs;// <uint16_t>;
_sub_shift_ptr = SubShiftBlock_Cs<uint16_t>;
}
else {
_bilin_hor_ptr = HorizontalBilin<float>;
Expand All @@ -109,7 +109,7 @@ MVPlane::MVPlane(int _nWidth, int _nHeight, int _nPel, int _nHPad, int _nVPad, i
_average_ptr = Average2<float>;
_reduce_ptr = &RB2BilinearFiltered<float>;

_sub_shift_ptr = SubShiftBlock_Cs;// <float>;
_sub_shift_ptr = SubShiftBlock_Cs<float>;
}
// Nothing

Expand Down Expand Up @@ -675,11 +675,13 @@ const uint8_t* MVPlane::GetPointerSubShift(int nX, int nY, int& pDstPitch, bool
SubShiftBlock4x4_KS6_i16_uint8_avx2(pSrc, pShiftedBlockBuf, nBlkSizeX, nBlkSizeY, psKrnH, psKrnV, nPitch, nShiftedBufPitch, SHIFTKERNELSIZE);
}
else
_sub_shift_ptr(pSrc, pShiftedBlockBuf, nBlkSizeX, nBlkSizeY, psKrnH, psKrnV, nPitch, nShiftedBufPitch, SHIFTKERNELSIZE);
// _sub_shift_ptr(pSrc, pShiftedBlockBuf, nBlkSizeX, nBlkSizeY, psKrnH, psKrnV, nPitch, nShiftedBufPitch, SHIFTKERNELSIZE);
_sub_shift_ptr(pSrc, pShiftedBlockBuf, nBlkSizeX, nBlkSizeY, psKrnH, psKrnV, nPitch, nBlkSizeX, SHIFTKERNELSIZE);
}
else
{
_sub_shift_ptr(pSrc, pShiftedBlockBuf, nBlkSizeX, nBlkSizeY, psKrnH, psKrnV, nPitch, nShiftedBufPitch, SHIFTKERNELSIZE);
// _sub_shift_ptr(pSrc, pShiftedBlockBuf, nBlkSizeX, nBlkSizeY, psKrnH, psKrnV, nPitch, nShiftedBufPitch, SHIFTKERNELSIZE);
_sub_shift_ptr(pSrc, pShiftedBlockBuf, nBlkSizeX, nBlkSizeY, psKrnH, psKrnV, nPitch, nBlkSizeX, SHIFTKERNELSIZE);
}

pDstPitch = nShiftedBufPitch;
Expand Down

0 comments on commit ba3307f

Please sign in to comment.