Commit b29af723 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)

Originally committed as revision 4886 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent c06e734a
......@@ -35,7 +35,8 @@
#define MODE_3G2 4
typedef struct MOVIentry {
unsigned int flags, pos, size;
unsigned int flags, size;
uint64_t pos;
unsigned int samplesInChunk;
char key_frame;
unsigned int entries;
......@@ -44,7 +45,7 @@ typedef struct MOVIentry {
typedef struct MOVIndex {
int mode;
int entry;
int mdat_size;
uint64_t mdat_size;
int ents_allocated;
long timescale;
long time;
......@@ -97,9 +98,9 @@ const CodecTag ff_mov_obj_type[] = {
};
//FIXME supprt 64bit varaint with wide placeholders
static int updateSize (ByteIOContext *pb, int pos)
static offset_t updateSize (ByteIOContext *pb, offset_t pos)
{
long curpos = url_ftell(pb);
offset_t curpos = url_ftell(pb);
url_fseek(pb, pos, SEEK_SET);
put_be32(pb, curpos - pos); /* rewrite size */
url_fseek(pb, curpos, SEEK_SET);
......@@ -111,15 +112,23 @@ static int updateSize (ByteIOContext *pb, int pos)
static int mov_write_stco_tag(ByteIOContext *pb, MOVTrack* track)
{
int i;
int pos = url_ftell(pb);
offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "stco");
int mode64 = 0; // use 32 bit size variant if possible
if (pos > UINT32_MAX) {
mode64 = 1;
put_tag(pb, "co64");
} else
put_tag(pb, "stco");
put_be32(pb, 0); /* version & flags */
put_be32(pb, track->entry); /* entry count */
for (i=0; i<track->entry; i++) {
int cl = i / MOV_INDEX_CLUSTER_SIZE;
int id = i % MOV_INDEX_CLUSTER_SIZE;
put_be32(pb, track->cluster[cl][id].pos);
if(mode64 == 1)
put_be64(pb, track->cluster[cl][id].pos);
else
put_be32(pb, track->cluster[cl][id].pos);
}
return updateSize (pb, pos);
}
......@@ -130,7 +139,7 @@ static int mov_write_stsz_tag(ByteIOContext *pb, MOVTrack* track)
int equalChunks = 1;
int i, j, entries = 0, tst = -1, oldtst = -1;
int pos = url_ftell(pb);
offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "stsz");
put_be32(pb, 0); /* version & flags */
......@@ -168,9 +177,10 @@ static int mov_write_stsz_tag(ByteIOContext *pb, MOVTrack* track)
/* Sample to chunk atom */
static int mov_write_stsc_tag(ByteIOContext *pb, MOVTrack* track)
{
int index = 0, oldval = -1, i, entryPos, curpos;
int index = 0, oldval = -1, i;
offset_t entryPos, curpos;
int pos = url_ftell(pb);
offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "stsc");
put_be32(pb, 0); // version & flags
......@@ -199,9 +209,9 @@ static int mov_write_stsc_tag(ByteIOContext *pb, MOVTrack* track)
/* Sync sample atom */
static int mov_write_stss_tag(ByteIOContext *pb, MOVTrack* track)
{
long curpos;
int i, index = 0, entryPos;
int pos = url_ftell(pb);
offset_t curpos, entryPos;
int i, index = 0;
offset_t pos = url_ftell(pb);
put_be32(pb, 0); // size
put_tag(pb, "stss");
put_be32(pb, 0); // version & flags
......@@ -238,7 +248,7 @@ static int mov_write_damr_tag(ByteIOContext *pb)
static int mov_write_wave_tag(ByteIOContext *pb, MOVTrack* track)
{
int pos = url_ftell(pb);
offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "wave");
......@@ -280,7 +290,7 @@ static const CodecTag codec_movaudio_tags[] = {
static int mov_write_audio_tag(ByteIOContext *pb, MOVTrack* track)
{
int pos = url_ftell(pb);
offset_t pos = url_ftell(pb);
int tag;
put_be32(pb, 0); /* size */
......@@ -422,7 +432,7 @@ static void putDescr(ByteIOContext *pb, int tag, int size)
static int mov_write_esds_tag(ByteIOContext *pb, MOVTrack* track) // Basic
{
int decoderSpecificInfoLen;
int pos = url_ftell(pb);
offset_t pos = url_ftell(pb);
void *vosDataBackup=track->vosData;
int vosLenBackup=track->vosLen;
......@@ -508,7 +518,7 @@ static const CodecTag codec_movvideo_tags[] = {
static int mov_write_video_tag(ByteIOContext *pb, MOVTrack* track)
{
int pos = url_ftell(pb);
offset_t pos = url_ftell(pb);
char compressor_name[32];
int tag;
......@@ -563,7 +573,7 @@ static int mov_write_video_tag(ByteIOContext *pb, MOVTrack* track)
static int mov_write_stsd_tag(ByteIOContext *pb, MOVTrack* track)
{
int pos = url_ftell(pb);
offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "stsd");
put_be32(pb, 0); /* version & flags */
......@@ -605,7 +615,7 @@ static int mov_write_dref_tag(ByteIOContext *pb)
static int mov_write_stbl_tag(ByteIOContext *pb, MOVTrack* track)
{
int pos = url_ftell(pb);
offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "stbl");
mov_write_stsd_tag(pb, track);
......@@ -621,7 +631,7 @@ static int mov_write_stbl_tag(ByteIOContext *pb, MOVTrack* track)
static int mov_write_dinf_tag(ByteIOContext *pb)
{
int pos = url_ftell(pb);
offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "dinf");
mov_write_dref_tag(pb);
......@@ -650,7 +660,7 @@ static int mov_write_vmhd_tag(ByteIOContext *pb)
static int mov_write_hdlr_tag(ByteIOContext *pb, MOVTrack* track)
{
char *descr, *hdlr, *hdlr_type;
int pos = url_ftell(pb);
offset_t pos = url_ftell(pb);
if (!track) { /* no media --> data handler */
hdlr = "dhlr";
......@@ -682,7 +692,7 @@ static int mov_write_hdlr_tag(ByteIOContext *pb, MOVTrack* track)
static int mov_write_minf_tag(ByteIOContext *pb, MOVTrack* track)
{
int pos = url_ftell(pb);
offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "minf");
if(track->enc->codec_type == CODEC_TYPE_VIDEO)
......@@ -712,7 +722,7 @@ static int mov_write_mdhd_tag(ByteIOContext *pb, MOVTrack* track)
static int mov_write_mdia_tag(ByteIOContext *pb, MOVTrack* track)
{
int pos = url_ftell(pb);
offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "mdia");
mov_write_mdhd_tag(pb, track);
......@@ -805,7 +815,7 @@ static int mov_write_uuid_tag_psp(ByteIOContext *pb, MOVTrack *mov)
static int mov_write_trak_tag(ByteIOContext *pb, MOVTrack* track)
{
int pos = url_ftell(pb);
offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "trak");
mov_write_tkhd_tag(pb, track);
......@@ -835,8 +845,8 @@ static int mov_write_iods_tag(ByteIOContext *pb, MOVContext *mov)
static int mov_write_mvhd_tag(ByteIOContext *pb, MOVContext *mov)
{
int maxTrackID = 1, maxTrackLen = 0, i;
int64_t maxTrackLenTemp;
int maxTrackID = 1, i;
int64_t maxTrackLenTemp, maxTrackLen = 0;
put_be32(pb, 0x6c); /* size (always 0x6c) */
put_tag(pb, "mvhd");
......@@ -885,7 +895,7 @@ static int mov_write_mvhd_tag(ByteIOContext *pb, MOVContext *mov)
static int mov_write_itunes_hdlr_tag(ByteIOContext *pb, MOVContext* mov,
AVFormatContext *s)
{
int pos = url_ftell(pb);
offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "hdlr");
put_be32(pb, 0);
......@@ -902,7 +912,7 @@ static int mov_write_itunes_hdlr_tag(ByteIOContext *pb, MOVContext* mov,
static int mov_write_string_data_tag(ByteIOContext *pb, MOVContext* mov,
AVFormatContext *s, const char *data)
{
int pos = url_ftell(pb);
offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "data");
put_be32(pb, 1);
......@@ -917,7 +927,7 @@ static int mov_write_nam_tag(ByteIOContext *pb, MOVContext* mov,
{
int size = 0;
if ( s->title[0] ) {
int pos = url_ftell(pb);
offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "\251nam");
mov_write_string_data_tag(pb, mov, s, s->title);
......@@ -932,7 +942,7 @@ static int mov_write_ART_tag(ByteIOContext *pb, MOVContext* mov,
{
int size = 0;
if ( s->author[0] ) {
int pos = url_ftell(pb);
offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "\251ART");
// we use the author here as this is the only thing that we have...
......@@ -948,7 +958,7 @@ static int mov_write_wrt_tag(ByteIOContext *pb, MOVContext* mov,
{
int size = 0;
if ( s->author[0] ) {
int pos = url_ftell(pb);
offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "\251wrt");
mov_write_string_data_tag(pb, mov, s, s->author);
......@@ -963,7 +973,7 @@ static int mov_write_alb_tag(ByteIOContext *pb, MOVContext* mov,
{
int size = 0;
if ( s->album[0] ) {
int pos = url_ftell(pb);
offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "\251alb");
mov_write_string_data_tag(pb, mov, s, s->album);
......@@ -979,7 +989,7 @@ static int mov_write_day_tag(ByteIOContext *pb, MOVContext* mov,
char year[5];
int size = 0;
if ( s->year ) {
int pos = url_ftell(pb);
offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "\251day");
snprintf(year, 5, "%04d", s->year);
......@@ -993,7 +1003,7 @@ static int mov_write_day_tag(ByteIOContext *pb, MOVContext* mov,
static int mov_write_too_tag(ByteIOContext *pb, MOVContext* mov,
AVFormatContext *s)
{
int pos = url_ftell(pb);
offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "\251too");
mov_write_string_data_tag(pb, mov, s, LIBAVFORMAT_IDENT);
......@@ -1006,7 +1016,7 @@ static int mov_write_cmt_tag(ByteIOContext *pb, MOVContext* mov,
{
int size = 0;
if ( s->comment[0] ) {
int pos = url_ftell(pb);
offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "\251cmt");
mov_write_string_data_tag(pb, mov, s, s->comment);
......@@ -1021,7 +1031,7 @@ static int mov_write_gen_tag(ByteIOContext *pb, MOVContext* mov,
{
int size = 0;
if ( s->genre[0] ) {
int pos = url_ftell(pb);
offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "\251gen");
mov_write_string_data_tag(pb, mov, s, s->genre);
......@@ -1036,11 +1046,11 @@ static int mov_write_trkn_tag(ByteIOContext *pb, MOVContext* mov,
{
int size = 0;
if ( s->track ) {
int pos = url_ftell(pb);
offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "trkn");
{
int pos = url_ftell(pb);
offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "data");
put_be32(pb, 0); // 8 bytes empty
......@@ -1060,7 +1070,7 @@ static int mov_write_trkn_tag(ByteIOContext *pb, MOVContext* mov,
static int mov_write_ilst_tag(ByteIOContext *pb, MOVContext* mov,
AVFormatContext *s)
{
int pos = url_ftell(pb);
offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "ilst");
mov_write_nam_tag(pb, mov, s);
......@@ -1084,7 +1094,7 @@ static int mov_write_meta_tag(ByteIOContext *pb, MOVContext* mov,
// only save meta tag if required
if ( s->title[0] || s->author[0] || s->album[0] || s->year ||
s->comment[0] || s->genre[0] || s->track ) {
int pos = url_ftell(pb);
offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "meta");
put_be32(pb, 0);
......@@ -1098,7 +1108,7 @@ static int mov_write_meta_tag(ByteIOContext *pb, MOVContext* mov,
static int mov_write_udta_tag(ByteIOContext *pb, MOVContext* mov,
AVFormatContext *s)
{
int pos = url_ftell(pb);
offset_t pos = url_ftell(pb);
int i;
put_be32(pb, 0); /* size */
......@@ -1112,7 +1122,7 @@ static int mov_write_udta_tag(ByteIOContext *pb, MOVContext* mov,
if(mov->tracks[i].entry <= 0) continue;
if (mov->tracks[i].enc->codec_id == CODEC_ID_AAC ||
mov->tracks[i].enc->codec_id == CODEC_ID_MPEG4) {
int pos = url_ftell(pb);
offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "\251req");
put_be16(pb, sizeof("QuickTime 6.0 or greater") - 1);
......@@ -1127,7 +1137,7 @@ static int mov_write_udta_tag(ByteIOContext *pb, MOVContext* mov,
/* Encoder */
if(mov->tracks[0].enc && !(mov->tracks[0].enc->flags & CODEC_FLAG_BITEXACT))
{
int pos = url_ftell(pb);
offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "\251enc");
put_be16(pb, sizeof(LIBAVFORMAT_IDENT) - 1); /* string length */
......@@ -1138,7 +1148,7 @@ static int mov_write_udta_tag(ByteIOContext *pb, MOVContext* mov,
if( s->title[0] )
{
int pos = url_ftell(pb);
offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "\251nam");
put_be16(pb, strlen(s->title)); /* string length */
......@@ -1149,7 +1159,7 @@ static int mov_write_udta_tag(ByteIOContext *pb, MOVContext* mov,
if( s->author[0] )
{
int pos = url_ftell(pb);
offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, /*"\251aut"*/ "\251day" );
put_be16(pb, strlen(s->author)); /* string length */
......@@ -1160,7 +1170,7 @@ static int mov_write_udta_tag(ByteIOContext *pb, MOVContext* mov,
if( s->comment[0] )
{
int pos = url_ftell(pb);
offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "\251des");
put_be16(pb, strlen(s->comment)); /* string length */
......@@ -1175,8 +1185,8 @@ static int mov_write_udta_tag(ByteIOContext *pb, MOVContext* mov,
static int mov_write_moov_tag(ByteIOContext *pb, MOVContext *mov,
AVFormatContext *s)
{
int pos, i;
pos = url_ftell(pb);
int i;
offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size placeholder*/
put_tag(pb, "moov");
mov->timescale = globalTimescale;
......@@ -1221,6 +1231,9 @@ static int mov_write_moov_tag(ByteIOContext *pb, MOVContext *mov,
int mov_write_mdat_tag(ByteIOContext *pb, MOVContext* mov)
{
put_be32(pb, 8); // placeholder for extended size field (64 bit)
put_tag(pb, "wide");
mov->mdat_pos = url_ftell(pb);
put_be32(pb, 0); /* size placeholder*/
put_tag(pb, "mdat");
......@@ -1460,7 +1473,8 @@ static int mov_write_trailer(AVFormatContext *s)
MOVContext *mov = s->priv_data;
ByteIOContext *pb = &s->pb;
int res = 0;
int i, j;
int i;
uint64_t j;
offset_t moov_pos = url_ftell(pb);
......@@ -1470,8 +1484,16 @@ static int mov_write_trailer(AVFormatContext *s)
j += mov->tracks[i].mdat_size;
}
}
url_fseek(pb, mov->mdat_pos, SEEK_SET);
put_be32(pb, j+8);
if (j+8 <= UINT32_MAX) {
url_fseek(pb, mov->mdat_pos, SEEK_SET);
put_be32(pb, j+8);
} else {
/* overwrite 'wide' placeholder atom */
url_fseek(pb, mov->mdat_pos - 8, SEEK_SET);
put_be32(pb, 1); /* special value: real atom size will be 64 bit value after tag field */
put_tag(pb, "mdat");
put_be64(pb, j+16);
}
url_fseek(pb, moov_pos, SEEK_SET);
mov_write_moov_tag(pb, mov, s);
......
......@@ -51,8 +51,8 @@ fc01a5723a0d629bb73c74d64692120d *./data/a-h263p.avi
2414342 ./data/a-h263p.avi
28fd12ac0b168252d81df6f6e60a5d17 *./data/out.yuv
stddev: 2.07 PSNR:41.76 bytes:7602176
63aab2c8774a4b716cb25f0df13bd260 *./data/a-odivx.mp4
554527 ./data/a-odivx.mp4
ace6c1cd13693c402317dcef741db64d *./data/a-odivx.mp4
554535 ./data/a-odivx.mp4
57aed19df5cbada4b05991527ee72ebe *./data/out.yuv
stddev: 7.99 PSNR:30.06 bytes:7602176
8a9a98678a2e9c2e857f741cbb8e9ccb *./data/a-huffyuv.avi
......@@ -131,8 +131,8 @@ e1da20e3f52f4d2aa18e9486986161fc *./data/a-dv.dv
7200000 ./data/a-dv.dv
55612d1a7246c82a32414638d601ac95 *./data/out.yuv
stddev: 9.15 PSNR:28.88 bytes:7602176
64cfa49cb43abd816bdf2e3b3a90e86d *./data/a-svq1.mov
1379819 ./data/a-svq1.mov
bd0db310a36ad94bcd4448abe0a88368 *./data/a-svq1.mov
1379827 ./data/a-svq1.mov
bbff871d1475e1eee4231a08e075de2c *./data/out.yuv
stddev: 10.99 PSNR:27.30 bytes:7602176
21f8ff9f1daacd9133683bb4ea0f50a4 *./data/a-mp2.mp2
......
......@@ -22,8 +22,8 @@ c9050b51f6d6636cdda3160d43463bc3 *./data/b-libav.ts
794934a02582f8dfc85d1856514cf37c *./data/b-libav.flv
339325 ./data/b-libav.flv
./data/b-libav.flv CRC=0x7b9076f8
052b808eb5ad2d791ab3600f5a032da0 *./data/b-libav.mov
369865 ./data/b-libav.mov
e4ed8d635d867e2f5980fd9c73c9cf3d *./data/b-libav.mov
369873 ./data/b-libav.mov
./data/b-libav.mov CRC=0x48f5a90d
8bf16d40a2ec19fa36b124a928e47e23 *./data/b-libav.nut
332358 ./data/b-libav.nut
......
......@@ -51,8 +51,8 @@ stddev: 5.44 PSNR:33.41 bytes:7602176
868164 ./data/a-h263p.avi
80fb224bebbe2e04f228da7485b905c5 *./data/out.yuv
stddev: 1.91 PSNR:42.49 bytes:7602176
ea75572730c30320e1042d66b73e9722 *./data/a-odivx.mp4
120178 ./data/a-odivx.mp4
059f0bc4e2f7e454620f619a0295fecb *./data/a-odivx.mp4
120186 ./data/a-odivx.mp4
e8c90899c32e11e7e4d1354dab0b8f28 *./data/out.yuv
stddev: 5.34 PSNR:33.56 bytes:7602176
4a8912deb0182471aaaf4fc3ece39fb2 *./data/a-huffyuv.avi
......@@ -131,8 +131,8 @@ a553532dcd54c1c421b52c3b6fece6ef *./data/a-dv.dv
7200000 ./data/a-dv.dv
1a1717b271a7536d641d5e1750d852d9 *./data/out.yuv
stddev: 3.16 PSNR:38.12 bytes:7602176
9202d87b28ec0ceb66aee0efc8520c23 *./data/a-svq1.mov
769519 ./data/a-svq1.mov
5b02b6ae7ffa257a66ae9857a992fdfe *./data/a-svq1.mov
769527 ./data/a-svq1.mov
44777d1ddbccd0ef7f8d08394465670c *./data/out.yuv
stddev: 3.44 PSNR:37.38 bytes:7602176
21f8ff9f1daacd9133683bb4ea0f50a4 *./data/a-mp2.mp2
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment