RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mpeg4videoenc: use av_assert 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-07-10 19:37:53 +02:00
parent 43c609374a
commit 84d902fb92
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libavcodec/mpeg4videoenc.c
View File

@ -494,9 +494,9 @@ void ff_mpeg4_encode_mb(MpegEncContext * s,
} }
} }
assert(s->dquant>=-2 && s->dquant<=2); av_assert2(s->dquant>=-2 && s->dquant<=2);
assert((s->dquant&1)==0); av_assert2((s->dquant&1)==0);
assert(mb_type>=0); av_assert2(mb_type>=0);
/* nothing to do if this MB was skipped in the next P Frame */ /* nothing to do if this MB was skipped in the next P Frame */
if (s->next_picture.f.mbskip_table[s->mb_y * s->mb_stride + s->mb_x]) { //FIXME avoid DCT & ... if (s->next_picture.f.mbskip_table[s->mb_y * s->mb_stride + s->mb_x]) { //FIXME avoid DCT & ...
@ -516,7 +516,7 @@ void ff_mpeg4_encode_mb(MpegEncContext * s,
if ((cbp | motion_x | motion_y | mb_type) ==0) { if ((cbp | motion_x | motion_y | mb_type) ==0) {
/* direct MB with MV={0,0} */ /* direct MB with MV={0,0} */
assert(s->dquant==0); av_assert2(s->dquant==0);
put_bits(&s->pb, 1, 1); /* mb not coded modb1=1 */ put_bits(&s->pb, 1, 1); /* mb not coded modb1=1 */
@ -553,12 +553,12 @@ void ff_mpeg4_encode_mb(MpegEncContext * s,
} }
if(mb_type == 0){ if(mb_type == 0){
assert(s->mv_dir & MV_DIRECT); av_assert2(s->mv_dir & MV_DIRECT);
ff_h263_encode_motion_vector(s, motion_x, motion_y, 1); ff_h263_encode_motion_vector(s, motion_x, motion_y, 1);
s->b_count++; s->b_count++;
s->f_count++; s->f_count++;
}else{ }else{
assert(mb_type > 0 && mb_type < 4); av_assert2(mb_type > 0 && mb_type < 4);
if(s->mv_type != MV_TYPE_FIELD){ if(s->mv_type != MV_TYPE_FIELD){
if(s->mv_dir & MV_DIR_FORWARD){ if(s->mv_dir & MV_DIR_FORWARD){
ff_h263_encode_motion_vector(s, s->mv[0][0][0] - s->last_mv[0][0][0], ff_h263_encode_motion_vector(s, s->mv[0][0][0] - s->last_mv[0][0][0],
@ -719,7 +719,7 @@ void ff_mpeg4_encode_mb(MpegEncContext * s,
if(s->dquant) if(s->dquant)
put_bits(pb2, 2, dquant_code[s->dquant+2]); put_bits(pb2, 2, dquant_code[s->dquant+2]);
assert(!s->progressive_sequence); av_assert2(!s->progressive_sequence);
if(cbp) if(cbp)
put_bits(pb2, 1, s->interlaced_dct); put_bits(pb2, 1, s->interlaced_dct);
put_bits(pb2, 1, 1); put_bits(pb2, 1, 1);
@ -740,7 +740,7 @@ void ff_mpeg4_encode_mb(MpegEncContext * s,
ff_h263_encode_motion_vector(s, s->mv[0][1][0] - pred_x, ff_h263_encode_motion_vector(s, s->mv[0][1][0] - pred_x,
s->mv[0][1][1] - pred_y, s->f_code); s->mv[0][1][1] - pred_y, s->f_code);
}else{ }else{
assert(s->mv_type==MV_TYPE_8X8); av_assert2(s->mv_type==MV_TYPE_8X8);
put_bits(&s->pb, put_bits(&s->pb,
ff_h263_inter_MCBPC_bits[cbpc+16], ff_h263_inter_MCBPC_bits[cbpc+16],
ff_h263_inter_MCBPC_code[cbpc+16]); ff_h263_inter_MCBPC_code[cbpc+16]);
@ -1063,7 +1063,7 @@ void ff_mpeg4_encode_picture_header(MpegEncContext * s, int picture_number)
time_div= FFUDIV(s->time, s->avctx->time_base.den); time_div= FFUDIV(s->time, s->avctx->time_base.den);
time_mod= FFUMOD(s->time, s->avctx->time_base.den); time_mod= FFUMOD(s->time, s->avctx->time_base.den);
time_incr= time_div - s->last_time_base; time_incr= time_div - s->last_time_base;
assert(time_incr >= 0); av_assert0(time_incr >= 0);
while(time_incr--) while(time_incr--)
put_bits(&s->pb, 1, 1); put_bits(&s->pb, 1, 1);
@ -1148,8 +1148,8 @@ static void init_uni_dc_tab(void)
static void init_uni_mpeg4_rl_tab(RLTable *rl, uint32_t *bits_tab, uint8_t *len_tab){ static void init_uni_mpeg4_rl_tab(RLTable *rl, uint32_t *bits_tab, uint8_t *len_tab){
int slevel, run, last; int slevel, run, last;
assert(MAX_LEVEL >= 64); av_assert0(MAX_LEVEL >= 64);
assert(MAX_RUN >= 63); av_assert0(MAX_RUN >= 63);
for(slevel=-64; slevel<64; slevel++){ for(slevel=-64; slevel<64; slevel++){
if(slevel==0) continue; if(slevel==0) continue;