comparison matroska.c @ 1456:34d0d965a0d0 libavformat

Add support for block duration. Patch by Steve Lhomme % slhomme A divxcorp P com % Original thread: Date: Mon, 06 Nov 2006 19:22:14 +0100 Subject: [Ffmpeg-devel] [PATCH] Matroska block duration support

1455:e0e7ac1b8601

matroska_parse_blockgroup (MatroskaDemuxContext *matroska,
                           uint64_t              cluster_time)
{
    int res = 0;
    uint32_t id;
    AVPacket *pkt;
    int is_keyframe = PKT_FLAG_KEY, last_num_packets = matroska->num_packets;

    av_log(matroska->ctx, AV_LOG_DEBUG, "parsing blockgroup...\n");

    while (res == 0) {
        if (!(id = ebml_peek_id(matroska, &matroska->level_up))) {

            case MATROSKA_ID_BLOCK: {
                uint8_t *data, *origdata;
                int size;
                int16_t block_time;
                uint32_t *lace_size = NULL;
                int n, track, flags, laces = 0;
                uint64_t num;
                int64_t pos= url_ftell(&matroska->ctx->pb);

                if ((res = ebml_read_binary(matroska, &id, &data, &size)) < 0)
                    break;

                av_free(origdata);
                break;
            }

            case MATROSKA_ID_BLOCKDURATION: {
                uint64_t num;
                if ((res = ebml_read_uint(matroska, &id, &num)) < 0)
                    break;
                av_log(matroska->ctx, AV_LOG_INFO,
                       "FIXME: implement support for BlockDuration\n");
                break;
            }

            case MATROSKA_ID_BLOCKREFERENCE:
                /* We've found a reference, so not even the first frame in

        if (matroska->level_up) {
            matroska->level_up--;
            break;
        }
    }

    return res;
}

1456:34d0d965a0d0

matroska_parse_blockgroup (MatroskaDemuxContext *matroska,
                           uint64_t              cluster_time)
{
    int res = 0;
    uint32_t id;
    AVPacket *pkt = NULL;
    int is_keyframe = PKT_FLAG_KEY, last_num_packets = matroska->num_packets;
    uint64_t duration = AV_NOPTS_VALUE;
    int track = -1;

    av_log(matroska->ctx, AV_LOG_DEBUG, "parsing blockgroup...\n");

    while (res == 0) {
        if (!(id = ebml_peek_id(matroska, &matroska->level_up))) {

            case MATROSKA_ID_BLOCK: {
                uint8_t *data, *origdata;
                int size;
                int16_t block_time;
                uint32_t *lace_size = NULL;
                int n, flags, laces = 0;
                uint64_t num;
                int64_t pos= url_ftell(&matroska->ctx->pb);

                if ((res = ebml_read_binary(matroska, &id, &data, &size)) < 0)
                    break;

                av_free(origdata);
                break;
            }

            case MATROSKA_ID_BLOCKDURATION: {
                if ((res = ebml_read_uint(matroska, &id, &duration)) < 0)
                    break;
                break;
            }

            case MATROSKA_ID_BLOCKREFERENCE:
                /* We've found a reference, so not even the first frame in

        if (matroska->level_up) {
            matroska->level_up--;
            break;
        }
    }

    if (pkt)
    {
        if (duration != AV_NOPTS_VALUE)
            pkt->duration = duration;
        else if (track >= 0 && track < matroska->num_tracks)
            pkt->duration = matroska->tracks[track]->default_duration / matroska->time_scale;
    }

    return res;
}