# HG changeset patch # User michael # Date 1267664595 0 # Node ID 2a9acfd46715589825391ce07ee9fb1c010de4a1 # Parent 1ea249b4c6e7622a2ece0ff28b12cb71507aa523 Optimize *_type init, 1.5 cpu cycles faster. diff -r 1ea249b4c6e7 -r 2a9acfd46715 h264.h --- a/h264.h Wed Mar 03 23:27:43 2010 +0000 +++ b/h264.h Thu Mar 04 01:03:15 2010 +0000 @@ -824,10 +824,18 @@ h->left_type[0] = s->current_picture.mb_type[left_xy[0]] ; h->left_type[1] = s->current_picture.mb_type[left_xy[1]] ; + if(FMO){ if(h->slice_table[topleft_xy ] != h->slice_num) h->topleft_type = 0; if(h->slice_table[top_xy ] != h->slice_num) h->top_type = 0; + if(h->slice_table[left_xy[0] ] != h->slice_num) h->left_type[0] = h->left_type[1] = 0; + }else{ + if(h->slice_table[topleft_xy ] != h->slice_num){ + h->topleft_type = 0; + if(h->slice_table[top_xy ] != h->slice_num) h->top_type = 0; + if(h->slice_table[left_xy[0] ] != h->slice_num) h->left_type[0] = h->left_type[1] = 0; + } + } if(h->slice_table[topright_xy] != h->slice_num) h->topright_type= 0; - if(h->slice_table[left_xy[0] ] != h->slice_num) h->left_type[0] = h->left_type[1] = 0; } static void fill_decode_caches(H264Context *h, int mb_type){