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

Remove unneeded reset of non_zero_count_cache for deblock.

Browse Source 
Originally committed as revision 21414 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2010-01-23 22:11:46 +00:00
parent 01c511683f
commit 2c0ee01866
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/h264.h
View File

@@ -960,11 +960,7 @@ static av_always_inline int fill_caches(H264Context *h, int mb_type, int for_deb
h->non_zero_count_cache[1+8*3]= h->non_zero_count[top_xy][1+2*8];
h->non_zero_count_cache[2+8*3]= h->non_zero_count[top_xy][2+2*8];
}
}else{
if(for_deblock){
*(uint32_t*)&h->non_zero_count_cache[4+8*0]= 0;
}else{
}else if(!for_deblock){
h->non_zero_count_cache[1+8*0]=
h->non_zero_count_cache[2+8*0]=
@@ -973,8 +969,6 @@ static av_always_inline int fill_caches(H264Context *h, int mb_type, int for_deb
*(uint32_t*)&h->non_zero_count_cache[4+8*0]= CABAC && !IS_INTRA(mb_type) ? 0 : 0x40404040;
}
}
for (i=0; i<2; i++) {
if(left_type[i]){
h->non_zero_count_cache[3+8*1 + 2*8*i]= h->non_zero_count[left_xy[i]][left_block[8+0+2*i]];
@@ -983,18 +977,13 @@ static av_always_inline int fill_caches(H264Context *h, int mb_type, int for_deb
h->non_zero_count_cache[0+8*1 + 8*i]= h->non_zero_count[left_xy[i]][left_block[8+4+2*i]];
h->non_zero_count_cache[0+8*4 + 8*i]= h->non_zero_count[left_xy[i]][left_block[8+5+2*i]];
}
}else{
if(for_deblock){
h->non_zero_count_cache[3+8*1 + 2*8*i]=
h->non_zero_count_cache[3+8*2 + 2*8*i]= 0;
}else{
}else if(!for_deblock){
h->non_zero_count_cache[3+8*1 + 2*8*i]=
h->non_zero_count_cache[3+8*2 + 2*8*i]=
h->non_zero_count_cache[0+8*1 + 8*i]=
h->non_zero_count_cache[0+8*4 + 8*i]= CABAC && !IS_INTRA(mb_type) ? 0 : 64;
}
}
}
// CAVLC 8x8dct requires NNZ values for residual decoding that differ from what the loop filter needs
if(for_deblock && !CABAC && h->pps.transform_8x8_mode){