Mercurial > mplayer.hg
changeset 2300:e10f7dc4938f
more logic behavior if the altenative deblock filters are used (turning a alt filter on without turning the deblock filter on uses the alt filter instead of using no filter now)
| author | michael |
|---|---|
| date | Fri, 19 Oct 2001 17:03:51 +0000 |
| parents | 8a4912a9cfe7 |
| children | b4c4c832cce7 |
| files | postproc/postprocess.c postproc/postprocess_template.c |
| diffstat | 2 files changed, 36 insertions(+), 48 deletions(-) [+] |
line wrap: on
line diff
--- a/postproc/postprocess.c Fri Oct 19 16:58:35 2001 +0000 +++ b/postproc/postprocess.c Fri Oct 19 17:03:51 2001 +0000 @@ -2603,22 +2603,19 @@ memcpyTime+= T1-T0; T0=T1; #endif - if(mode & V_DEBLOCK) + if(mode & V_RK1_FILTER) + vertRK1Filter(dstBlock, stride, QP); + else if(mode & V_X1_FILTER) + vertX1Filter(dstBlock, stride, QP); + else if(mode & V_DEBLOCK) { - if(mode & V_RK1_FILTER) - vertRK1Filter(dstBlock, stride, QP); - else if(mode & V_X1_FILTER) - vertX1Filter(dstBlock, stride, QP); - else + if( isVertDC(dstBlock, stride)) { - if( isVertDC(dstBlock, stride)) - { - if(isVertMinMaxOk(dstBlock, stride, QP)) - doVertLowPass(dstBlock, stride, QP); - } - else - doVertDefFilter(dstBlock, stride, QP); + if(isVertMinMaxOk(dstBlock, stride, QP)) + doVertLowPass(dstBlock, stride, QP); } + else + doVertDefFilter(dstBlock, stride, QP); } #ifdef MORE_TIMING T1= rdtsc(); @@ -2633,20 +2630,17 @@ #ifdef MORE_TIMING T0= rdtsc(); #endif - if(mode & H_DEBLOCK) + if(mode & H_X1_FILTER) + horizX1Filter(dstBlock-4, stride, QP); + else if(mode & H_DEBLOCK) { - if(mode & H_X1_FILTER) - horizX1Filter(dstBlock-4, stride, QP); - else + if( isHorizDCAndCopy2Temp(dstBlock-4, stride)) { - if( isHorizDCAndCopy2Temp(dstBlock-4, stride)) - { - if(isHorizMinMaxOk(tempBlock, TEMP_STRIDE, QP)) - doHorizLowPassAndCopyBack(dstBlock-4, stride, QP); - } - else - doHorizDefFilterAndCopyBack(dstBlock-4, stride, QP); + if(isHorizMinMaxOk(tempBlock, TEMP_STRIDE, QP)) + doHorizLowPassAndCopyBack(dstBlock-4, stride, QP); } + else + doHorizDefFilterAndCopyBack(dstBlock-4, stride, QP); } #ifdef MORE_TIMING T1= rdtsc();
--- a/postproc/postprocess_template.c Fri Oct 19 16:58:35 2001 +0000 +++ b/postproc/postprocess_template.c Fri Oct 19 17:03:51 2001 +0000 @@ -2603,22 +2603,19 @@ memcpyTime+= T1-T0; T0=T1; #endif - if(mode & V_DEBLOCK) + if(mode & V_RK1_FILTER) + vertRK1Filter(dstBlock, stride, QP); + else if(mode & V_X1_FILTER) + vertX1Filter(dstBlock, stride, QP); + else if(mode & V_DEBLOCK) { - if(mode & V_RK1_FILTER) - vertRK1Filter(dstBlock, stride, QP); - else if(mode & V_X1_FILTER) - vertX1Filter(dstBlock, stride, QP); - else + if( isVertDC(dstBlock, stride)) { - if( isVertDC(dstBlock, stride)) - { - if(isVertMinMaxOk(dstBlock, stride, QP)) - doVertLowPass(dstBlock, stride, QP); - } - else - doVertDefFilter(dstBlock, stride, QP); + if(isVertMinMaxOk(dstBlock, stride, QP)) + doVertLowPass(dstBlock, stride, QP); } + else + doVertDefFilter(dstBlock, stride, QP); } #ifdef MORE_TIMING T1= rdtsc(); @@ -2633,20 +2630,17 @@ #ifdef MORE_TIMING T0= rdtsc(); #endif - if(mode & H_DEBLOCK) + if(mode & H_X1_FILTER) + horizX1Filter(dstBlock-4, stride, QP); + else if(mode & H_DEBLOCK) { - if(mode & H_X1_FILTER) - horizX1Filter(dstBlock-4, stride, QP); - else + if( isHorizDCAndCopy2Temp(dstBlock-4, stride)) { - if( isHorizDCAndCopy2Temp(dstBlock-4, stride)) - { - if(isHorizMinMaxOk(tempBlock, TEMP_STRIDE, QP)) - doHorizLowPassAndCopyBack(dstBlock-4, stride, QP); - } - else - doHorizDefFilterAndCopyBack(dstBlock-4, stride, QP); + if(isHorizMinMaxOk(tempBlock, TEMP_STRIDE, QP)) + doHorizLowPassAndCopyBack(dstBlock-4, stride, QP); } + else + doHorizDefFilterAndCopyBack(dstBlock-4, stride, QP); } #ifdef MORE_TIMING T1= rdtsc();