Mercurial > libavcodec.hg
comparison h264.c @ 3519:5ef29058581e libavcodec
10l in r5768 (broke mbaff)
author | lorenm |
---|---|
date | Thu, 27 Jul 2006 20:37:21 +0000 |
parents | c08b46172204 |
children | 47821be55b6c |
comparison
equal
deleted
inserted
replaced
3518:6bd323607d87 | 3519:5ef29058581e |
---|---|
839 h->ref_cache[list][scan8[0] - 1 + 2*8]= | 839 h->ref_cache[list][scan8[0] - 1 + 2*8]= |
840 h->ref_cache[list][scan8[0] - 1 + 3*8]= left_type[0] ? LIST_NOT_USED : PART_NOT_AVAILABLE; | 840 h->ref_cache[list][scan8[0] - 1 + 3*8]= left_type[0] ? LIST_NOT_USED : PART_NOT_AVAILABLE; |
841 assert((!left_type[0]) == (!left_type[1])); | 841 assert((!left_type[0]) == (!left_type[1])); |
842 } | 842 } |
843 | 843 |
844 if(for_deblock || (IS_DIRECT(mb_type) && !h->direct_spatial_mv_pred)) | 844 if((for_deblock || (IS_DIRECT(mb_type) && !h->direct_spatial_mv_pred)) && !FRAME_MBAFF) |
845 continue; | 845 continue; |
846 | 846 |
847 if(USES_LIST(topleft_type, list)){ | 847 if(USES_LIST(topleft_type, list)){ |
848 const int b_xy = h->mb2b_xy[topleft_xy] + 3 + 3*h->b_stride; | 848 const int b_xy = h->mb2b_xy[topleft_xy] + 3 + 3*h->b_stride; |
849 const int b8_xy= h->mb2b8_xy[topleft_xy] + 1 + h->b8_stride; | 849 const int b8_xy= h->mb2b8_xy[topleft_xy] + 1 + h->b8_stride; |
862 }else{ | 862 }else{ |
863 *(uint32_t*)h->mv_cache [list][scan8[0] + 4 - 1*8]= 0; | 863 *(uint32_t*)h->mv_cache [list][scan8[0] + 4 - 1*8]= 0; |
864 h->ref_cache[list][scan8[0] + 4 - 1*8]= topright_type ? LIST_NOT_USED : PART_NOT_AVAILABLE; | 864 h->ref_cache[list][scan8[0] + 4 - 1*8]= topright_type ? LIST_NOT_USED : PART_NOT_AVAILABLE; |
865 } | 865 } |
866 | 866 |
867 if(IS_SKIP(mb_type) || IS_DIRECT(mb_type)) | 867 if((IS_SKIP(mb_type) || IS_DIRECT(mb_type)) && !FRAME_MBAFF) |
868 continue; | 868 continue; |
869 | 869 |
870 h->ref_cache[list][scan8[5 ]+1] = | 870 h->ref_cache[list][scan8[5 ]+1] = |
871 h->ref_cache[list][scan8[7 ]+1] = | 871 h->ref_cache[list][scan8[7 ]+1] = |
872 h->ref_cache[list][scan8[13]+1] = //FIXME remove past 3 (init somewhere else) | 872 h->ref_cache[list][scan8[13]+1] = //FIXME remove past 3 (init somewhere else) |