[FFmpeg-cvslog] r21416 - in trunk/libavcodec: h264.c h264_loopfilter.c

[michael]

Author: michael
Date: Sun Jan 24 14:20:17 2010
New Revision: 21416

Log:
Remove all uses of slice_type* from the loop filter, also remove its
initialization befre the loop filter.

Modified:
   trunk/libavcodec/h264.c
   trunk/libavcodec/h264_loopfilter.c

Modified: trunk/libavcodec/h264.c
==============================================================================
--- trunk/libavcodec/h264.c	Sun Jan 24 14:07:54 2010	(r21415)
+++ trunk/libavcodec/h264.c	Sun Jan 24 14:20:17 2010	(r21416)
@@ -2174,12 +2174,6 @@ static void loop_filter(H264Context *h){
                 h->slice_num= h->slice_table[mb_xy];
                 mb_type= s->current_picture.mb_type[mb_xy];
                 h->list_count= h->list_counts[mb_xy];
-                if(h->list_count==2){
-                    h->slice_type= h->slice_type_nos= FF_B_TYPE;
-                }else if(h->list_count==1){
-                    h->slice_type= h->slice_type_nos= FF_P_TYPE;
-                }else
-                    h->slice_type= h->slice_type_nos= FF_I_TYPE;
 
                 if(FRAME_MBAFF)
                     h->mb_mbaff = h->mb_field_decoding_flag = !!IS_INTERLACED(mb_type);

Modified: trunk/libavcodec/h264_loopfilter.c
==============================================================================
--- trunk/libavcodec/h264_loopfilter.c	Sun Jan 24 14:07:54 2010	(r21415)
+++ trunk/libavcodec/h264_loopfilter.c	Sun Jan 24 14:20:17 2010	(r21416)
@@ -381,7 +381,7 @@ void ff_h264_filter_mb_fast( H264Context
             int step = IS_8x8DCT(mb_type) ? 2 : 1;
             edges = (mb_type & MB_TYPE_16x16) && !(h->cbp & 15) ? 1 : 4;
             s->dsp.h264_loop_filter_strength( bS, h->non_zero_count_cache, h->ref_cache, h->mv_cache,
-                                              (h->slice_type_nos == FF_B_TYPE), edges, step, mask_edge0, mask_edge1, FIELD_PICTURE);
+                                              h->list_count==2, edges, step, mask_edge0, mask_edge1, FIELD_PICTURE);
         }
         if( IS_INTRA(s->current_picture.mb_type[mb_xy-1]) )
             bSv[0][0] = 0x0004000400040004ULL;
@@ -513,13 +513,13 @@ static av_always_inline void filter_mb_d
                 int bn_idx= b_idx - (dir ? 8:1);
                 int v = 0;
 
-                for( l = 0; !v && l < 1 + (h->slice_type_nos == FF_B_TYPE); l++ ) {
+                for( l = 0; !v && l < h->list_count; l++ ) {
                     v |= h->ref_cache[l][b_idx] != h->ref_cache[l][bn_idx] |
                          h->mv_cache[l][b_idx][0] - h->mv_cache[l][bn_idx][0] + 3 >= 7U |
                          FFABS( h->mv_cache[l][b_idx][1] - h->mv_cache[l][bn_idx][1] ) >= mvy_limit;
                 }
 
-                if(h->slice_type_nos == FF_B_TYPE && v){
+                if(h->list_count==2 && v){
                     v=0;
                     for( l = 0; !v && l < 2; l++ ) {
                         int ln= 1-l;
@@ -548,7 +548,7 @@ static av_always_inline void filter_mb_d
                 else if(!mv_done)
                 {
                     bS[i] = 0;
-                    for( l = 0; l < 1 + (h->slice_type_nos == FF_B_TYPE); l++ ) {
+                    for( l = 0; l < h->list_count; l++ ) {
                         if( h->ref_cache[l][b_idx] != h->ref_cache[l][bn_idx] |
                             h->mv_cache[l][b_idx][0] - h->mv_cache[l][bn_idx][0] + 3 >= 7U |
                             FFABS( h->mv_cache[l][b_idx][1] - h->mv_cache[l][bn_idx][1] ) >= mvy_limit ) {
@@ -557,7 +557,7 @@ static av_always_inline void filter_mb_d
                         }
                     }
 
-                    if(h->slice_type_nos == FF_B_TYPE && bS[i]){
+                    if(h->list_count == 2 && bS[i]){
                         bS[i] = 0;
                         for( l = 0; l < 2; l++ ) {
                             int ln= 1-l;