comparison mov.c @ 954:7d778342142f libavformat

mov split chunks removal patch by (Baptiste COUDURIER / baptiste.coudurier smartjog com>

953:76deb0728cbd

#undef NDEBUG
#include <assert.h>

/* Allows seeking (MOV_SPLIT_CHUNKS should also be defined) */
#define MOV_SEEK

/* allows chunk splitting - should work now... */
/* in case you can't read a file, try commenting */
#define MOV_SPLIT_CHUNKS

/* Special handling for movies created with Minolta Dimaxe Xi*/
/* this fix should not interfere with other .mov files, but just in case*/
#define MOV_MINOLTA_FIX

    int i, a, b, m;
    int size;
    int idx;
    size = 0x0FFFFFFF;

#ifdef MOV_SPLIT_CHUNKS
    if (mov->partial) {
        sc = mov->partial;
        idx = sc->sample_to_chunk_index;

        if (idx < 0) return 0;

        offset = mov->next_chunk_offset;
        /* extract the sample */

        goto readchunk;
    }
#endif

again:
    sc = 0;
    if(offset == INT64_MAX)
        best_dts= INT64_MAX;

    idx = sc->sample_to_chunk_index;
    if (idx + 1 < sc->sample_to_chunk_sz && sc->next_chunk >= sc->sample_to_chunk[idx + 1].first)
        idx++;
    sc->sample_to_chunk_index = idx;
#ifdef MOV_SPLIT_CHUNKS
    /* split chunks into samples */
    if (sc->sample_size == 0 || sc->sample_size > 100) {
        if (idx >= 0 && sc->sample_to_chunk[idx].count != 1) {
            mov->partial = sc;
            /* we'll have to get those samples before next chunk */

        sc->current_sample++;
    }else if(idx + 1 < sc->sample_to_chunk_sz){
        sc->current_sample += sc->sample_size * sc->sample_to_chunk[idx].count;
    }
#endif

readchunk:
    dprintf("chunk: %lli -> %lli (%i)\n", offset, offset + size, size);
    if(size == 0x0FFFFFFF)
        size = mov->mdat_size + mov->mdat_offset - offset;

    }

    return 0;
}

#if defined(MOV_SPLIT_CHUNKS) && defined(MOV_SEEK)
/**
 * Seek method based on the one described in the Appendix C of QTFileFormat.pdf
 */
static int mov_read_seek(AVFormatContext *s, int stream_index, int64_t sample_time, int flags)
{

    sizeof(MOVContext),
    mov_probe,
    mov_read_header,
    mov_read_packet,
    mov_read_close,
#if defined(MOV_SPLIT_CHUNKS) && defined(MOV_SEEK)
    mov_read_seek,
#endif
};

int mov_init(void)

954:7d778342142f

#undef NDEBUG
#include <assert.h>

/* Allows seeking */
#define MOV_SEEK

/* Special handling for movies created with Minolta Dimaxe Xi*/
/* this fix should not interfere with other .mov files, but just in case*/
#define MOV_MINOLTA_FIX

    int i, a, b, m;
    int size;
    int idx;
    size = 0x0FFFFFFF;

    if (mov->partial) {
        sc = mov->partial;
        idx = sc->sample_to_chunk_index;

        if (idx < 0) return 0;

        offset = mov->next_chunk_offset;
        /* extract the sample */

        goto readchunk;
    }

again:
    sc = 0;
    if(offset == INT64_MAX)
        best_dts= INT64_MAX;

    idx = sc->sample_to_chunk_index;
    if (idx + 1 < sc->sample_to_chunk_sz && sc->next_chunk >= sc->sample_to_chunk[idx + 1].first)
        idx++;
    sc->sample_to_chunk_index = idx;
    /* split chunks into samples */
    if (sc->sample_size == 0 || sc->sample_size > 100) {
        if (idx >= 0 && sc->sample_to_chunk[idx].count != 1) {
            mov->partial = sc;
            /* we'll have to get those samples before next chunk */

        sc->current_sample++;
    }else if(idx + 1 < sc->sample_to_chunk_sz){
        sc->current_sample += sc->sample_size * sc->sample_to_chunk[idx].count;
    }

readchunk:
    dprintf("chunk: %lli -> %lli (%i)\n", offset, offset + size, size);
    if(size == 0x0FFFFFFF)
        size = mov->mdat_size + mov->mdat_offset - offset;

    }

    return 0;
}

#if defined(MOV_SEEK)
/**
 * Seek method based on the one described in the Appendix C of QTFileFormat.pdf
 */
static int mov_read_seek(AVFormatContext *s, int stream_index, int64_t sample_time, int flags)
{

    sizeof(MOVContext),
    mov_probe,
    mov_read_header,
    mov_read_packet,
    mov_read_close,
#if defined(MOV_SEEK)
    mov_read_seek,
#endif
};

int mov_init(void)