comparison snow.c @ 4011:5bce97c30a69 libavcodec

-1 is a valid return value in ratecontrol_1pass() -> 100l for takis
author michael
date Thu, 12 Oct 2006 20:55:42 +0000
parents 34fdffe98bd0
children daae66c03857
comparison
equal deleted inserted replaced
4010:ed375c76b5e0 4011:5bce97c30a69
3874 s->m.current_picture.mb_var_sum= 0; 3874 s->m.current_picture.mb_var_sum= 0;
3875 } 3875 }
3876 3876
3877 pict->quality= ff_rate_estimate_qscale(&s->m, 1); 3877 pict->quality= ff_rate_estimate_qscale(&s->m, 1);
3878 if (pict->quality < 0) 3878 if (pict->quality < 0)
3879 return -1; 3879 return INT_MIN;
3880 s->lambda= pict->quality * 3/2; 3880 s->lambda= pict->quality * 3/2;
3881 delta_qlog= qscale2qlog(pict->quality) - s->qlog; 3881 delta_qlog= qscale2qlog(pict->quality) - s->qlog;
3882 s->qlog+= delta_qlog; 3882 s->qlog+= delta_qlog;
3883 return delta_qlog; 3883 return delta_qlog;
3884 } 3884 }
4184 4184
4185 ff_spatial_dwt(s->spatial_dwt_buffer, w, h, w, s->spatial_decomposition_type, s->spatial_decomposition_count); 4185 ff_spatial_dwt(s->spatial_dwt_buffer, w, h, w, s->spatial_decomposition_type, s->spatial_decomposition_count);
4186 4186
4187 if(s->pass1_rc && plane_index==0){ 4187 if(s->pass1_rc && plane_index==0){
4188 int delta_qlog = ratecontrol_1pass(s, pict); 4188 int delta_qlog = ratecontrol_1pass(s, pict);
4189 if (delta_qlog < 0) 4189 if (delta_qlog <= INT_MIN)
4190 return -1; 4190 return -1;
4191 if(delta_qlog){ 4191 if(delta_qlog){
4192 //reordering qlog in the bitstream would eliminate this reset 4192 //reordering qlog in the bitstream would eliminate this reset
4193 ff_init_range_encoder(c, buf, buf_size); 4193 ff_init_range_encoder(c, buf, buf_size);
4194 memcpy(s->header_state, rc_header_bak, sizeof(s->header_state)); 4194 memcpy(s->header_state, rc_header_bak, sizeof(s->header_state));