comparison matroska.c @ 2014:de75a5a81f28 libavformat

add support for seeking to a keyframe instead of a random frame

2013:fc0b19650faa

        done;

    /* The index for seeking. */
    int num_indexes;
    MatroskaDemuxIndex *index;
} MatroskaDemuxContext;

/*
 * The first few functions handle EBML file parsing. The rest
 * is the document interpretation. Matroska really just is a

    flags = *data;
    data += 1;
    size -= 1;
    if (is_keyframe == -1)
        is_keyframe = flags & 1 ? PKT_FLAG_KEY : 0;
    switch ((flags & 0x06) >> 1) {
        case 0x0: /* no lacing */
            laces = 1;
            lace_size = av_mallocz(sizeof(int));
            lace_size[0] = size;

    if (index < 0)
        return 0;

    /* do the seek */
    url_fseek(&s->pb, st->index_entries[index].pos, SEEK_SET);
    matroska->num_packets = 0;
    matroska->peek_id = 0;
    return 0;
}

2014:de75a5a81f28

        done;

    /* The index for seeking. */
    int num_indexes;
    MatroskaDemuxIndex *index;

    /* What to skip before effectively reading a packet. */
    int skip_to_keyframe;
    AVStream *skip_to_stream;
} MatroskaDemuxContext;

/*
 * The first few functions handle EBML file parsing. The rest
 * is the document interpretation. Matroska really just is a

    flags = *data;
    data += 1;
    size -= 1;
    if (is_keyframe == -1)
        is_keyframe = flags & 1 ? PKT_FLAG_KEY : 0;

    if (matroska->skip_to_keyframe) {
        if (!is_keyframe || st != matroska->skip_to_stream)
            return res;
        matroska->skip_to_keyframe = 0;
    }

    switch ((flags & 0x06) >> 1) {
        case 0x0: /* no lacing */
            laces = 1;
            lace_size = av_mallocz(sizeof(int));
            lace_size[0] = size;

    if (index < 0)
        return 0;

    /* do the seek */
    url_fseek(&s->pb, st->index_entries[index].pos, SEEK_SET);
    matroska->skip_to_keyframe = !(flags & AVSEEK_FLAG_ANY);
    matroska->skip_to_stream = st;
    matroska->num_packets = 0;
    matroska->peek_id = 0;
    return 0;
}