Mercurial > libavcodec.hg
comparison dv.c @ 3147:99263b3a00e1 libavcodec
replace for loop with 2 asserts()
author | michael |
---|---|
date | Sun, 26 Feb 2006 15:24:42 +0000 |
parents | dcae1bde37ac |
children | d4d8e5436be7 |
comparison
equal
deleted
inserted
replaced
3146:dcae1bde37ac | 3147:99263b3a00e1 |
---|---|
744 for (a=0; a<4; a++) { | 744 for (a=0; a<4; a++) { |
745 if (b->area_q[a] != dv_quant_shifts[qnos[i] + dv_quant_offset[b->cno]][a]) { | 745 if (b->area_q[a] != dv_quant_shifts[qnos[i] + dv_quant_offset[b->cno]][a]) { |
746 b->bit_size[a] = 1; // 4 areas 4 bits for EOB :) | 746 b->bit_size[a] = 1; // 4 areas 4 bits for EOB :) |
747 b->area_q[a]++; | 747 b->area_q[a]++; |
748 prev= b->prev[a]; | 748 prev= b->prev[a]; |
749 assert(b->next[prev] >= mb_area_start[a+1] || b->mb[prev]); | |
749 for (k= b->next[prev] ; k<mb_area_start[a+1]; k= b->next[k]) { | 750 for (k= b->next[prev] ; k<mb_area_start[a+1]; k= b->next[k]) { |
750 b->mb[k] >>= 1; | 751 b->mb[k] >>= 1; |
751 if (b->mb[k]) { | 752 if (b->mb[k]) { |
752 b->bit_size[a] += dv_rl2vlc_size(k - prev - 1, b->mb[k]); | 753 b->bit_size[a] += dv_rl2vlc_size(k - prev - 1, b->mb[k]); |
753 prev= k; | 754 prev= k; |
757 b->prev[a2] = prev; | 758 b->prev[a2] = prev; |
758 assert(a2<4); | 759 assert(a2<4); |
759 assert(b->mb[b->next[k]]); | 760 assert(b->mb[b->next[k]]); |
760 b->bit_size[a2] += dv_rl2vlc_size(b->next[k] - prev - 1, b->mb[b->next[k]]) | 761 b->bit_size[a2] += dv_rl2vlc_size(b->next[k] - prev - 1, b->mb[b->next[k]]) |
761 -dv_rl2vlc_size(b->next[k] - k - 1, b->mb[b->next[k]]); | 762 -dv_rl2vlc_size(b->next[k] - k - 1, b->mb[b->next[k]]); |
762 for(; (b->prev[a2]==k) && (a2<4); a2++) | 763 assert(b->prev[a2]==k && (a2+1 >= 4 || b->prev[a2+1]!=k)); |
763 b->prev[a2] = prev; | 764 b->prev[a2] = prev; |
764 } | 765 } |
765 b->next[prev] = b->next[k]; | 766 b->next[prev] = b->next[k]; |
766 } | 767 } |
767 } | 768 } |
768 b->prev[a+1]= prev; | 769 b->prev[a+1]= prev; |