[FFmpeg-cvslog] r21305 - trunk/libavcodec/h264.h
michael
subversion
Tue Jan 19 00:30:21 CET 2010
Author: michael
Date: Tue Jan 19 00:30:21 2010
New Revision: 21305
Log:
Dont init chroma elements of non_zero_count_cache for deblock.
Modified:
trunk/libavcodec/h264.h
Modified: trunk/libavcodec/h264.h
==============================================================================
--- trunk/libavcodec/h264.h Tue Jan 19 00:27:53 2010 (r21304)
+++ trunk/libavcodec/h264.h Tue Jan 19 00:30:21 2010 (r21305)
@@ -959,14 +959,17 @@ static av_always_inline int fill_caches(
//FIXME constraint_intra_pred & partitioning & nnz (let us hope this is just a typo in the spec)
if(top_type){
*(uint32_t*)&h->non_zero_count_cache[4+8*0]= *(uint32_t*)&h->non_zero_count[top_xy][4+3*8];
-
+ if(!for_deblock){
h->non_zero_count_cache[1+8*0]= h->non_zero_count[top_xy][1+1*8];
h->non_zero_count_cache[2+8*0]= h->non_zero_count[top_xy][2+1*8];
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{
h->non_zero_count_cache[4+8*0]=
h->non_zero_count_cache[5+8*0]=
h->non_zero_count_cache[6+8*0]=
@@ -977,6 +980,7 @@ static av_always_inline int fill_caches(
h->non_zero_count_cache[1+8*3]=
h->non_zero_count_cache[2+8*3]= CABAC && !IS_INTRA(mb_type) ? 0 : 64;
+ }
}
@@ -984,13 +988,20 @@ static av_always_inline int fill_caches(
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]];
h->non_zero_count_cache[3+8*2 + 2*8*i]= h->non_zero_count[left_xy[i]][left_block[8+1+2*i]];
+ if(!for_deblock){
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{
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;
+ }
}
}
More information about the ffmpeg-cvslog
mailing list