comparison asf.c @ 351:c072833fe7f4 libavformat

use packet number instead of byte number internally for seeking

350:9a6c7a56405c

    av_free(st->codec.palctrl);
    }
    return 0;
}

static int64_t asf_align(AVFormatContext *s, int64_t pos){
    ASFContext *asf = s->priv_data;
    assert(pos >= 0);
    
    return pos/ asf->packet_size * asf->packet_size;
}

// Added to support seeking after packets have been read
// If information is not reset, read_packet fails due to
// leftover information from previous reads
static void asf_reset_header(AVFormatContext *s)
{

    AVPacket pkt1, *pkt = &pkt1;
    ASFStream *asf_st;
    int64_t pts;
    int64_t pos= *ppos;

    // ensure we are on the packet boundry
    assert(pos % asf->packet_size == 0);
//printf("asf_read_pts\n");
    url_fseek(&s->pb, pos + s->data_offset, SEEK_SET);
    asf_reset_header(s);
    do{
        if (av_read_frame(s, pkt) < 0){
            printf("seek failed\n");
    	    return AV_NOPTS_VALUE;

        pts= pkt->pts;

        av_free_packet(pkt);
    }while(pkt->stream_index != stream_index || !(pkt->flags&PKT_FLAG_KEY));
    asf_st= s->streams[stream_index]->priv_data;
    *ppos= asf_st->packet_pos - s->data_offset;
//printf("found keyframe at %Ld stream %d stamp:%Ld\n", *ppos, stream_index, pts);

    return pts;
}

    pos_min = 0;
    pts_min = asf_read_pts(s, &pos_min, stream_index);
    if (pts_min == AV_NOPTS_VALUE) return -1;
   
    pos_max = asf_align(s, url_filesize(url_fileno(&s->pb)) - 1 - s->data_offset); //FIXME wrong
    pts_max = pts_min + s->duration;
    pos_limit= pos_max;

    while (pos_min < pos_limit) {
        int64_t start_pos;

        assert(pos_limit <= pos_max);
        assert(pos_limit % asf->packet_size == 0);
        assert(pos_max % asf->packet_size == 0);
        assert(pos_min % asf->packet_size == 0);

        // interpolate position (better than dichotomy)
        pos = (int64_t)((double)(pos_limit - pos_min) *
                        (double)(pts - pts_min) /
                        (double)(pts_max - pts_min)) + pos_min;
        pos= asf_align(s, pos);
        if(pos <= pos_min)
            pos= pos_min + asf->packet_size;
        else if(pos > pos_limit)
            pos= pos_limit;
        start_pos= pos;

        // read the next timestamp 
    	cur_pts = asf_read_pts(s, &pos, stream_index);    

        if (cur_pts == AV_NOPTS_VALUE) {
            return -1;
        } else if (pts < cur_pts) {
            pos_limit = start_pos - asf->packet_size;
            pos_max = pos;
            pts_max = cur_pts;
        } else {
            pos_min = pos;
            pts_min = cur_pts;

            if (pts == cur_pts)
                break;
        }
    }
    pos = pos_min;
    url_fseek(&s->pb, pos + s->data_offset, SEEK_SET);
    asf_reset_header(s);
    return 0;
}

static AVInputFormat asf_iformat = {

351:c072833fe7f4

    av_free(st->codec.palctrl);
    }
    return 0;
}

// Added to support seeking after packets have been read
// If information is not reset, read_packet fails due to
// leftover information from previous reads
static void asf_reset_header(AVFormatContext *s)
{

    AVPacket pkt1, *pkt = &pkt1;
    ASFStream *asf_st;
    int64_t pts;
    int64_t pos= *ppos;

//printf("asf_read_pts\n");
    url_fseek(&s->pb, pos*asf->packet_size + s->data_offset, SEEK_SET);
    asf_reset_header(s);
    do{
        if (av_read_frame(s, pkt) < 0){
            printf("seek failed\n");
    	    return AV_NOPTS_VALUE;

        pts= pkt->pts;

        av_free_packet(pkt);
    }while(pkt->stream_index != stream_index || !(pkt->flags&PKT_FLAG_KEY));
    asf_st= s->streams[stream_index]->priv_data;

    assert((asf_st->packet_pos - s->data_offset) % asf->packet_size == 0);
    *ppos= (asf_st->packet_pos - s->data_offset) / asf->packet_size;
//printf("found keyframe at %Ld stream %d stamp:%Ld\n", *ppos, stream_index, pts);

    return pts;
}

    pos_min = 0;
    pts_min = asf_read_pts(s, &pos_min, stream_index);
    if (pts_min == AV_NOPTS_VALUE) return -1;
   
    pos_max = (url_filesize(url_fileno(&s->pb)) - 1 - s->data_offset) / asf->packet_size; //FIXME wrong
    pts_max = pts_min + s->duration;
    pos_limit= pos_max;

    while (pos_min < pos_limit) {
        int64_t start_pos;

        assert(pos_limit <= pos_max);

        // interpolate position (better than dichotomy)
        pos = (int64_t)((double)(pos_limit - pos_min) *
                        (double)(pts - pts_min) /
                        (double)(pts_max - pts_min)) + pos_min;
        pos/= asf->packet_size;
        if(pos <= pos_min)
            pos= pos_min + 1;
        else if(pos > pos_limit)
            pos= pos_limit;
        start_pos= pos;

        // read the next timestamp 
    	cur_pts = asf_read_pts(s, &pos, stream_index);    

        if (cur_pts == AV_NOPTS_VALUE) {
            return -1;
        } else if (pts < cur_pts) {
            pos_limit = start_pos - 1;
            pos_max = pos;
            pts_max = cur_pts;
        } else {
            pos_min = pos;
            pts_min = cur_pts;

            if (pts == cur_pts)
                break;
        }
    }
    pos = pos_min;
    url_fseek(&s->pb, pos*asf->packet_size + s->data_offset, SEEK_SET);
    asf_reset_header(s);
    return 0;
}

static AVInputFormat asf_iformat = {