summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorMarton Balint <cus@passwd.hu>2018-02-19 00:43:05 +0100
committerMarton Balint <cus@passwd.hu>2018-03-09 20:37:49 +0100
commit90756e67a0a1de762d27c2fe01a30ac8434a3631 (patch)
tree5c46c4f0d4bb58ad13717fe9a559d1f6d1d51e0e /libavformat
parent3aaf97e7737cab5d5476f70fd8405d5d330cb215 (diff)
avformat/mxfdec: use binary search in mxf_absolute_bodysid_offset
Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/mxfdec.c22
1 files changed, 14 insertions, 8 deletions
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index d4291f5dc7..70091e0dc9 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -1347,24 +1347,30 @@ 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)
{
- int x;
MXFPartition *last_p = NULL;
+ int a, b, m, m0;
if (offset < 0)
return AVERROR(EINVAL);
- for (x = 0; x < mxf->partitions_count; x++) {
- MXFPartition *p = &mxf->partitions[x];
+ a = -1;
+ b = mxf->partitions_count;
- if (p->body_sid != body_sid)
- continue;
+ while (b - a > 1) {
+ m0 = m = (a + b) >> 1;
- if (p->body_offset > offset)
- break;
+ while (m < b && mxf->partitions[m].body_sid != body_sid)
+ m++;
- last_p = p;
+ if (m < b && mxf->partitions[m].body_offset <= offset)
+ a = m;
+ else
+ b = m0;
}
+ if (a >= 0)
+ last_p = &mxf->partitions[a];
+
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;