virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

rv34: clean a bit availability checks.

Browse Source 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
This commit is contained in:
Christophe GISQUET 2012-01-16 20:54:26 +01:00 committed by Ronald S. Bultje
parent af49e1766b
commit 7104c23bd1
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/rv34.c
View File

@ -472,26 +472,26 @@ static void rv34_pred_mv(RV34DecContext *r, int block_type, int subblock_no, int
int A[2] = {0}, B[2], C[2]; int A[2] = {0}, B[2], C[2];
int i, j; int i, j;
int mx, my; int mx, my;
int avail_index = avail_indexes[subblock_no]; int* avail = r->avail_cache + avail_indexes[subblock_no];
int c_off = part_sizes_w[block_type]; int c_off = part_sizes_w[block_type];
mv_pos += (subblock_no & 1) + (subblock_no >> 1)*s->b8_stride; mv_pos += (subblock_no & 1) + (subblock_no >> 1)*s->b8_stride;
if(subblock_no == 3) if(subblock_no == 3)
c_off = -1; c_off = -1;
if(r->avail_cache[avail_index - 1]){ if(avail[-1]){
A[0] = s->current_picture_ptr->f.motion_val[0][mv_pos-1][0]; A[0] = s->current_picture_ptr->f.motion_val[0][mv_pos-1][0];
A[1] = s->current_picture_ptr->f.motion_val[0][mv_pos-1][1]; A[1] = s->current_picture_ptr->f.motion_val[0][mv_pos-1][1];
} }
if(r->avail_cache[avail_index - 4]){ if(avail[-4]){
B[0] = s->current_picture_ptr->f.motion_val[0][mv_pos-s->b8_stride][0]; B[0] = s->current_picture_ptr->f.motion_val[0][mv_pos-s->b8_stride][0];
B[1] = s->current_picture_ptr->f.motion_val[0][mv_pos-s->b8_stride][1]; B[1] = s->current_picture_ptr->f.motion_val[0][mv_pos-s->b8_stride][1];
}else{ }else{
B[0] = A[0]; B[0] = A[0];
B[1] = A[1]; B[1] = A[1];
} }
if(!r->avail_cache[avail_index - 4 + c_off]){ if(!avail[c_off-4]){
if(r->avail_cache[avail_index - 4] && (r->avail_cache[avail_index - 1] || r->rv30)){ if(avail[-4] && (avail[-1] || r->rv30)){
C[0] = s->current_picture_ptr->f.motion_val[0][mv_pos-s->b8_stride-1][0]; C[0] = s->current_picture_ptr->f.motion_val[0][mv_pos-s->b8_stride-1][0];
C[1] = s->current_picture_ptr->f.motion_val[0][mv_pos-s->b8_stride-1][1]; C[1] = s->current_picture_ptr->f.motion_val[0][mv_pos-s->b8_stride-1][1];
}else{ }else{
@ -611,21 +611,21 @@ static void rv34_pred_mv_rv3(RV34DecContext *r, int block_type, int dir)
int A[2] = {0}, B[2], C[2]; int A[2] = {0}, B[2], C[2];
int i, j, k; int i, j, k;
int mx, my; int mx, my;
int avail_index = avail_indexes[0]; int* avail = r->avail_cache + avail_indexes[0];
if(r->avail_cache[avail_index - 1]){ if(avail[-1]){
A[0] = s->current_picture_ptr->f.motion_val[0][mv_pos - 1][0]; A[0] = s->current_picture_ptr->f.motion_val[0][mv_pos - 1][0];
A[1] = s->current_picture_ptr->f.motion_val[0][mv_pos - 1][1]; A[1] = s->current_picture_ptr->f.motion_val[0][mv_pos - 1][1];
} }
if(r->avail_cache[avail_index - 4]){ if(avail[-4]){
B[0] = s->current_picture_ptr->f.motion_val[0][mv_pos - s->b8_stride][0]; B[0] = s->current_picture_ptr->f.motion_val[0][mv_pos - s->b8_stride][0];
B[1] = s->current_picture_ptr->f.motion_val[0][mv_pos - s->b8_stride][1]; B[1] = s->current_picture_ptr->f.motion_val[0][mv_pos - s->b8_stride][1];
}else{ }else{
B[0] = A[0]; B[0] = A[0];
B[1] = A[1]; B[1] = A[1];
} }
if(!r->avail_cache[avail_index - 4 + 2]){ if(!avail[-4 + 2]){
if(r->avail_cache[avail_index - 4] && (r->avail_cache[avail_index - 1])){ if(avail[-4] && (avail[-1])){
C[0] = s->current_picture_ptr->f.motion_val[0][mv_pos - s->b8_stride - 1][0]; C[0] = s->current_picture_ptr->f.motion_val[0][mv_pos - s->b8_stride - 1][0];
C[1] = s->current_picture_ptr->f.motion_val[0][mv_pos - s->b8_stride - 1][1]; C[1] = s->current_picture_ptr->f.motion_val[0][mv_pos - s->b8_stride - 1][1];
}else{ }else{