Skip to content

F
ffmpeg.wasm-core
Commit 1585b93a authored by Baptiste Coudurier's avatar Baptiste Coudurier
Browse files
Options

fix body offset 

Originally committed as revision 17144 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 4c08b2bd
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 5 deletions
libavformat/mxfenc.c
View file @ 1585b93a
...@@ -124,7 +124,6 @@ typedef struct MXFContext { ...@@ -124,7 +124,6 @@ typedef struct MXFContext {
uint64_t *body_partition_offset; uint64_t *body_partition_offset;
unsigned body_partitions_count; unsigned body_partitions_count;
int last_key_index; ///< index of last key frame int last_key_index; ///< index of last key frame
uint64_t body_offset;
} MXFContext; } MXFContext;
static const uint8_t uuid_base[] = { 0xAD,0xAB,0x44,0x24,0x2f,0x25,0x4d,0xc7,0x92,0xff,0x29,0xbd }; static const uint8_t uuid_base[] = { 0xAD,0xAB,0x44,0x24,0x2f,0x25,0x4d,0xc7,0x92,0xff,0x29,0xbd };
...@@ -1029,8 +1028,6 @@ static void mxf_write_partition(AVFormatContext *s, int bodysid, ...@@ -1029,8 +1028,6 @@ static void mxf_write_partition(AVFormatContext *s, int bodysid,
// add encoded ber length // add encoded ber length
index_byte_count += 16 + klv_ber_length(index_byte_count); index_byte_count += 16 + klv_ber_length(index_byte_count);
index_byte_count += klv_fill_size(index_byte_count); index_byte_count += klv_fill_size(index_byte_count);
mxf->body_offset += url_ftell(pb) - mxf->index_entries[0].offset;
} }
if (!memcmp(key, body_partition_key, 16)) { if (!memcmp(key, body_partition_key, 16)) {
...@@ -1071,8 +1068,13 @@ static void mxf_write_partition(AVFormatContext *s, int bodysid, ...@@ -1071,8 +1068,13 @@ static void mxf_write_partition(AVFormatContext *s, int bodysid,
put_be32(pb, index_byte_count ? indexsid : 0); // indexSID put_be32(pb, index_byte_count ? indexsid : 0); // indexSID
// BodyOffset // BodyOffset
if (bodysid) put_be64(pb, mxf->body_offset); if (bodysid && mxf->edit_units_count) {
else put_be64(pb, 0); uint64_t partition_end = url_ftell(pb) + 8 + 4 + 16 + 8 +
16*mxf->essence_container_count;
put_be64(pb, partition_end + klv_fill_size(partition_end) +
index_byte_count - mxf->first_edit_unit_offset);
} else
put_be64(pb, 0);
put_be32(pb, bodysid); // bodySID put_be32(pb, bodysid); // bodySID
......
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