comparison mov.c @ 3030:5064dffc46b7 libavformat

split chunks in the case of big compressed audio frames, might be tweaked, fix qt_dv_pal_test.mov.

3029:10abe8748ec2

                }
            }
        }
    } else { /* read whole chunk */
        unsigned int chunk_samples, chunk_size, chunk_duration;
        for (i = 0; i < sc->chunk_count; i++) {
            current_offset = sc->chunk_offsets[i];
            if (stsc_index + 1 < sc->sample_to_chunk_sz &&
                i + 1 == sc->sample_to_chunk[stsc_index + 1].first)
                stsc_index++;

            if (sc->sample_size > 1 ||
                st->codec->codec_id == CODEC_ID_PCM_U8 || st->codec->codec_id == CODEC_ID_PCM_S8)
                chunk_size = chunk_samples * sc->sample_size;
            else if (sc->samples_per_frame > 0 &&
                     (chunk_samples * sc->bytes_per_frame % sc->samples_per_frame == 0))
                chunk_size = chunk_samples * sc->bytes_per_frame / sc->samples_per_frame;
            else { /* workaround to find nearest next chunk offset */
                chunk_size = INT_MAX;
                for (j = 0; j < mov->fc->nb_streams; j++) {
                    MOVStreamContext *msc = mov->fc->streams[j]->priv_data;
                    for (k = msc->next_chunk; k < msc->chunk_count; k++) {

                for (j = 0; j < mov->fc->nb_streams; j++) {
                    MOVStreamContext *msc = mov->fc->streams[j]->priv_data;
                    msc->next_chunk = 0;
                }
            }
            av_add_index_entry(st, current_offset, current_dts, chunk_size, 0, AVINDEX_KEYFRAME);
            /* get chunk duration */
            chunk_duration = 0;
            while (chunk_samples > 0) {
                if (chunk_samples < sc->stts_data[stts_index].count) {

                    if (stts_index + 1 < sc->stts_count) {
                        stts_index++;
                    }
                }
            }
            dprintf(mov->fc, "AVIndex stream %d, chunk %d, offset %"PRIx64", dts %"PRId64", size %d, "
                    "duration %d\n", st->index, i, current_offset, current_dts, chunk_size, chunk_duration);
            assert(chunk_duration % sc->time_rate == 0);
            current_dts += chunk_duration / sc->time_rate;
        }
    }
 out:
    /* adjust sample count to avindex entries */
    sc->sample_count = st->nb_index_entries;

3030:5064dffc46b7

                }
            }
        }
    } else { /* read whole chunk */
        unsigned int chunk_samples, chunk_size, chunk_duration;
        unsigned int frames = 1;
        for (i = 0; i < sc->chunk_count; i++) {
            current_offset = sc->chunk_offsets[i];
            if (stsc_index + 1 < sc->sample_to_chunk_sz &&
                i + 1 == sc->sample_to_chunk[stsc_index + 1].first)
                stsc_index++;

            if (sc->sample_size > 1 ||
                st->codec->codec_id == CODEC_ID_PCM_U8 || st->codec->codec_id == CODEC_ID_PCM_S8)
                chunk_size = chunk_samples * sc->sample_size;
            else if (sc->samples_per_frame > 0 &&
                     (chunk_samples * sc->bytes_per_frame % sc->samples_per_frame == 0))
                {
                    if (sc->samples_per_frame < 1024)
                chunk_size = chunk_samples * sc->bytes_per_frame / sc->samples_per_frame;
                    else {
                        chunk_size = sc->bytes_per_frame;
                        frames = chunk_samples / sc->samples_per_frame;
                        chunk_samples = sc->samples_per_frame;
                    }
                }
            else { /* workaround to find nearest next chunk offset */
                chunk_size = INT_MAX;
                for (j = 0; j < mov->fc->nb_streams; j++) {
                    MOVStreamContext *msc = mov->fc->streams[j]->priv_data;
                    for (k = msc->next_chunk; k < msc->chunk_count; k++) {

                for (j = 0; j < mov->fc->nb_streams; j++) {
                    MOVStreamContext *msc = mov->fc->streams[j]->priv_data;
                    msc->next_chunk = 0;
                }
            }
            for (j = 0; j < frames; j++) {
            av_add_index_entry(st, current_offset, current_dts, chunk_size, 0, AVINDEX_KEYFRAME);
            /* get chunk duration */
            chunk_duration = 0;
            while (chunk_samples > 0) {
                if (chunk_samples < sc->stts_data[stts_index].count) {

                    if (stts_index + 1 < sc->stts_count) {
                        stts_index++;
                    }
                }
            }
            current_offset += sc->bytes_per_frame;
            dprintf(mov->fc, "AVIndex stream %d, chunk %d, offset %"PRIx64", dts %"PRId64", size %d, "
                    "duration %d\n", st->index, i, current_offset, current_dts, chunk_size, chunk_duration);
            assert(chunk_duration % sc->time_rate == 0);
            current_dts += chunk_duration / sc->time_rate;
            }
        }
    }
 out:
    /* adjust sample count to avindex entries */
    sc->sample_count = st->nb_index_entries;