comparison mov.c @ 660:758929a1744c libavformat

chunk support in mov patch by Roine Gustafsson <roine AT users DOT sourceforge DOT net>

659:6d7c0e6d929e

        if (idx < 0) return 0;
#ifdef DEBUG
        fprintf(stderr, "sc[ffid %d]->sample_size = %d\n", sc->ffindex, sc->sample_size);
#endif
        //size = sc->sample_sizes[sc->current_sample];
        // that ain't working...
        //size = (sc->sample_size)?sc->sample_size:sc->sample_sizes[sc->current_sample];
        size = (sc->sample_size > 1)?sc->sample_size:sc->sample_sizes[sc->current_sample];

        sc->current_sample++;
        sc->left_in_chunk--;

        if (sc->left_in_chunk <= 0)
            mov->partial = 0;

    //Maybe we should really not only check sc->sample_size, but also sc->sample_sizes
    //but I have no such movies
    if (sc->sample_size > 0) { 
        int foundsize=0;
        for(i=0; i<(sc->sample_to_chunk_sz); i++) {
            if( (sc->sample_to_chunk[i].first)<=(sc->next_chunk) && (sc->sample_size>0) )
            {
		// I can't figure out why for PCM audio sample_size is always 1
		// (it should actually be channels*bits_per_second/8) but it is.
		AVCodecContext* cod = &s->streams[sc->ffindex]->codec;
                if (sc->sample_size == 1 && (cod->codec_id == CODEC_ID_PCM_S16BE || cod->codec_id == CODEC_ID_PCM_S16LE))

    }
#endif //MOV_MINOLTA_FIX

#ifdef MOV_SPLIT_CHUNKS
    /* split chunks into samples */
    if (sc->sample_size == 0) {
        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;
        if (idx >= 0 && sc->sample_to_chunk[idx].count != 1) {
	    mov->partial = sc;
            /* we'll have to get those samples before next chunk */
            sc->left_in_chunk = sc->sample_to_chunk[idx].count - 1;
            size = (sc->sample_size > 1)?sc->sample_size:sc->sample_sizes[sc->current_sample];
        }

        sc->current_sample++;
    }
#endif

660:758929a1744c

        if (idx < 0) return 0;
#ifdef DEBUG
        fprintf(stderr, "sc[ffid %d]->sample_size = %d\n", sc->ffindex, sc->sample_size);
#endif
        // sample_size is not always correct for audio. Quicktime ignores this value and
        // computes it differently.
        if(s->streams[sc->ffindex]->codec.codec_type == CODEC_TYPE_VIDEO)
            size = sc->sample_size?sc->sample_size:sc->sample_sizes[sc->current_sample];
        sc->current_sample++;
        sc->left_in_chunk--;

        if (sc->left_in_chunk <= 0)
            mov->partial = 0;

    //Maybe we should really not only check sc->sample_size, but also sc->sample_sizes
    //but I have no such movies
    if (sc->sample_size > 0) { 
        int foundsize=0;
        for(i=0; i<(sc->sample_to_chunk_sz); i++) {
            if( (sc->sample_to_chunk[i].first)<=(sc->next_chunk) )
            {
		// I can't figure out why for PCM audio sample_size is always 1
		// (it should actually be channels*bits_per_second/8) but it is.
		AVCodecContext* cod = &s->streams[sc->ffindex]->codec;
                if (sc->sample_size == 1 && (cod->codec_id == CODEC_ID_PCM_S16BE || cod->codec_id == CODEC_ID_PCM_S16LE))

    }
#endif //MOV_MINOLTA_FIX

#ifdef MOV_SPLIT_CHUNKS
    /* split chunks into samples */
    if (s->streams[sc->ffindex]->codec.codec_type == CODEC_TYPE_VIDEO) {
        // This does not support split audio, as the sample_size is often not correct
        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;
        if (idx >= 0 && sc->sample_to_chunk[idx].count != 1) {
	    mov->partial = sc;
            /* we'll have to get those samples before next chunk */
            sc->left_in_chunk = sc->sample_to_chunk[idx].count - 1;
            size = sc->sample_size?sc->sample_size:sc->sample_sizes[sc->current_sample];
        }

        sc->current_sample++;
    }
#endif