comparison utils.c @ 1379:4146500158b5 libavformat

Rename ABS macro to FFABS.

1378:a32812bb5bcf

        st->last_IP_pts= pkt->pts;
        /* cannot compute PTS if not present (we can compute it only
           by knowing the futur */
    } else if(pkt->pts != AV_NOPTS_VALUE || pkt->dts != AV_NOPTS_VALUE || pkt->duration){
        if(pkt->pts != AV_NOPTS_VALUE && pkt->duration){
            int64_t old_diff= ABS(st->cur_dts - pkt->duration - pkt->pts);
            int64_t new_diff= ABS(st->cur_dts - pkt->pts);
            if(old_diff < new_diff && old_diff < (pkt->duration>>3)){
                pkt->pts += pkt->duration;
//                av_log(NULL, AV_LOG_DEBUG, "id:%d old:%Ld new:%Ld dur:%d cur:%Ld size:%d\n", pkt->stream_index, old_diff, new_diff, pkt->duration, st->cur_dts, pkt->size);
            }
        }

                num= st->time_base.den*duration_count[i];
                den= st->time_base.num*duration_sum[i];

                best_error= INT64_MAX;
                for(j=1; j<60*12; j++){
                    error= ABS(1001*12*num - 1001*j*den);
                    if(error < best_error){
                        best_error= error;
                        av_reduce(&st->r_frame_rate.num, &st->r_frame_rate.den, j, 12, INT_MAX);
                    }
                }
                for(j=0; j<3; j++){
                    static const int ticks[]= {24,30,60};
                    error= ABS(1001*12*num - 1000*12*den * ticks[j]);
                    if(error < best_error){
                        best_error= error;
                        av_reduce(&st->r_frame_rate.num, &st->r_frame_rate.den, ticks[j]*1000, 1001, INT_MAX);
                    }
                }

1379:4146500158b5

        st->last_IP_pts= pkt->pts;
        /* cannot compute PTS if not present (we can compute it only
           by knowing the futur */
    } else if(pkt->pts != AV_NOPTS_VALUE || pkt->dts != AV_NOPTS_VALUE || pkt->duration){
        if(pkt->pts != AV_NOPTS_VALUE && pkt->duration){
            int64_t old_diff= FFABS(st->cur_dts - pkt->duration - pkt->pts);
            int64_t new_diff= FFABS(st->cur_dts - pkt->pts);
            if(old_diff < new_diff && old_diff < (pkt->duration>>3)){
                pkt->pts += pkt->duration;
//                av_log(NULL, AV_LOG_DEBUG, "id:%d old:%Ld new:%Ld dur:%d cur:%Ld size:%d\n", pkt->stream_index, old_diff, new_diff, pkt->duration, st->cur_dts, pkt->size);
            }
        }

                num= st->time_base.den*duration_count[i];
                den= st->time_base.num*duration_sum[i];

                best_error= INT64_MAX;
                for(j=1; j<60*12; j++){
                    error= FFABS(1001*12*num - 1001*j*den);
                    if(error < best_error){
                        best_error= error;
                        av_reduce(&st->r_frame_rate.num, &st->r_frame_rate.den, j, 12, INT_MAX);
                    }
                }
                for(j=0; j<3; j++){
                    static const int ticks[]= {24,30,60};
                    error= FFABS(1001*12*num - 1000*12*den * ticks[j]);
                    if(error < best_error){
                        best_error= error;
                        av_reduce(&st->r_frame_rate.num, &st->r_frame_rate.den, ticks[j]*1000, 1001, INT_MAX);
                    }
                }