virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avformat/mxfdec: use body_offset of the partitions in mxf_absolute_bodysid_offset

Browse Source 
Use body_offset of the partitions to search for the partition with the given
offset in the essence. This makes the function find the correct partition for
non frame-wrapped essences as well, where only the essence data is part of the
the edit unit byte count, not the KLV-s.

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint
2018-02-08 02:38:56 +01:00
parent 5b36379eb6
commit 0827c78e98
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
libavformat/mxfdec.c
View File

@@ -91,6 +91,7 @@ typedef struct MXFPartition {
int64_t index_byte_count; int64_t index_byte_count;
int pack_length; int pack_length;
int64_t pack_ofs; ///< absolute offset of pack in file, including run-in int64_t pack_ofs; ///< absolute offset of pack in file, including run-in
int64_t body_offset;
} MXFPartition; } MXFPartition;
typedef struct MXFCryptoContext { typedef struct MXFCryptoContext {
@@ -612,7 +613,7 @@ static int mxf_read_partition_pack(void *arg, AVIOContext *pb, int tag, int size
partition->header_byte_count = avio_rb64(pb); partition->header_byte_count = avio_rb64(pb);
partition->index_byte_count = avio_rb64(pb); partition->index_byte_count = avio_rb64(pb);
partition->index_sid = avio_rb32(pb); partition->index_sid = avio_rb32(pb);
avio_skip(pb, 8); partition->body_offset = avio_rb64(pb);
partition->body_sid = avio_rb32(pb); partition->body_sid = avio_rb32(pb);
if (avio_read(pb, op, sizeof(UID)) != sizeof(UID)) { if (avio_read(pb, op, sizeof(UID)) != sizeof(UID)) {
av_log(mxf->fc, AV_LOG_ERROR, "Failed reading UID\n"); av_log(mxf->fc, AV_LOG_ERROR, "Failed reading UID\n");
@@ -1347,7 +1348,10 @@ static int mxf_get_sorted_table_segments(MXFContext *mxf, int *nb_sorted_segment
static int mxf_absolute_bodysid_offset(MXFContext *mxf, int body_sid, int64_t offset, int64_t *offset_out) static int mxf_absolute_bodysid_offset(MXFContext *mxf, int body_sid, int64_t offset, int64_t *offset_out)
{ {
int x; int x;
int64_t offset_in = offset; /* for logging */ MXFPartition *last_p = NULL;
if (offset < 0)
return AVERROR(EINVAL);
for (x = 0; x < mxf->partitions_count; x++) { for (x = 0; x < mxf->partitions_count; x++) {
MXFPartition *p = &mxf->partitions[x]; MXFPartition *p = &mxf->partitions[x];
@@ -1355,17 +1359,20 @@ static int mxf_absolute_bodysid_offset(MXFContext *mxf, int body_sid, int64_t of
if (p->body_sid != body_sid) if (p->body_sid != body_sid)
continue; continue;
if (offset < p->essence_length || !p->essence_length) { if (p->body_offset > offset)
*offset_out = p->essence_offset + offset; break;
return 0;
}
offset -= p->essence_length; last_p = p;
}
if (last_p && (!last_p->essence_length || last_p->essence_length > (offset - last_p->body_offset))) {
*offset_out = last_p->essence_offset + (offset - last_p->body_offset);
return 0;
} }
av_log(mxf->fc, AV_LOG_ERROR, av_log(mxf->fc, AV_LOG_ERROR,
"failed to find absolute offset of %"PRIX64" in BodySID %i - partial file?\n", "failed to find absolute offset of %"PRIX64" in BodySID %i - partial file?\n",
offset_in, body_sid); offset, body_sid);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }