comparison mov.c @ 1010:62623b1abf81 libavformat

use of PRI macros in dprintf

1009:1e37927ea0bd

            a.size = get_be32(pb);
            a.type = get_le32(pb);
        }
        total_size += 8;
        a.offset += 8;
        dprintf("type: %08x  %.4s  sz: %PRIx64  %PRIx64   %PRIx64\n", a.type, (char*)&a.type, a.size, atom.size, total_size);
        if (a.size == 1) { /* 64 bit extended size */
            a.size = get_be64(pb) - 8;
            a.offset += 8;
            total_size += 8;
        }

    st->codec->extradata = (uint8_t*) av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);

    if (st->codec->extradata) {
        strcpy(st->codec->extradata, "SVQ3"); // fake
        get_buffer(pb, st->codec->extradata + 0x5a, atom.size);
        dprintf("Reading SMI %PRId64  %s\n", atom.size, (char*)st->codec->extradata + 0x5a);
    } else
        url_fskip(pb, atom.size);

    return 0;
}

                    index ++;
                    duration = msc->stts_data[index].duration;
                }
                dts = time + (msc->current_sample-1 - sample) * (int64_t)duration;
                dts = av_rescale(dts, AV_TIME_BASE, msc->time_scale);
                dprintf("stream: %d dts: %PRId64 best_dts: %PRId64 offset: %PRId64 \n", i, dts, best_dts, offset);
                if(dts < best_dts){
                    best_dts= dts;
                    sc = msc;
                    offset = msc->chunk_offsets[msc->next_chunk];
                }

    }else if(idx + 1 < sc->sample_to_chunk_sz){
        sc->current_sample += 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;
    if(size < 0)
        return -1;
    if(size == 0)

        assert(pts % st->time_base.num == 0);
        assert(dts % st->time_base.num == 0);

        pkt->pts = pts / st->time_base.num;
        pkt->dts = dts / st->time_base.num;
        dprintf("stream #%d smp #%ld dts = %lld pts = %lld (smp:%ld time:%lld idx:%d ent:%d count:%d dur:%d)\n"
                , pkt->stream_index, sc->current_sample-1, pkt->dts, pkt->pts
                , sc->sample_to_time_sample
                , sc->sample_to_time_time
                , sc->sample_to_time_index
                , sc->stts_count

    if (chunk > sc->chunk_count) {
        av_log(s, AV_LOG_ERROR, "mov: chunk offset atom too short, unable to seek (req. chunk=%i, chunk count=%li)\n", chunk, sc->chunk_count);
        return -1;
    }
    chunk_file_offset = sc->chunk_offsets[chunk - 1];
    dprintf("Chunk file offset is #%llu \n", chunk_file_offset);

    // Step 6. Find the byte offset within the chunk using the sample size atom
    sample_file_offset = chunk_file_offset;
    if (sc->sample_size)
        sample_file_offset += (seek_sample - first_chunk_sample) * sc->sample_size;
    else {
        for (i = 0; i < (seek_sample - first_chunk_sample); i++) {
        sample_file_offset += sc->sample_sizes[first_chunk_sample + i - 1];
        }
    }
    dprintf("Sample file offset is #%llu \n", sample_file_offset);

    // Step 6. Update the parser
    mov->partial = sc;
    mov->next_chunk_offset = sample_file_offset;
    // Update current stream state

            }
        }
        msc->next_chunk = a;
        if (msc->chunk_offsets[a] < chunk_file_offset && a < (msc->chunk_count-1))
            msc->next_chunk ++;
        dprintf("Nearest next chunk for stream #%i is #%li @%lli\n", i, msc->next_chunk+1, msc->chunk_offsets[msc->next_chunk]);

        // Compute sample count and index in the sample_to_chunk table (what a pity)
        msc->sample_to_chunk_index = 0;
        msc->current_sample = 0;
        for(;  msc->sample_to_chunk_index < (msc->sample_to_chunk_sz - 1)

1010:62623b1abf81

            a.size = get_be32(pb);
            a.type = get_le32(pb);
        }
        total_size += 8;
        a.offset += 8;
        dprintf("type: %08x  %.4s  sz: %"PRIx64"  %"PRIx64"   %"PRIx64"\n", a.type, (char*)&a.type, a.size, atom.size, total_size);
        if (a.size == 1) { /* 64 bit extended size */
            a.size = get_be64(pb) - 8;
            a.offset += 8;
            total_size += 8;
        }

    st->codec->extradata = (uint8_t*) av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);

    if (st->codec->extradata) {
        strcpy(st->codec->extradata, "SVQ3"); // fake
        get_buffer(pb, st->codec->extradata + 0x5a, atom.size);
        dprintf("Reading SMI %"PRId64"  %s\n", atom.size, (char*)st->codec->extradata + 0x5a);
    } else
        url_fskip(pb, atom.size);

    return 0;
}

                    index ++;
                    duration = msc->stts_data[index].duration;
                }
                dts = time + (msc->current_sample-1 - sample) * (int64_t)duration;
                dts = av_rescale(dts, AV_TIME_BASE, msc->time_scale);
                dprintf("stream: %d dts: %"PRId64" best_dts: %"PRId64" offset: %"PRId64"\n", i, dts, best_dts, offset);
                if(dts < best_dts){
                    best_dts= dts;
                    sc = msc;
                    offset = msc->chunk_offsets[msc->next_chunk];
                }

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

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

        assert(pts % st->time_base.num == 0);
        assert(dts % st->time_base.num == 0);

        pkt->pts = pts / st->time_base.num;
        pkt->dts = dts / st->time_base.num;
        dprintf("stream #%d smp #%ld dts = %"PRId64" pts = %"PRId64" (smp:%ld time:%"PRId64" idx:%d ent:%d count:%d dur:%d)\n"
                , pkt->stream_index, sc->current_sample-1, pkt->dts, pkt->pts
                , sc->sample_to_time_sample
                , sc->sample_to_time_time
                , sc->sample_to_time_index
                , sc->stts_count

    if (chunk > sc->chunk_count) {
        av_log(s, AV_LOG_ERROR, "mov: chunk offset atom too short, unable to seek (req. chunk=%i, chunk count=%li)\n", chunk, sc->chunk_count);
        return -1;
    }
    chunk_file_offset = sc->chunk_offsets[chunk - 1];
    dprintf("Chunk file offset is #%"PRIu64"\n", chunk_file_offset);

    // Step 6. Find the byte offset within the chunk using the sample size atom
    sample_file_offset = chunk_file_offset;
    if (sc->sample_size)
        sample_file_offset += (seek_sample - first_chunk_sample) * sc->sample_size;
    else {
        for (i = 0; i < (seek_sample - first_chunk_sample); i++) {
        sample_file_offset += sc->sample_sizes[first_chunk_sample + i - 1];
        }
    }
    dprintf("Sample file offset is #%"PRIu64"\n", sample_file_offset);

    // Step 6. Update the parser
    mov->partial = sc;
    mov->next_chunk_offset = sample_file_offset;
    // Update current stream state

            }
        }
        msc->next_chunk = a;
        if (msc->chunk_offsets[a] < chunk_file_offset && a < (msc->chunk_count-1))
            msc->next_chunk ++;
        dprintf("Nearest next chunk for stream #%i is #%li @%"PRId64"\n", i, msc->next_chunk+1, msc->chunk_offsets[msc->next_chunk]);

        // Compute sample count and index in the sample_to_chunk table (what a pity)
        msc->sample_to_chunk_index = 0;
        msc->current_sample = 0;
        for(;  msc->sample_to_chunk_index < (msc->sample_to_chunk_sz - 1)