Skip to content

L
libswscale
Commit b8e4ba3c authored by michael's avatar michael
Browse files
Options

use fastmemcpy for chrominance if no chrominance filtering is done 


git-svn-id: file:///var/local/repositories/mplayer/trunk/postproc@3095 b3059339-0415-0410-9bf9-f77b7e298cf2
parent 52fc27f6
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 18 deletions
postprocess.c
View file @ b8e4ba3c
...@@ -62,7 +62,6 @@ optimize c versions ...@@ -62,7 +62,6 @@ optimize c versions
try to unroll inner for(x=0 ... loop to avoid these damn if(x ... checks try to unroll inner for(x=0 ... loop to avoid these damn if(x ... checks
smart blur smart blur
commandline option for the deblock / dering thresholds commandline option for the deblock / dering thresholds
memcpy chrominance if no chroma filtering is done
... ...
*/ */
...@@ -80,6 +79,7 @@ memcpy chrominance if no chroma filtering is done ...@@ -80,6 +79,7 @@ memcpy chrominance if no chroma filtering is done
//#define HAVE_3DNOW //#define HAVE_3DNOW
//#undef HAVE_MMX //#undef HAVE_MMX
//#define DEBUG_BRIGHTNESS //#define DEBUG_BRIGHTNESS
#include "../libvo/fastmemcpy.h"
#include "postprocess.h" #include "postprocess.h"
#define MIN(a,b) ((a) > (b) ? (b) : (a)) #define MIN(a,b) ((a) > (b) ? (b) : (a))
...@@ -3037,20 +3037,32 @@ void postprocess(unsigned char * src[], int src_stride, ...@@ -3037,20 +3037,32 @@ void postprocess(unsigned char * src[], int src_stride,
src_stride >>= 1; src_stride >>= 1;
dst_stride >>= 1; dst_stride >>= 1;
if(1) if(ppMode.chromMode)
{ {
postProcess(src[1], src_stride, dst[1], dst_stride, postProcess(src[1], src_stride, dst[1], dst_stride,
horizontal_size, vertical_size, QP_store, QP_stride, 1, &ppMode); horizontal_size, vertical_size, QP_store, QP_stride, 1, &ppMode);
postProcess(src[2], src_stride, dst[2], dst_stride, postProcess(src[2], src_stride, dst[2], dst_stride,
horizontal_size, vertical_size, QP_store, QP_stride, 2, &ppMode); horizontal_size, vertical_size, QP_store, QP_stride, 2, &ppMode);
} }
else if(src_stride == dst_stride)
{
memcpy(dst[1], src[1], src_stride*vertical_size);
memcpy(dst[2], src[2], src_stride*vertical_size);
}
else else
{ {
int y;
for(y=0; y<vertical_size; y++)
{
memcpy(&(dst[1][y*dst_stride]), &(src[1][y*src_stride]), horizontal_size);
memcpy(&(dst[2][y*dst_stride]), &(src[2][y*src_stride]), horizontal_size);
}
}
#if 0
memset(dst[1], 128, dst_stride*vertical_size); memset(dst[1], 128, dst_stride*vertical_size);
memset(dst[2], 128, dst_stride*vertical_size); memset(dst[2], 128, dst_stride*vertical_size);
// memcpy(dst[1], src[1], src_stride*horizontal_size); #endif
// memcpy(dst[2], src[2], src_stride*horizontal_size);
}
} }
void postprocess2(unsigned char * src[], int src_stride, void postprocess2(unsigned char * src[], int src_stride,
...@@ -3085,10 +3097,27 @@ void postprocess2(unsigned char * src[], int src_stride, ...@@ -3085,10 +3097,27 @@ void postprocess2(unsigned char * src[], int src_stride,
src_stride >>= 1; src_stride >>= 1;
dst_stride >>= 1; dst_stride >>= 1;
postProcess(src[1], src_stride, dst[1], dst_stride, if(mode->chromMode)
horizontal_size, vertical_size, QP_store, QP_stride, 1, mode); {
postProcess(src[2], src_stride, dst[2], dst_stride, postProcess(src[1], src_stride, dst[1], dst_stride,
horizontal_size, vertical_size, QP_store, QP_stride, 2, mode); horizontal_size, vertical_size, QP_store, QP_stride, 1, mode);
postProcess(src[2], src_stride, dst[2], dst_stride,
horizontal_size, vertical_size, QP_store, QP_stride, 2, mode);
}
else if(src_stride == dst_stride)
{
memcpy(dst[1], src[1], src_stride*vertical_size);
memcpy(dst[2], src[2], src_stride*vertical_size);
}
else
{
int y;
for(y=0; y<vertical_size; y++)
{
memcpy(&(dst[1][y*dst_stride]), &(src[1][y*src_stride]), horizontal_size);
memcpy(&(dst[2][y*dst_stride]), &(src[2][y*src_stride]), horizontal_size);
}
}
} }
......
postprocess_template.c
View file @ b8e4ba3c
...@@ -62,7 +62,6 @@ optimize c versions ...@@ -62,7 +62,6 @@ optimize c versions
try to unroll inner for(x=0 ... loop to avoid these damn if(x ... checks try to unroll inner for(x=0 ... loop to avoid these damn if(x ... checks
smart blur smart blur
commandline option for the deblock / dering thresholds commandline option for the deblock / dering thresholds
memcpy chrominance if no chroma filtering is done
... ...
*/ */
...@@ -80,6 +79,7 @@ memcpy chrominance if no chroma filtering is done ...@@ -80,6 +79,7 @@ memcpy chrominance if no chroma filtering is done
//#define HAVE_3DNOW //#define HAVE_3DNOW
//#undef HAVE_MMX //#undef HAVE_MMX
//#define DEBUG_BRIGHTNESS //#define DEBUG_BRIGHTNESS
#include "../libvo/fastmemcpy.h"
#include "postprocess.h" #include "postprocess.h"
#define MIN(a,b) ((a) > (b) ? (b) : (a)) #define MIN(a,b) ((a) > (b) ? (b) : (a))
...@@ -3037,20 +3037,32 @@ void postprocess(unsigned char * src[], int src_stride, ...@@ -3037,20 +3037,32 @@ void postprocess(unsigned char * src[], int src_stride,
src_stride >>= 1; src_stride >>= 1;
dst_stride >>= 1; dst_stride >>= 1;
if(1) if(ppMode.chromMode)
{ {
postProcess(src[1], src_stride, dst[1], dst_stride, postProcess(src[1], src_stride, dst[1], dst_stride,
horizontal_size, vertical_size, QP_store, QP_stride, 1, &ppMode); horizontal_size, vertical_size, QP_store, QP_stride, 1, &ppMode);
postProcess(src[2], src_stride, dst[2], dst_stride, postProcess(src[2], src_stride, dst[2], dst_stride,
horizontal_size, vertical_size, QP_store, QP_stride, 2, &ppMode); horizontal_size, vertical_size, QP_store, QP_stride, 2, &ppMode);
} }
else if(src_stride == dst_stride)
{
memcpy(dst[1], src[1], src_stride*vertical_size);
memcpy(dst[2], src[2], src_stride*vertical_size);
}
else else
{ {
int y;
for(y=0; y<vertical_size; y++)
{
memcpy(&(dst[1][y*dst_stride]), &(src[1][y*src_stride]), horizontal_size);
memcpy(&(dst[2][y*dst_stride]), &(src[2][y*src_stride]), horizontal_size);
}
}
#if 0
memset(dst[1], 128, dst_stride*vertical_size); memset(dst[1], 128, dst_stride*vertical_size);
memset(dst[2], 128, dst_stride*vertical_size); memset(dst[2], 128, dst_stride*vertical_size);
// memcpy(dst[1], src[1], src_stride*horizontal_size); #endif
// memcpy(dst[2], src[2], src_stride*horizontal_size);
}
} }
void postprocess2(unsigned char * src[], int src_stride, void postprocess2(unsigned char * src[], int src_stride,
...@@ -3085,10 +3097,27 @@ void postprocess2(unsigned char * src[], int src_stride, ...@@ -3085,10 +3097,27 @@ void postprocess2(unsigned char * src[], int src_stride,
src_stride >>= 1; src_stride >>= 1;
dst_stride >>= 1; dst_stride >>= 1;
postProcess(src[1], src_stride, dst[1], dst_stride, if(mode->chromMode)
horizontal_size, vertical_size, QP_store, QP_stride, 1, mode); {
postProcess(src[2], src_stride, dst[2], dst_stride, postProcess(src[1], src_stride, dst[1], dst_stride,
horizontal_size, vertical_size, QP_store, QP_stride, 2, mode); horizontal_size, vertical_size, QP_store, QP_stride, 1, mode);
postProcess(src[2], src_stride, dst[2], dst_stride,
horizontal_size, vertical_size, QP_store, QP_stride, 2, mode);
}
else if(src_stride == dst_stride)
{
memcpy(dst[1], src[1], src_stride*vertical_size);
memcpy(dst[2], src[2], src_stride*vertical_size);
}
else
{
int y;
for(y=0; y<vertical_size; y++)
{
memcpy(&(dst[1][y*dst_stride]), &(src[1][y*src_stride]), horizontal_size);
memcpy(&(dst[2][y*dst_stride]), &(src[2][y*src_stride]), horizontal_size);
}
}
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment