comparison h264.c @ 3776:1843a85123b7 libavcodec

fix some signedness warnings
author mru
date Wed, 27 Sep 2006 19:47:39 +0000
parents 2265410d1d74
children 6a40092eb9e6
comparison
equal deleted inserted replaced
3775:8e1ed8300165 3776:1843a85123b7
617 h->non_zero_count_cache[scan8[i]] = (v>>i)&1; 617 h->non_zero_count_cache[scan8[i]] = (v>>i)&1;
618 for(list=0; list<1+(h->slice_type==B_TYPE); list++){ 618 for(list=0; list<1+(h->slice_type==B_TYPE); list++){
619 if(USES_LIST(mb_type,list)){ 619 if(USES_LIST(mb_type,list)){
620 uint32_t *src = (uint32_t*)s->current_picture.motion_val[list][h->mb2b_xy[mb_xy]]; 620 uint32_t *src = (uint32_t*)s->current_picture.motion_val[list][h->mb2b_xy[mb_xy]];
621 uint32_t *dst = (uint32_t*)h->mv_cache[list][scan8[0]]; 621 uint32_t *dst = (uint32_t*)h->mv_cache[list][scan8[0]];
622 uint8_t *ref = &s->current_picture.ref_index[list][h->mb2b8_xy[mb_xy]]; 622 int8_t *ref = &s->current_picture.ref_index[list][h->mb2b8_xy[mb_xy]];
623 for(i=0; i<4; i++, dst+=8, src+=h->b_stride){ 623 for(i=0; i<4; i++, dst+=8, src+=h->b_stride){
624 dst[0] = src[0]; 624 dst[0] = src[0];
625 dst[1] = src[1]; 625 dst[1] = src[1];
626 dst[2] = src[2]; 626 dst[2] = src[2];
627 dst[3] = src[3]; 627 dst[3] = src[3];
1131 1131
1132 /* there is no consistent mapping of mvs to neighboring locations that will 1132 /* there is no consistent mapping of mvs to neighboring locations that will
1133 * make mbaff happy, so we can't move all this logic to fill_caches */ 1133 * make mbaff happy, so we can't move all this logic to fill_caches */
1134 if(FRAME_MBAFF){ 1134 if(FRAME_MBAFF){
1135 MpegEncContext *s = &h->s; 1135 MpegEncContext *s = &h->s;
1136 const int *mb_types = s->current_picture_ptr->mb_type; 1136 const uint32_t *mb_types = s->current_picture_ptr->mb_type;
1137 const int16_t *mv; 1137 const int16_t *mv;
1138 *(uint32_t*)h->mv_cache[list][scan8[0]-2] = 0; 1138 *(uint32_t*)h->mv_cache[list][scan8[0]-2] = 0;
1139 *C = h->mv_cache[list][scan8[0]-2]; 1139 *C = h->mv_cache[list][scan8[0]-2];
1140 1140
1141 if(!MB_FIELD 1141 if(!MB_FIELD
1719 *(uint64_t*)h->mvd_table[list][b_xy + 2 + y*h->b_stride]= *(uint64_t*)h->mvd_cache[list][scan8[0]+2 + 8*y]; 1719 *(uint64_t*)h->mvd_table[list][b_xy + 2 + y*h->b_stride]= *(uint64_t*)h->mvd_cache[list][scan8[0]+2 + 8*y];
1720 } 1720 }
1721 } 1721 }
1722 1722
1723 { 1723 {
1724 uint8_t *ref_index = &s->current_picture.ref_index[list][b8_xy]; 1724 int8_t *ref_index = &s->current_picture.ref_index[list][b8_xy];
1725 ref_index[0+0*h->b8_stride]= h->ref_cache[list][scan8[0]]; 1725 ref_index[0+0*h->b8_stride]= h->ref_cache[list][scan8[0]];
1726 ref_index[1+0*h->b8_stride]= h->ref_cache[list][scan8[4]]; 1726 ref_index[1+0*h->b8_stride]= h->ref_cache[list][scan8[4]];
1727 ref_index[0+1*h->b8_stride]= h->ref_cache[list][scan8[8]]; 1727 ref_index[0+1*h->b8_stride]= h->ref_cache[list][scan8[8]];
1728 ref_index[1+1*h->b8_stride]= h->ref_cache[list][scan8[12]]; 1728 ref_index[1+1*h->b8_stride]= h->ref_cache[list][scan8[12]];
1729 } 1729 }