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

Fixed DC-prediction (filtering)

Browse source
This commit is contained in:
Marko Viitanen 2013-04-03 13:56:07 +03:00
parent d0be802ced
commit a059965855
3 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/encoder.c
View file

@ -732,9 +732,9 @@ void encode_coding_tree(encoder_control* encoder,uint16_t xCtb,uint16_t yCtb, ui
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); 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);
/* Filter DC-prediction */ /* Filter DC-prediction */
if(intraPredMode == 1 && (LCU_WIDTH>>depth) < 32 && xCtb && yCtb) if(intraPredMode == 1 && (LCU_WIDTH>>depth) < 32)
{ {
intra_DCPredFiltering(recbase,encoder->in.width,recbase,encoder->in.width,LCU_WIDTH>>depth,LCU_WIDTH>>depth); intra_DCPredFiltering(recShift,(LCU_WIDTH>>(depth))*2+8,pred,width,LCU_WIDTH>>depth,LCU_WIDTH>>depth);
} }
/* ToDo: separate chroma prediction(?) */ /* ToDo: separate chroma prediction(?) */

33
src/intra.c
View file

@ -235,6 +235,8 @@ int16_t intra_prediction(uint8_t* orig,uint32_t origstride,int16_t* rec,uint32_t
uint32_t (*calcSAD)(int16_t *block,uint32_t stride1,int16_t* block2, uint32_t stride2); uint32_t (*calcSAD)(int16_t *block,uint32_t stride1,int16_t* block2, uint32_t stride2);
int16_t pred[LCU_WIDTH*LCU_WIDTH]; int16_t pred[LCU_WIDTH*LCU_WIDTH];
int16_t origBlock[LCU_WIDTH*LCU_WIDTH]; int16_t origBlock[LCU_WIDTH*LCU_WIDTH];
int16_t recFilteredTemp[(LCU_WIDTH*2+8)*(LCU_WIDTH*2+8)];
int16_t* recFiltered = &recFilteredTemp[recstride+1];
uint8_t *origShift = &orig[xpos+ypos*origstride]; uint8_t *origShift = &orig[xpos+ypos*origstride];
int8_t filter = (width<32); //ToDo: chroma support int8_t filter = (width<32); //ToDo: chroma support
SADfunction SADarray[5] = {&SAD4x4,&SAD8x8,&SAD16x16,&SAD32x32,&SAD64x64}; SADfunction SADarray[5] = {&SAD4x4,&SAD8x8,&SAD16x16,&SAD32x32,&SAD64x64};
@ -257,20 +259,30 @@ int16_t intra_prediction(uint8_t* orig,uint32_t origstride,int16_t* rec,uint32_t
{ {
for(x = 0; x < (int32_t)width; x++) for(x = 0; x < (int32_t)width; x++)
{ {
origBlock[i++] = origShift[x+y*origstride]; origBlock[i++] = origShift[x+y*origstride];
} }
} }
/* Filtered only needs the borders */
for(y = -1; y < (int32_t)recstride; y++)
{
recFiltered[y*recstride-1] = rec[y*recstride-1];
}
for(x = 0; x < (int32_t)recstride; x++)
{
recFiltered[y-recstride] = rec[y-recstride];
}
/* Test DC */ /* Test DC */
/*
x = intra_getDCPred(rec, recstride, xpos, ypos, width); x = intra_getDCPred(rec, recstride, xpos, ypos, width);
for(i = 0; i < (int32_t)(width*width); i++) for(i = 0; i < (int32_t)(width*width); i++)
{ {
pred[i] = x; pred[i] = x;
} }
CHECK_FOR_BEST(1); CHECK_FOR_BEST(1);
*/
/* Check angular not requiring filtering */ /* Check angular not requiring filtering */
for(i = 2; i < 35; i++) for(i = 2; i < 35; i++)
{ {
if(MIN(abs(i-26),abs(i-10)) <= threshold) if(MIN(abs(i-26),abs(i-10)) <= threshold)
@ -278,12 +290,13 @@ int16_t intra_prediction(uint8_t* orig,uint32_t origstride,int16_t* rec,uint32_t
intra_getAngularPred(rec,recstride,pred, width,width,width,i, xpos?1:0, ypos?1:0, filter); intra_getAngularPred(rec,recstride,pred, width,width,width,i, xpos?1:0, ypos?1:0, filter);
CHECK_FOR_BEST(i); CHECK_FOR_BEST(i);
} }
} }
/*Apply filter*/ /*Apply filter*/
intra_filter(rec,recstride,width,0); intra_filter(recFiltered,recstride,width,0);
/* Test planar */ /* Test planar */
intra_getPlanarPred(rec, recstride, xpos, ypos, width, pred, width); intra_getPlanarPred(recFiltered, recstride, xpos, ypos, width, pred, width);
CHECK_FOR_BEST(0); CHECK_FOR_BEST(0);
@ -296,7 +309,7 @@ int16_t intra_prediction(uint8_t* orig,uint32_t origstride,int16_t* rec,uint32_t
{ {
if(MIN(abs(i-26),abs(i-10)) > threshold) if(MIN(abs(i-26),abs(i-10)) > threshold)
{ {
intra_getAngularPred(rec,recstride,pred, width,width,width,i, xpos?1:0, ypos?1:0, filter); intra_getAngularPred(recFiltered,recstride,pred, width,width,width,i, xpos?1:0, ypos?1:0, filter);
CHECK_FOR_BEST(i); CHECK_FOR_BEST(i);
} }
} }
@ -603,9 +616,9 @@ void intra_getAngularPred(int16_t* pSrc, int32_t srcStride, int16_t* rpDst, int3
void intra_DCPredFiltering(uint8_t* pSrc, int32_t iSrcStride, uint8_t* rpDst, int32_t iDstStride, int32_t iWidth, int32_t iHeight ) void intra_DCPredFiltering(int16_t* pSrc, int32_t iSrcStride, int16_t* rpDst, int32_t iDstStride, int32_t iWidth, int32_t iHeight )
{ {
uint8_t* pDst = rpDst; int16_t* pDst = rpDst;
int32_t x, y, iDstStride2, iSrcStride2; int32_t x, y, iDstStride2, iSrcStride2;
// boundary pixels processing // boundary pixels processing

2
src/intra.h
View file

@ -17,7 +17,7 @@ void intra_setBlockMode(picture* pic,uint32_t xCtb, uint32_t yCtb, uint8_t depth
int8_t intra_getBlockMode(picture* pic,uint32_t xCtb, uint32_t yCtb, uint8_t depth); int8_t intra_getBlockMode(picture* pic,uint32_t xCtb, uint32_t yCtb, uint8_t depth);
int8_t intra_getDirLumaPredictor(picture* pic,uint32_t xCtb, uint32_t yCtb, uint8_t depth, int8_t* preds); int8_t intra_getDirLumaPredictor(picture* pic,uint32_t xCtb, uint32_t yCtb, uint8_t depth, int8_t* preds);
void intra_DCPredFiltering(uint8_t* pSrc, int32_t iSrcStride, uint8_t* rpDst, int32_t iDstStride, int32_t iWidth, int32_t iHeight ); void intra_DCPredFiltering(int16_t* pSrc, int32_t iSrcStride, int16_t* rpDst, int32_t iDstStride, int32_t iWidth, int32_t iHeight );
void intra_buildReferenceBorder(picture* pic, int32_t xCtb, int32_t yCtb,int16_t outwidth, int16_t* dst, int32_t dststride, int8_t chroma); void intra_buildReferenceBorder(picture* pic, int32_t xCtb, int32_t yCtb,int16_t outwidth, int16_t* dst, int32_t dststride, int8_t chroma);
void intra_filter(int16_t* ref, uint32_t stride,uint32_t width, int8_t mode); void intra_filter(int16_t* ref, uint32_t stride,uint32_t width, int8_t mode);