diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-01-20 09:14:46 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-01-20 09:14:46 +0000 |
| commit | fc94187857a67488f21e70c1fdc62eec7a7d80a0 (patch) | |
| tree | 03a72ba214848fe335557b31e74fe4099c223b11 | |
| parent | 27cb512219c0b550eba75fd4af82f6f965883481 (diff) | |
| download | ffmpeg-fc94187857a67488f21e70c1fdc62eec7a7d80a0.tar.gz | |
fix gxf time code mark out value
Originally committed as revision 16697 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/gxfenc.c | 11 | ||||
| -rw-r--r-- | tests/libav.regression.ref | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/libavformat/gxfenc.c b/libavformat/gxfenc.c index 587e0d61ea..f483e31fd3 100644 --- a/libavformat/gxfenc.c +++ b/libavformat/gxfenc.c @@ -353,13 +353,22 @@ static int gxf_write_flt_packet(ByteIOContext *pb, GXFContext *ctx) static int gxf_write_umf_material_description(ByteIOContext *pb, GXFContext *ctx) { + // XXX drop frame + int fps = ctx->sample_rate / 2; + int frames = ctx->nb_frames / 2; + uint32_t timecode = + frames % fps << 24 | // frames + frames / fps % 60 << 16 | // seconds + frames / fps * 60 % 60 << 8 | // minutes + frames / fps * 3600 % 24 << 3; // hours + put_le32(pb, ctx->flags); put_le32(pb, ctx->nb_frames); /* length of the longest track */ put_le32(pb, ctx->nb_frames); /* length of the shortest track */ put_le32(pb, 0); /* mark in */ put_le32(pb, ctx->nb_frames); /* mark out */ put_le32(pb, 0); /* timecode mark in */ - put_le32(pb, ctx->nb_frames); /* timecode mark out */ + put_le32(pb, timecode); /* timecode mark out */ put_le64(pb, ctx->fc->timestamp); /* modification time */ put_le64(pb, ctx->fc->timestamp); /* creation time */ put_le16(pb, 0); /* reserved */ diff --git a/tests/libav.regression.ref b/tests/libav.regression.ref index 1826b893f9..dd40b25fee 100644 --- a/tests/libav.regression.ref +++ b/tests/libav.regression.ref @@ -27,7 +27,7 @@ af78858062599fcbba049e4a02588a15 *./tests/data/b-libav.mov 913b6199765b1dcba196706574621c2f *./tests/data/b-libav.dv 3600000 ./tests/data/b-libav.dv ./tests/data/b-libav.dv CRC=0x7787e173 -8a6452b105db3e112fb041a98eda7ea5 *./tests/data/b-libav.gxf +a8d66ca88df1f6ba7806f11224d03adc *./tests/data/b-libav.gxf 805992 ./tests/data/b-libav.gxf ./tests/data/b-libav.gxf CRC=0x9c06676e 66a6584f9e83e8ea3af822a3ba71fbbe *./tests/data/b-libav.nut |