mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-08 13:22:53 +02:00
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)
Originally committed as revision 2301 to svn://svn.mplayerhq.hu/mplayer/trunk/postproc
This commit is contained in:
parent
84adc106cf
commit
5486f774bd
@ -2603,13 +2603,11 @@ static void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStri
|
||||
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
|
||||
else if(mode & V_DEBLOCK)
|
||||
{
|
||||
if( isVertDC(dstBlock, stride))
|
||||
{
|
||||
@ -2619,7 +2617,6 @@ static void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStri
|
||||
else
|
||||
doVertDefFilter(dstBlock, stride, QP);
|
||||
}
|
||||
}
|
||||
#ifdef MORE_TIMING
|
||||
T1= rdtsc();
|
||||
vertTime+= T1-T0;
|
||||
@ -2633,11 +2630,9 @@ static void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStri
|
||||
#ifdef MORE_TIMING
|
||||
T0= rdtsc();
|
||||
#endif
|
||||
if(mode & H_DEBLOCK)
|
||||
{
|
||||
if(mode & H_X1_FILTER)
|
||||
horizX1Filter(dstBlock-4, stride, QP);
|
||||
else
|
||||
else if(mode & H_DEBLOCK)
|
||||
{
|
||||
if( isHorizDCAndCopy2Temp(dstBlock-4, stride))
|
||||
{
|
||||
@ -2647,7 +2642,6 @@ static void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStri
|
||||
else
|
||||
doHorizDefFilterAndCopyBack(dstBlock-4, stride, QP);
|
||||
}
|
||||
}
|
||||
#ifdef MORE_TIMING
|
||||
T1= rdtsc();
|
||||
horizTime+= T1-T0;
|
||||
|
@ -2603,13 +2603,11 @@ static void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStri
|
||||
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
|
||||
else if(mode & V_DEBLOCK)
|
||||
{
|
||||
if( isVertDC(dstBlock, stride))
|
||||
{
|
||||
@ -2619,7 +2617,6 @@ static void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStri
|
||||
else
|
||||
doVertDefFilter(dstBlock, stride, QP);
|
||||
}
|
||||
}
|
||||
#ifdef MORE_TIMING
|
||||
T1= rdtsc();
|
||||
vertTime+= T1-T0;
|
||||
@ -2633,11 +2630,9 @@ static void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStri
|
||||
#ifdef MORE_TIMING
|
||||
T0= rdtsc();
|
||||
#endif
|
||||
if(mode & H_DEBLOCK)
|
||||
{
|
||||
if(mode & H_X1_FILTER)
|
||||
horizX1Filter(dstBlock-4, stride, QP);
|
||||
else
|
||||
else if(mode & H_DEBLOCK)
|
||||
{
|
||||
if( isHorizDCAndCopy2Temp(dstBlock-4, stride))
|
||||
{
|
||||
@ -2647,7 +2642,6 @@ static void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStri
|
||||
else
|
||||
doHorizDefFilterAndCopyBack(dstBlock-4, stride, QP);
|
||||
}
|
||||
}
|
||||
#ifdef MORE_TIMING
|
||||
T1= rdtsc();
|
||||
horizTime+= T1-T0;
|
||||
|
Loading…
Reference in New Issue
Block a user