RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

hevc: fix transform_skip which is only valid for 4x4(cherry picked from commit 740e5a71e5121dbf3fabdc4fec97829c18ecc2d8) 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Mickaël Raulet 2013-10-21 12:44:18 +02:00 committed by Michael Niedermayer
parent 1c8de4dd94
commit c68faca68e
1 changed files with 6 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libavcodec/hevcdsp_template.c
View File

@ -109,7 +109,6 @@ static void FUNC(transform_skip)(uint8_t *_dst, int16_t *coeffs, ptrdiff_t _stri
{ {
pixel *dst = (pixel*)_dst; pixel *dst = (pixel*)_dst;
ptrdiff_t stride = _stride / sizeof(pixel); ptrdiff_t stride = _stride / sizeof(pixel);
int size = 4;
int shift = 13 - BIT_DEPTH; int shift = 13 - BIT_DEPTH;
#if BIT_DEPTH <= 13 #if BIT_DEPTH <= 13
int offset = 1 << (shift - 1); int offset = 1 << (shift - 1);
@ -117,39 +116,12 @@ static void FUNC(transform_skip)(uint8_t *_dst, int16_t *coeffs, ptrdiff_t _stri
int offset = 0; int offset = 0;
#endif #endif
int x, y; int x, y;
switch (size){
case 32: for (y = 0; y < 4*4; y+=4) {
for (y = 0; y < 32*32; y+=32) { for (x = 0; x < 4; x++) {
for (x = 0; x < 32; x++) { dst[x] = av_clip_pixel(dst[x] + ((coeffs[y + x] + offset) >> shift));
dst[x] = av_clip_pixel(dst[x] + ((coeffs[y + x] + offset) >> shift)); }
} dst += stride;
dst += stride;
}
break;
case 16:
for (y = 0; y < 16*16; y+=16) {
for (x = 0; x < 16; x++) {
dst[x] = av_clip_pixel(dst[x] + ((coeffs[y + x] + offset) >> shift));
}
dst += stride;
}
break;
case 8:
for (y = 0; y < 8*8; y+=8) {
for (x = 0; x < 8; x++) {
dst[x] = av_clip_pixel(dst[x] + ((coeffs[y + x] + offset) >> shift));
}
dst += stride;
}
break;
case 4:
for (y = 0; y < 4*4; y+=4) {
for (x = 0; x < 4; x++) {
dst[x] = av_clip_pixel(dst[x] + ((coeffs[y + x] + offset) >> shift));
}
dst += stride;
}
break;
} }
} }