diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2003-02-20 17:30:51 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-02-20 17:30:51 +0000 |
| commit | b2a3fcb7e144d42a55f14df6d10f167f0f79fb8b (patch) | |
| tree | f664b870247e9fe31d9791ed27ad1b84f3a65dd6 /libavcodec/libpostproc | |
| parent | 8f3cf0f64cc01e6a59e7b3b276316fd2c383344f (diff) | |
| download | ffmpeg-b2a3fcb7e144d42a55f14df6d10f167f0f79fb8b.tar.gz | |
reverse incorrect stride < (width+7)&~7 fix
Originally committed as revision 1594 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/libpostproc')
| -rw-r--r-- | libavcodec/libpostproc/postprocess.c | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/libavcodec/libpostproc/postprocess.c b/libavcodec/libpostproc/postprocess.c index c03a36ed3f..cf93fa8505 100644 --- a/libavcodec/libpostproc/postprocess.c +++ b/libavcodec/libpostproc/postprocess.c @@ -800,7 +800,6 @@ void pp_postprocess(uint8_t * src[3], int srcStride[3], { int mbWidth = (width+15)>>4; int mbHeight= (height+15)>>4; - int horz_size,vert_size; PPMode *mode = (PPMode*)vm; PPContext *c = (PPContext*)vc; int minStride= MAX(srcStride[0], dstStride[0]); @@ -848,40 +847,18 @@ for(y=0; y<mbHeight; y++){ printf("using npp filters 0x%X/0x%X\n", mode->lumMode, mode->chromMode); } - /* special case for 405.avi: (width=356)%8 !=0 */ - horz_size = (width / BLOCK_SIZE) * BLOCK_SIZE; - postProcess(src[0], srcStride[0], dst[0], dstStride[0], - horz_size, height, QP_store, QPStride, 0, mode, c); - - if(horz_size < width) - { - unsigned y,tail; - tail = width-horz_size; - for(y=0; y<height; y++) - memcpy(&(dst[0][y*dstStride[0]+horz_size]), &(src[0][y*srcStride[0]+horz_size]), tail); - } + width, height, QP_store, QPStride, 0, mode, c); width = (width )>>c->hChromaSubSample; - horz_size = (width / BLOCK_SIZE) * BLOCK_SIZE; height = (height)>>c->vChromaSubSample; if(mode->chromMode) { postProcess(src[1], srcStride[1], dst[1], dstStride[1], - horz_size, height, QP_store, QPStride, 1, mode, c); + width, height, QP_store, QPStride, 1, mode, c); postProcess(src[2], srcStride[2], dst[2], dstStride[2], - horz_size, height, QP_store, QPStride, 2, mode, c); - if(horz_size < width) - { - unsigned y,tail; - tail = width-horz_size; - for(y=0; y<height; y++) - { - memcpy(&(dst[1][y*dstStride[1]+horz_size]), &(src[1][y*srcStride[1]+horz_size]), tail); - memcpy(&(dst[2][y*dstStride[2]+horz_size]), &(src[2][y*srcStride[2]+horz_size]), tail); - } - } + width, height, QP_store, QPStride, 2, mode, c); } else if(srcStride[1] == dstStride[1] && srcStride[2] == dstStride[2]) { |