hashirama/uvg266
1
0
Fork 0
mirror of https://github.com/ultravideo/uvg266.git synced 2024-11-24 02:24:07 +00:00
Code Issues Actions Projects Releases Wiki Activity

Fixed all warnings and removed debugging codes

Browse source
This commit is contained in:
Marko Viitanen 2013-03-19 16:23:33 +02:00
parent 08cc0e97ab
commit 73d6ed2ff3
4 changed files with 41 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/context.c
View file

@ -111,10 +111,10 @@ uint32_t context_get_sigCoeffGroup( uint32_t* uiSigCoeffGroupFlag,
uint32_t uiRight = 0; uint32_t uiRight = 0;
uint32_t uiLower = 0; uint32_t uiLower = 0;
width >>= 2; width >>= 2;
if( uiCGPosX < width - 1 ) if( uiCGPosX < (uint32_t)width - 1 )
uiRight = (uiSigCoeffGroupFlag[ uiCGPosY * width + uiCGPosX + 1 ] != 0); uiRight = (uiSigCoeffGroupFlag[ uiCGPosY * width + uiCGPosX + 1 ] != 0);
if (uiCGPosY < width - 1 ) if (uiCGPosY < (uint32_t)width - 1 )
uiLower = (uiSigCoeffGroupFlag[ (uiCGPosY + 1 ) * width + uiCGPosX ] != 0); uiLower = (uiSigCoeffGroupFlag[ (uiCGPosY + 1 ) * width + uiCGPosX ] != 0);
return (uiRight || uiLower); return (uiRight || uiLower);
@ -141,11 +141,11 @@ int32_t context_calcPatternSigCtx( const uint32_t* sigCoeffGroupFlag, uint32_t
uint32_t sigRight = 0; uint32_t sigRight = 0;
uint32_t sigLower = 0; uint32_t sigLower = 0;
width >>= 2; width >>= 2;
if( posXCG < width - 1 ) if( posXCG < (uint32_t)width - 1 )
{ {
sigRight = (sigCoeffGroupFlag[ posYCG * width + posXCG + 1 ] != 0); sigRight = (sigCoeffGroupFlag[ posYCG * width + posXCG + 1 ] != 0);
} }
if (posYCG < width - 1 ) if (posYCG < (uint32_t)width - 1 )
{ {
sigLower = (sigCoeffGroupFlag[ (posYCG + 1 ) * width + posXCG ] != 0); sigLower = (sigCoeffGroupFlag[ (posYCG + 1 ) * width + posXCG ] != 0);
} }

19
src/encoder.c
View file

@ -6,7 +6,7 @@
/*! \file encoder.c /*! \file encoder.c
\brief Encoding related functions \brief Encoding related functions
\author Marko Viitanen \author Marko Viitanen
\date 2013-02 \date 2013-03
Encoder main level Encoder main level
*/ */
@ -758,25 +758,16 @@ void encode_coding_tree(encoder_control* encoder,uint16_t xCtb,uint16_t yCtb, ui
uint8_t *recbase = &encoder->in.cur_pic.yRecData[xCtb*(LCU_WIDTH>>(MAX_DEPTH)) + (yCtb*(LCU_WIDTH>>(MAX_DEPTH)))*encoder->in.width]; uint8_t *recbase = &encoder->in.cur_pic.yRecData[xCtb*(LCU_WIDTH>>(MAX_DEPTH)) + (yCtb*(LCU_WIDTH>>(MAX_DEPTH)))*encoder->in.width];
uint8_t *recbaseU = &encoder->in.cur_pic.uRecData[xCtb*(LCU_WIDTH>>(MAX_DEPTH+1)) + (yCtb*(LCU_WIDTH>>(MAX_DEPTH+1)))*(encoder->in.width>>1)]; uint8_t *recbaseU = &encoder->in.cur_pic.uRecData[xCtb*(LCU_WIDTH>>(MAX_DEPTH+1)) + (yCtb*(LCU_WIDTH>>(MAX_DEPTH+1)))*(encoder->in.width>>1)];
uint8_t *recbaseV = &encoder->in.cur_pic.vRecData[xCtb*(LCU_WIDTH>>(MAX_DEPTH+1)) + (yCtb*(LCU_WIDTH>>(MAX_DEPTH+1)))*(encoder->in.width>>1)]; uint8_t *recbaseV = &encoder->in.cur_pic.vRecData[xCtb*(LCU_WIDTH>>(MAX_DEPTH+1)) + (yCtb*(LCU_WIDTH>>(MAX_DEPTH+1)))*(encoder->in.width>>1)];
//int16_t dcpredU = intra_getDCPred(encoder->in.cur_pic.uRecData,encoder->in.width>>1, xCtb*(LCU_WIDTH>>(MAX_DEPTH+1)), yCtb*(LCU_WIDTH>>(MAX_DEPTH+1)), depth+1);
//int16_t dcpredV = intra_getDCPred(encoder->in.cur_pic.vRecData,encoder->in.width>>1, xCtb*(LCU_WIDTH>>(MAX_DEPTH+1)), yCtb*(LCU_WIDTH>>(MAX_DEPTH+1)), depth+1);
/* Code must start after variable initialization */
cabac_encodeBinTrm(&cabac, 0); /* IPCMFlag == 0 */ cabac_encodeBinTrm(&cabac, 0); /* IPCMFlag == 0 */
/*
{
FILE *recout = fopen("blockrec.yuv", "wb");
fwrite(encoder->in.cur_pic.yRecData,encoder->cfg->width*encoder->cfg->height,1,recout);
fwrite(encoder->in.cur_pic.uRecData,encoder->cfg->width*encoder->cfg->height>>2,1,recout);
fwrite(encoder->in.cur_pic.vRecData,encoder->cfg->width*encoder->cfg->height>>2,1,recout);
fclose(recout);
}
*/
/* Build reconstructed block to use in prediction with extrapolated borders */ /* Build reconstructed block to use in prediction with extrapolated borders */
intra_buildReferenceBorder(&encoder->in.cur_pic, xCtb, yCtb,(LCU_WIDTH>>(depth))*2+8, rec, (LCU_WIDTH>>(depth))*2+8, 0); intra_buildReferenceBorder(&encoder->in.cur_pic, xCtb, yCtb,(LCU_WIDTH>>(depth))*2+8, rec, (LCU_WIDTH>>(depth))*2+8, 0);
intraPredMode = intra_prediction(encoder->in.cur_pic.yData,encoder->in.width,recShift,(LCU_WIDTH>>(depth))*2+8,xCtb*(LCU_WIDTH>>(MAX_DEPTH)),yCtb*(LCU_WIDTH>>(MAX_DEPTH)),width,pred,width,&bestSAD); intraPredMode = (uint8_t)intra_prediction(encoder->in.cur_pic.yData,encoder->in.width,recShift,(LCU_WIDTH>>(depth))*2+8,xCtb*(LCU_WIDTH>>(MAX_DEPTH)),yCtb*(LCU_WIDTH>>(MAX_DEPTH)),width,pred,width,&bestSAD);
/* ToDo: chroma prediction */ /* ToDo: separate chroma prediction */
//printf("(%d, %d) SAD: %d\n", xCtb,yCtb,bestSAD); //printf("(%d, %d) SAD: %d\n", xCtb,yCtb,bestSAD);
intra_buildReferenceBorder(&encoder->in.cur_pic, xCtb, yCtb,(LCU_WIDTH>>(depth+1))*2+8, rec, (LCU_WIDTH>>(depth+1))*2+8, 1); intra_buildReferenceBorder(&encoder->in.cur_pic, xCtb, yCtb,(LCU_WIDTH>>(depth+1))*2+8, rec, (LCU_WIDTH>>(depth+1))*2+8, 1);
intra_recon(recShiftU,(LCU_WIDTH>>(depth+1))*2+8,xCtb*(LCU_WIDTH>>(MAX_DEPTH+1)),yCtb*(LCU_WIDTH>>(MAX_DEPTH+1)),width>>1,predU,width>>1,intraPredMode); intra_recon(recShiftU,(LCU_WIDTH>>(depth+1))*2+8,xCtb*(LCU_WIDTH>>(MAX_DEPTH+1)),yCtb*(LCU_WIDTH>>(MAX_DEPTH+1)),width>>1,predU,width>>1,intraPredMode);

94
src/intra.c
View file

@ -81,10 +81,8 @@ int16_t intra_getDCPred(int16_t* pic, uint16_t picwidth,uint32_t xpos, uint32_t
{ {
int32_t i, iSum = 0; int32_t i, iSum = 0;
int16_t pDcVal = 1<<(g_uiBitDepth-1); int16_t pDcVal = 1<<(g_uiBitDepth-1);
//int8_t bAbove = ypos?1:0;
//int8_t bLeft = xpos?1:0;
//int32_t add;
/* Average of pixels on top and left */
for (i = -picwidth; i < width-picwidth ; i++) for (i = -picwidth; i < width-picwidth ; i++)
{ {
iSum += pic[i]; iSum += pic[i];
@ -94,38 +92,8 @@ int16_t intra_getDCPred(int16_t* pic, uint16_t picwidth,uint32_t xpos, uint32_t
{ {
iSum += pic[i]; iSum += pic[i];
} }
/*
if (bAbove)
{
add = (ypos-1)*picwidth;
for (i = xpos+add; i < xpos+width+add ; i++)
{
iSum += pic[i];
}
}
else if (bLeft)
{
iSum += pic[ypos*picwidth+xpos-1]*width;
}
if (bLeft) pDcVal = (iSum + width) / (width + width);
{
add = xpos-1;
for (i = ypos*picwidth+add ; i < (ypos+width)*picwidth+add ; i+=picwidth)
{
iSum += pic[i];
}
}
else if (bAbove)
{
iSum += pic[(ypos-1)*picwidth+xpos]*width;
}
*/
//if (1)//bAbove || bLeft)
{
pDcVal = (iSum + width) / (width + width);
}
return pDcVal; return pDcVal;
} }
@ -200,10 +168,10 @@ void intra_filter(int16_t* ref, uint32_t stride,uint32_t width, int8_t mode)
if(!mode) if(!mode)
{ {
//pF[ -1 ][ -1 ] = ( p[ -1 ][ 0 ] + 2 * p[ -1 ][ -1 ] + p[ 0 ][ -1 ] + 2 ) >> 2 (8 35) //pF[ -1 ][ -1 ] = ( p[ -1 ][ 0 ] + 2 * p[ -1 ][ -1 ] + p[ 0 ][ -1 ] + 2 ) >> 2 (8 35)
filteredShift[-FWIDTH-1] = (ref[-1]+2*ref[-stride-1]+ref[-stride]+2) >> 2; filteredShift[-FWIDTH-1] = (ref[-1]+2*ref[-(int32_t)stride-1]+ref[-(int32_t)stride]+2) >> 2;
//pF[ -1 ][ y ] = ( p[ -1 ][ y + 1 ] + 2 * p[ -1 ][ y ] + p[ -1 ][ y - 1 ] + 2 ) >> 2 for y = 0..nTbS * 2 - 2 (8 36) //pF[ -1 ][ y ] = ( p[ -1 ][ y + 1 ] + 2 * p[ -1 ][ y ] + p[ -1 ][ y - 1 ] + 2 ) >> 2 for y = 0..nTbS * 2 - 2 (8 36)
for(y = 0; y < width*2-1; y++) for(y = 0; y < (int32_t)width*2-1; y++)
{ {
filteredShift[y*FWIDTH-1] = (ref[(y+1)*stride-1] + 2*ref[y*stride-1] + ref[(y-1)*stride-1]+2) >> 2; filteredShift[y*FWIDTH-1] = (ref[(y+1)*stride-1] + 2*ref[y*stride-1] + ref[(y-1)*stride-1]+2) >> 2;
} }
@ -212,7 +180,7 @@ void intra_filter(int16_t* ref, uint32_t stride,uint32_t width, int8_t mode)
filteredShift[(width*2-1)*FWIDTH-1] = ref[(width*2-1)*stride-1]; filteredShift[(width*2-1)*FWIDTH-1] = ref[(width*2-1)*stride-1];
//pF[ x ][ -1 ] = ( p[ x - 1 ][ -1 ] + 2 * p[ x ][ -1 ] + p[ x + 1 ][ -1 ] + 2 ) >> 2 for x = 0..nTbS * 2 - 2 (8 38) //pF[ x ][ -1 ] = ( p[ x - 1 ][ -1 ] + 2 * p[ x ][ -1 ] + p[ x + 1 ][ -1 ] + 2 ) >> 2 for x = 0..nTbS * 2 - 2 (8 38)
for(x = 0; x < width*2-1; x++) for(x = 0; x < (int32_t)width*2-1; x++)
{ {
filteredShift[x-FWIDTH] = (ref[x-1-stride] + 2*ref[x-stride] + ref[x+1-stride]+2) >> 2; filteredShift[x-FWIDTH] = (ref[x-1-stride] + 2*ref[x-stride] + ref[x+1-stride]+2) >> 2;
} }
@ -220,30 +188,16 @@ void intra_filter(int16_t* ref, uint32_t stride,uint32_t width, int8_t mode)
//pF[ nTbS * 2 - 1 ][ -1 ] = p[ nTbS * 2 - 1 ][ -1 ] //pF[ nTbS * 2 - 1 ][ -1 ] = p[ nTbS * 2 - 1 ][ -1 ]
filteredShift[(width*2-1)-FWIDTH] = ref[(width*2-1)-stride]; filteredShift[(width*2-1)-FWIDTH] = ref[(width*2-1)-stride];
/* Copy filtered samples to the input array */
for(x = -1; x < (int32_t)width*2; x++) for(x = -1; x < (int32_t)width*2; x++)
{ {
ref[x-stride] = filtered[x+1]; ref[x-stride] = filtered[x+1];
} }
for(y = 0; y < width*2; y++) for(y = 0; y < (int32_t)width*2; y++)
{ {
ref[y*stride-1] = filtered[(y+1)*FWIDTH]; ref[y*stride-1] = filtered[(y+1)*FWIDTH];
} }
/*
{
FILE* test = fopen("blockoutF2.yuv","wb");
uint8_t outvalue;
for(y = 0; y < 72; y++)
{
for(x = 0; x < 72; x++)
{
outvalue = filtered[(x)+(y)*FWIDTH];
fwrite(&outvalue,1,1,test);
}
}
fclose(test);
}
*/
} }
else else
{ {
@ -278,7 +232,7 @@ int16_t intra_prediction(uint8_t* orig,uint32_t origstride,int16_t* rec,uint32_t
int16_t pred[LCU_WIDTH*LCU_WIDTH>>2]; int16_t pred[LCU_WIDTH*LCU_WIDTH>>2];
int16_t origBlock[LCU_WIDTH*LCU_WIDTH>>2]; int16_t origBlock[LCU_WIDTH*LCU_WIDTH>>2];
uint8_t *origShift = &orig[xpos+ypos*origstride]; uint8_t *origShift = &orig[xpos+ypos*origstride];
#define COPY_PRED_TO_DST() for(y = 0; y < width; y++) { for(x = 0; x < width; x++) { dst[x+y*dststride] = pred[x+y*width]; } } #define COPY_PRED_TO_DST() for(y = 0; y < (int32_t)width; y++) { for(x = 0; x < (int32_t)width; x++) { dst[x+y*dststride] = pred[x+y*width]; } }
#define CHECK_FOR_BEST(mode) SAD = calcSAD(pred,width,origBlock,width); \ #define CHECK_FOR_BEST(mode) SAD = calcSAD(pred,width,origBlock,width); \
if(SAD < bestSAD)\ if(SAD < bestSAD)\
{\ {\
@ -306,9 +260,9 @@ int16_t intra_prediction(uint8_t* orig,uint32_t origstride,int16_t* rec,uint32_t
} }
/* Store original block for SAD computation */ /* Store original block for SAD computation */
i = 0; i = 0;
for(y = 0; y < width; y++) for(y = 0; y < (int32_t)width; y++)
{ {
for(x = 0; x < width; x++) for(x = 0; x < (int32_t)width; x++)
{ {
origBlock[i++] = origShift[x+y*origstride]; origBlock[i++] = origShift[x+y*origstride];
} }
@ -317,7 +271,7 @@ int16_t intra_prediction(uint8_t* orig,uint32_t origstride,int16_t* rec,uint32_t
/* Test DC */ /* Test DC */
x = intra_getDCPred(rec, recstride, xpos, ypos, width); x = intra_getDCPred(rec, recstride, xpos, ypos, width);
for(i = 0; i < width*width; i++) for(i = 0; i < (int32_t)(width*width); i++)
{ {
pred[i] = x; pred[i] = x;
} }
@ -381,6 +335,8 @@ int16_t intra_prediction(uint8_t* orig,uint32_t origstride,int16_t* rec,uint32_t
*/ */
*sad = bestSAD; *sad = bestSAD;
#undef COPY_PRED_TO_DST
#undef CHECK_FOR_BEST
return bestMode; return bestMode;
} }
@ -390,7 +346,7 @@ void intra_recon(int16_t* rec,uint32_t recstride, uint32_t xpos, uint32_t ypos,u
int32_t x,y,i; int32_t x,y,i;
int16_t pred[LCU_WIDTH*LCU_WIDTH>>2]; int16_t pred[LCU_WIDTH*LCU_WIDTH>>2];
//int16_t* recShift = &rec[xpos+ypos*recstride]; //int16_t* recShift = &rec[xpos+ypos*recstride];
#define COPY_PRED_TO_DST() for(y = 0; y < width; y++) { for(x = 0; x < width; x++) { dst[x+y*dststride] = pred[x+y*width]; } } #define COPY_PRED_TO_DST() for(y = 0; y < (int32_t)width; y++) { for(x = 0; x < (int32_t)width; x++) { dst[x+y*dststride] = pred[x+y*width]; } }
/* planar */ /* planar */
if(mode == 0) if(mode == 0)
@ -401,9 +357,9 @@ void intra_recon(int16_t* rec,uint32_t recstride, uint32_t xpos, uint32_t ypos,u
else if(mode == 1) else if(mode == 1)
{ {
i = intra_getDCPred(rec, recstride, xpos, ypos, width); i = intra_getDCPred(rec, recstride, xpos, ypos, width);
for(y = 0; y < width; y++) for(y = 0; y < (int32_t)width; y++)
{ {
for(x = 0; x < width; x++) for(x = 0; x < (int32_t)width; x++)
{ {
dst[x+y*dststride] = i; dst[x+y*dststride] = i;
} }
@ -417,6 +373,8 @@ void intra_recon(int16_t* rec,uint32_t recstride, uint32_t xpos, uint32_t ypos,u
} }
COPY_PRED_TO_DST(); COPY_PRED_TO_DST();
#undef COPY_PRED_TO_DST
} }
@ -516,7 +474,7 @@ void intra_buildReferenceBorder(picture* pic, int32_t xCtb, int32_t yCtb,int8_t
} }
/* Topleft corner */ /* Topleft corner */
dst[0] = (xCtb&&yCtb)?srcShifted[-srcWidth-1]:dst[dststride]; dst[0] = (xCtb&&yCtb)?srcShifted[-srcWidth-1]:dst[dststride];
/*
{ {
FILE* test = fopen("blockout.yuv","wb"); FILE* test = fopen("blockout.yuv","wb");
int x,y; int x,y;
@ -531,10 +489,10 @@ void intra_buildReferenceBorder(picture* pic, int32_t xCtb, int32_t yCtb,int8_t
} }
fclose(test); fclose(test);
} }
*/
} }
void intra_getAngularPred(uint16_t* pSrc, int32_t srcStride, int16_t* rpDst, int32_t dstStride, int32_t width, int32_t height, int32_t dirMode, int8_t leftAvail,int8_t topAvail, int8_t filter) void intra_getAngularPred(int16_t* pSrc, int32_t srcStride, int16_t* rpDst, int32_t dstStride, int32_t width, int32_t height, int32_t dirMode, int8_t leftAvail,int8_t topAvail, int8_t filter)
{ {
int32_t k,l; int32_t k,l;
int32_t blkSize = width; int32_t blkSize = width;
@ -711,7 +669,7 @@ void intra_getPlanarPred(int16_t* src,int32_t srcstride, uint32_t xpos, uint32_t
uint32_t shift2D = shift1D + 1; uint32_t shift2D = shift1D + 1;
for(k=0;k<blkSize+1;k++) for(k = 0; k < (int32_t)blkSize+1; k++)
{ {
topRow[k] = src[k-srcstride]; topRow[k] = src[k-srcstride];
leftColumn[k] = src[k*srcstride-1]; leftColumn[k] = src[k*srcstride-1];
@ -723,7 +681,7 @@ void intra_getPlanarPred(int16_t* src,int32_t srcstride, uint32_t xpos, uint32_t
// Prepare intermediate variables used in interpolation // Prepare intermediate variables used in interpolation
bottomLeft = leftColumn[blkSize]; bottomLeft = leftColumn[blkSize];
topRight = topRow[blkSize]; topRight = topRow[blkSize];
for (k=0;k<blkSize;k++) for (k = 0; k < (int32_t)blkSize; k++)
{ {
bottomRow[k] = bottomLeft - topRow[k]; bottomRow[k] = bottomLeft - topRow[k];
rightColumn[k] = topRight - leftColumn[k]; rightColumn[k] = topRight - leftColumn[k];
@ -732,10 +690,10 @@ void intra_getPlanarPred(int16_t* src,int32_t srcstride, uint32_t xpos, uint32_t
} }
// Generate prediction signal // Generate prediction signal
for (k=0;k<blkSize;k++) for (k = 0; k < (int32_t)blkSize; k++)
{ {
horPred = leftColumn[k] + offset2D; horPred = leftColumn[k] + offset2D;
for (l=0;l<blkSize;l++) for (l = 0; l < (int32_t)blkSize; l++)
{ {
horPred += rightColumn[k]; horPred += rightColumn[k];
topRow[l] += bottomRow[l]; topRow[l] += bottomRow[l];

6
src/transform.c
View file

@ -141,7 +141,7 @@ const int16_t g_invQuantScales[6] = { 40,45,51,57,64,72 };
void scalinglist_init() void scalinglist_init()
{ {
uint32_t sizeId,listId,qp,dir; uint32_t sizeId,listId,qp;
for(sizeId = 0; sizeId < 4; sizeId++) for(sizeId = 0; sizeId < 4; sizeId++)
{ {
for(listId = 0; listId < g_scalingListNum[sizeId]; listId++) for(listId = 0; listId < g_scalingListNum[sizeId]; listId++)
@ -172,7 +172,7 @@ void scalinglist_init()
void scalinglist_destroy() void scalinglist_destroy()
{ {
uint32_t sizeId,listId,qp,dir; uint32_t sizeId,listId,qp;
for(sizeId = 0; sizeId < 4; sizeId++) for(sizeId = 0; sizeId < 4; sizeId++)
{ {
for(listId = 0; listId < g_scalingListNum[sizeId]; listId++) for(listId = 0; listId < g_scalingListNum[sizeId]; listId++)
@ -779,7 +779,7 @@ void dequant(encoder_control* encoder, int16_t* piQCoef, int16_t* piCoef, int32_
int32_t iShift,iAdd,iCoeffQ; int32_t iShift,iAdd,iCoeffQ;
uint32_t uiLog2TrSize = g_aucConvertToBit[ iWidth ] + 2; uint32_t uiLog2TrSize = g_aucConvertToBit[ iWidth ] + 2;
int16_t clipQCoef; int16_t clipQCoef;
int32_t n,scale; int32_t n;
int32_t iTransformShift = 15 - g_uiBitDepth - (g_aucConvertToBit[ iWidth ] + 2); int32_t iTransformShift = 15 - g_uiBitDepth - (g_aucConvertToBit[ iWidth ] + 2);
int32_t qpScaled; int32_t qpScaled;
int32_t iQpBase = encoder->QP; int32_t iQpBase = encoder->QP;