virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

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)

Browse Source 
Originally committed as revision 2301 to svn://svn.mplayerhq.hu/mplayer/trunk/postproc
This commit is contained in:
Michael Niedermayer 2001-10-19 17:03:51 +00:00
parent 84adc106cf
commit 5486f774bd
2 changed files with 36 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
postproc/postprocess.c
View File

@ -2603,13 +2603,11 @@ static void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStri
memcpyTime+= T1-T0; memcpyTime+= T1-T0;
T0=T1; T0=T1;
#endif #endif
if(mode & V_DEBLOCK)
{
if(mode & V_RK1_FILTER) if(mode & V_RK1_FILTER)
vertRK1Filter(dstBlock, stride, QP); vertRK1Filter(dstBlock, stride, QP);
else if(mode & V_X1_FILTER) else if(mode & V_X1_FILTER)
vertX1Filter(dstBlock, stride, QP); vertX1Filter(dstBlock, stride, QP);
else else if(mode & V_DEBLOCK)
{ {
if( isVertDC(dstBlock, stride)) if( isVertDC(dstBlock, stride))
{ {
@ -2619,7 +2617,6 @@ static void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStri
else else
doVertDefFilter(dstBlock, stride, QP); doVertDefFilter(dstBlock, stride, QP);
} }
}
#ifdef MORE_TIMING #ifdef MORE_TIMING
T1= rdtsc(); T1= rdtsc();
vertTime+= T1-T0; vertTime+= T1-T0;
@ -2633,11 +2630,9 @@ static void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStri
#ifdef MORE_TIMING #ifdef MORE_TIMING
T0= rdtsc(); T0= rdtsc();
#endif #endif
if(mode & H_DEBLOCK)
{
if(mode & H_X1_FILTER) if(mode & H_X1_FILTER)
horizX1Filter(dstBlock-4, stride, QP); horizX1Filter(dstBlock-4, stride, QP);
else else if(mode & H_DEBLOCK)
{ {
if( isHorizDCAndCopy2Temp(dstBlock-4, stride)) if( isHorizDCAndCopy2Temp(dstBlock-4, stride))
{ {
@ -2647,7 +2642,6 @@ static void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStri
else else
doHorizDefFilterAndCopyBack(dstBlock-4, stride, QP); doHorizDefFilterAndCopyBack(dstBlock-4, stride, QP);
} }
}
#ifdef MORE_TIMING #ifdef MORE_TIMING
T1= rdtsc(); T1= rdtsc();
horizTime+= T1-T0; horizTime+= T1-T0;

10
postproc/postprocess_template.c
View File

@ -2603,13 +2603,11 @@ static void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStri
memcpyTime+= T1-T0; memcpyTime+= T1-T0;
T0=T1; T0=T1;
#endif #endif
if(mode & V_DEBLOCK)
{
if(mode & V_RK1_FILTER) if(mode & V_RK1_FILTER)
vertRK1Filter(dstBlock, stride, QP); vertRK1Filter(dstBlock, stride, QP);
else if(mode & V_X1_FILTER) else if(mode & V_X1_FILTER)
vertX1Filter(dstBlock, stride, QP); vertX1Filter(dstBlock, stride, QP);
else else if(mode & V_DEBLOCK)
{ {
if( isVertDC(dstBlock, stride)) if( isVertDC(dstBlock, stride))
{ {
@ -2619,7 +2617,6 @@ static void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStri
else else
doVertDefFilter(dstBlock, stride, QP); doVertDefFilter(dstBlock, stride, QP);
} }
}
#ifdef MORE_TIMING #ifdef MORE_TIMING
T1= rdtsc(); T1= rdtsc();
vertTime+= T1-T0; vertTime+= T1-T0;
@ -2633,11 +2630,9 @@ static void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStri
#ifdef MORE_TIMING #ifdef MORE_TIMING
T0= rdtsc(); T0= rdtsc();
#endif #endif
if(mode & H_DEBLOCK)
{
if(mode & H_X1_FILTER) if(mode & H_X1_FILTER)
horizX1Filter(dstBlock-4, stride, QP); horizX1Filter(dstBlock-4, stride, QP);
else else if(mode & H_DEBLOCK)
{ {
if( isHorizDCAndCopy2Temp(dstBlock-4, stride)) if( isHorizDCAndCopy2Temp(dstBlock-4, stride))
{ {
@ -2647,7 +2642,6 @@ static void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStri
else else
doHorizDefFilterAndCopyBack(dstBlock-4, stride, QP); doHorizDefFilterAndCopyBack(dstBlock-4, stride, QP);
} }
}
#ifdef MORE_TIMING #ifdef MORE_TIMING
T1= rdtsc(); T1= rdtsc();
horizTime+= T1-T0; horizTime+= T1-T0;