comparison utils.c @ 462:b69898ffc92a libavformat

move time_base (pts_num/pts_den) from AVFormatContext -> AVStream

461:63540e5504f7

        }
    } else {
        ic->priv_data = NULL;
    }

    /* default pts settings is MPEG like */
    av_set_pts_info(ic, 33, 1, 90000);
    ic->last_pkt_pts = AV_NOPTS_VALUE;
    ic->last_pkt_dts = AV_NOPTS_VALUE;
    ic->last_pkt_stream_pts = AV_NOPTS_VALUE;
    ic->last_pkt_stream_dts = AV_NOPTS_VALUE;
    
    err = ic->iformat->read_header(ic, ap);
    if (err < 0)
        goto fail;

    if (pb)

/* convert the packet time stamp units and handle wrapping. The
   wrapping is handled by considering the next PTS/DTS as a delta to
   the previous value. We handle the delta as a fraction to avoid any
   rounding errors. */
static inline int64_t convert_timestamp_units(AVFormatContext *s,
                                        int64_t *plast_pkt_pts,
                                        int *plast_pkt_pts_frac,
                                        int64_t *plast_pkt_stream_pts,
                                        int64_t pts)
{

        stream_pts = pts;
        if (*plast_pkt_stream_pts != AV_NOPTS_VALUE) {
            shift = 64 - s->pts_wrap_bits;
            delta_pts = ((stream_pts - *plast_pkt_stream_pts) << shift) >> shift;
            /* XXX: overflow possible but very unlikely as it is a delta */
            delta_pts = delta_pts * AV_TIME_BASE * s->pts_num;
            pts = *plast_pkt_pts + (delta_pts / s->pts_den);
            pts_frac = *plast_pkt_pts_frac + (delta_pts % s->pts_den);
            if (pts_frac >= s->pts_den) {
                pts_frac -= s->pts_den;
                pts++;
            }
        } else {
            /* no previous pts, so no wrapping possible */
            pts = (int64_t)(((double)stream_pts * AV_TIME_BASE * s->pts_num) / 
                            (double)s->pts_den);
            pts_frac = 0;
        }
        *plast_pkt_stream_pts = stream_pts;
        *plast_pkt_pts = pts;
        *plast_pkt_pts_frac = pts_frac;

                    }
                }
                /* no more packets: really terminates parsing */
                return ret;
            }

            /* convert the packet time stamp units and handle wrapping */
            s->cur_pkt.pts = convert_timestamp_units(s, 
                                               &s->last_pkt_pts, &s->last_pkt_pts_frac,
                                               &s->last_pkt_stream_pts,
                                               s->cur_pkt.pts);
            s->cur_pkt.dts = convert_timestamp_units(s, 
                                               &s->last_pkt_dts,  &s->last_pkt_dts_frac,
                                               &s->last_pkt_stream_dts,
                                               s->cur_pkt.dts);
#if 0
            if (s->cur_pkt.stream_index == 0) {
                if (s->cur_pkt.pts != AV_NOPTS_VALUE) 
                    printf("PACKET pts=%0.3f\n", 

                if (s->cur_pkt.dts != AV_NOPTS_VALUE) 
                    printf("PACKET dts=%0.3f\n", 
                           (double)s->cur_pkt.dts / AV_TIME_BASE);
            }
#endif
            
            /* duration field */
            if (s->cur_pkt.duration != 0) {
                s->cur_pkt.duration = ((int64_t)s->cur_pkt.duration * AV_TIME_BASE * s->pts_num) / 
                    s->pts_den;
            }

            st = s->streams[s->cur_pkt.stream_index];
            s->cur_st = st;
            s->cur_ptr = s->cur_pkt.data;
            s->cur_len = s->cur_pkt.size;
            if (st->need_parsing && !st->parser) {
                st->parser = av_parser_init(st->codec.codec_id);

            break;
        read_size += pkt->size;
        st = ic->streams[pkt->stream_index];
        if (pkt->pts != AV_NOPTS_VALUE) {
            if (st->start_time == AV_NOPTS_VALUE)
                st->start_time = (int64_t)((double)pkt->pts * ic->pts_num * (double)AV_TIME_BASE / ic->pts_den);
        }
        av_free_packet(pkt);
    }

    /* we compute the minimum start_time and use it as default */

        if (ret != 0)
            break;
        read_size += pkt->size;
        st = ic->streams[pkt->stream_index];
        if (pkt->pts != AV_NOPTS_VALUE) {
            end_time = (int64_t)((double)pkt->pts * ic->pts_num * (double)AV_TIME_BASE / ic->pts_den);
            duration = end_time - st->start_time;
            if (duration > 0) {
                if (st->duration == AV_NOPTS_VALUE ||
                    st->duration < duration)
                    st->duration = duration;

    }
    st->index = s->nb_streams;
    st->id = id;
    st->start_time = AV_NOPTS_VALUE;
    st->duration = AV_NOPTS_VALUE;
    s->streams[s->nb_streams++] = st;
    return st;
}

/************************************************************/

int av_write_header(AVFormatContext *s)
{
    int ret, i;
    AVStream *st;

    /* default pts settings is MPEG like */
    av_set_pts_info(s, 33, 1, 90000);
    ret = s->oformat->write_header(s);
    if (ret < 0)
        return ret;

    /* init PTS generation */

        st = s->streams[i];

        switch (st->codec.codec_type) {
        case CODEC_TYPE_AUDIO:
            av_frac_init(&st->pts, 0, 0, 
                         (int64_t)s->pts_num * st->codec.sample_rate);
            break;
        case CODEC_TYPE_VIDEO:
            av_frac_init(&st->pts, 0, 0, 
                         (int64_t)s->pts_num * st->codec.frame_rate);
            break;
        default:
            break;
        }
    }

    AVStream *st;
    int64_t pts_mask;
    int ret, frame_size;

    st = s->streams[stream_index];
    pts_mask = (1LL << s->pts_wrap_bits) - 1;

    /* HACK/FIXME we skip all zero size audio packets so a encoder can pass pts by outputing zero size packets */
    if(st->codec.codec_type==CODEC_TYPE_AUDIO && size==0)
        ret = 0;
    else

        frame_size = get_audio_frame_size(&st->codec, size);

        /* HACK/FIXME, we skip the initial 0-size packets as they are most likely equal to the encoder delay,
           but it would be better if we had the real timestamps from the encoder */
        if (frame_size >= 0 && (size || st->pts.num!=st->pts.den>>1 || st->pts.val)) {
            av_frac_add(&st->pts, 
                        (int64_t)s->pts_den * frame_size);
        }
        break;
    case CODEC_TYPE_VIDEO:
        av_frac_add(&st->pts, 
                    (int64_t)s->pts_den * st->codec.frame_rate_base);
        break;
    default:
        break;
    }
    return ret;

 * @param pts_wrap_bits number of bits effectively used by the pts
 *        (used for wrap control, 33 is the value for MPEG) 
 * @param pts_num numerator to convert to seconds (MPEG: 1) 
 * @param pts_den denominator to convert to seconds (MPEG: 90000)
 */
void av_set_pts_info(AVFormatContext *s, int pts_wrap_bits,
                     int pts_num, int pts_den)
{
    s->pts_wrap_bits = pts_wrap_bits;
    s->pts_num = pts_num;
    s->pts_den = pts_den;
}

/* fraction handling */

/**

462:b69898ffc92a

        }
    } else {
        ic->priv_data = NULL;
    }

    err = ic->iformat->read_header(ic, ap);
    if (err < 0)
        goto fail;

    if (pb)

/* convert the packet time stamp units and handle wrapping. The
   wrapping is handled by considering the next PTS/DTS as a delta to
   the previous value. We handle the delta as a fraction to avoid any
   rounding errors. */
static inline int64_t convert_timestamp_units(AVStream *s,
                                        int64_t *plast_pkt_pts,
                                        int *plast_pkt_pts_frac,
                                        int64_t *plast_pkt_stream_pts,
                                        int64_t pts)
{

        stream_pts = pts;
        if (*plast_pkt_stream_pts != AV_NOPTS_VALUE) {
            shift = 64 - s->pts_wrap_bits;
            delta_pts = ((stream_pts - *plast_pkt_stream_pts) << shift) >> shift;
            /* XXX: overflow possible but very unlikely as it is a delta */
            delta_pts = delta_pts * AV_TIME_BASE * s->time_base.num;
            pts = *plast_pkt_pts + (delta_pts / s->time_base.den);
            pts_frac = *plast_pkt_pts_frac + (delta_pts % s->time_base.den);
            if (pts_frac >= s->time_base.den) {
                pts_frac -= s->time_base.den;
                pts++;
            }
        } else {
            /* no previous pts, so no wrapping possible */
//            pts = av_rescale(stream_pts, (int64_t)AV_TIME_BASE * s->time_base.num, s->time_base.den);
            pts = (int64_t)(((double)stream_pts * AV_TIME_BASE * s->time_base.num) / 
                            (double)s->time_base.den);
            pts_frac = 0;
        }
        *plast_pkt_stream_pts = stream_pts;
        *plast_pkt_pts = pts;
        *plast_pkt_pts_frac = pts_frac;

                    }
                }
                /* no more packets: really terminates parsing */
                return ret;
            }
            
            st = s->streams[s->cur_pkt.stream_index];

            /* convert the packet time stamp units and handle wrapping */
            s->cur_pkt.pts = convert_timestamp_units(st, 
                                               &st->last_pkt_pts, &st->last_pkt_pts_frac,
                                               &st->last_pkt_stream_pts,
                                               s->cur_pkt.pts);
            s->cur_pkt.dts = convert_timestamp_units(st, 
                                               &st->last_pkt_dts,  &st->last_pkt_dts_frac,
                                               &st->last_pkt_stream_dts,
                                               s->cur_pkt.dts);
#if 0
            if (s->cur_pkt.stream_index == 0) {
                if (s->cur_pkt.pts != AV_NOPTS_VALUE) 
                    printf("PACKET pts=%0.3f\n", 

                if (s->cur_pkt.dts != AV_NOPTS_VALUE) 
                    printf("PACKET dts=%0.3f\n", 
                           (double)s->cur_pkt.dts / AV_TIME_BASE);
            }
#endif

            /* duration field */
            s->cur_pkt.duration = av_rescale(s->cur_pkt.duration, AV_TIME_BASE * (int64_t)st->time_base.num, st->time_base.den);

            s->cur_st = st;
            s->cur_ptr = s->cur_pkt.data;
            s->cur_len = s->cur_pkt.size;
            if (st->need_parsing && !st->parser) {
                st->parser = av_parser_init(st->codec.codec_id);

            break;
        read_size += pkt->size;
        st = ic->streams[pkt->stream_index];
        if (pkt->pts != AV_NOPTS_VALUE) {
            if (st->start_time == AV_NOPTS_VALUE)
                st->start_time = av_rescale(pkt->pts, st->time_base.num * (int64_t)AV_TIME_BASE, st->time_base.den);
        }
        av_free_packet(pkt);
    }

    /* we compute the minimum start_time and use it as default */

        if (ret != 0)
            break;
        read_size += pkt->size;
        st = ic->streams[pkt->stream_index];
        if (pkt->pts != AV_NOPTS_VALUE) {
            end_time = av_rescale(pkt->pts, st->time_base.num * (int64_t)AV_TIME_BASE, st->time_base.den);
            duration = end_time - st->start_time;
            if (duration > 0) {
                if (st->duration == AV_NOPTS_VALUE ||
                    st->duration < duration)
                    st->duration = duration;

    }
    st->index = s->nb_streams;
    st->id = id;
    st->start_time = AV_NOPTS_VALUE;
    st->duration = AV_NOPTS_VALUE;

    /* default pts settings is MPEG like */
    av_set_pts_info(st, 33, 1, 90000);
    st->last_pkt_pts = AV_NOPTS_VALUE;
    st->last_pkt_dts = AV_NOPTS_VALUE;
    st->last_pkt_stream_pts = AV_NOPTS_VALUE;
    st->last_pkt_stream_dts = AV_NOPTS_VALUE;

    s->streams[s->nb_streams++] = st;
    return st;
}

/************************************************************/

int av_write_header(AVFormatContext *s)
{
    int ret, i;
    AVStream *st;

    ret = s->oformat->write_header(s);
    if (ret < 0)
        return ret;

    /* init PTS generation */

        st = s->streams[i];

        switch (st->codec.codec_type) {
        case CODEC_TYPE_AUDIO:
            av_frac_init(&st->pts, 0, 0, 
                         (int64_t)st->time_base.num * st->codec.sample_rate);
            break;
        case CODEC_TYPE_VIDEO:
            av_frac_init(&st->pts, 0, 0, 
                         (int64_t)st->time_base.num * st->codec.frame_rate);
            break;
        default:
            break;
        }
    }

    AVStream *st;
    int64_t pts_mask;
    int ret, frame_size;

    st = s->streams[stream_index];
    pts_mask = (1LL << st->pts_wrap_bits) - 1;

    /* HACK/FIXME we skip all zero size audio packets so a encoder can pass pts by outputing zero size packets */
    if(st->codec.codec_type==CODEC_TYPE_AUDIO && size==0)
        ret = 0;
    else

        frame_size = get_audio_frame_size(&st->codec, size);

        /* HACK/FIXME, we skip the initial 0-size packets as they are most likely equal to the encoder delay,
           but it would be better if we had the real timestamps from the encoder */
        if (frame_size >= 0 && (size || st->pts.num!=st->pts.den>>1 || st->pts.val)) {
            av_frac_add(&st->pts, (int64_t)st->time_base.den * frame_size);
        }
        break;
    case CODEC_TYPE_VIDEO:
        av_frac_add(&st->pts, (int64_t)st->time_base.den * st->codec.frame_rate_base);
        break;
    default:
        break;
    }
    return ret;

 * @param pts_wrap_bits number of bits effectively used by the pts
 *        (used for wrap control, 33 is the value for MPEG) 
 * @param pts_num numerator to convert to seconds (MPEG: 1) 
 * @param pts_den denominator to convert to seconds (MPEG: 90000)
 */
void av_set_pts_info(AVStream *s, int pts_wrap_bits,
                     int pts_num, int pts_den)
{
    s->pts_wrap_bits = pts_wrap_bits;
    s->time_base.num = pts_num;
    s->time_base.den = pts_den;
}

/* fraction handling */

/**