Browse Source

movenc: Grow the frag_info array in chunks

Previously it was grown one element at a time, which leads to
excessive reallocations.

Bug-Id: 525
Signed-off-by: Martin Storsjö <martin@martin.st>
tags/n2.0
Andrey Semashev Martin Storsjö 12 years ago
parent
commit
7c020e1ad3
2 changed files with 10 additions and 3 deletions
  1. +8
    -3
      libavformat/movenc.c
  2. +2
    -0
      libavformat/movenc.h

+ 8
- 3
libavformat/movenc.c View File

@@ -2757,9 +2757,14 @@ static int mov_flush_fragment(AVFormatContext *s)
MOVFragmentInfo *info;
avio_flush(s->pb);
track->nb_frag_info++;
track->frag_info = av_realloc(track->frag_info,
sizeof(*track->frag_info) *
track->nb_frag_info);
if (track->nb_frag_info >= track->frag_info_capacity) {
unsigned new_capacity = track->nb_frag_info + MOV_FRAG_INFO_ALLOC_INCREMENT;
if (av_reallocp_array(&track->frag_info,
new_capacity,
sizeof(*track->frag_info)))
return AVERROR(ENOMEM);
track->frag_info_capacity = new_capacity;
}
info = &track->frag_info[track->nb_frag_info - 1];
info->offset = avio_tell(s->pb);
info->time = mov->tracks[i].frag_start;


+ 2
- 0
libavformat/movenc.h View File

@@ -26,6 +26,7 @@

#include "avformat.h"

#define MOV_FRAG_INFO_ALLOC_INCREMENT 64
#define MOV_INDEX_CLUSTER_SIZE 1024
#define MOV_TIMESCALE 1000

@@ -121,6 +122,7 @@ typedef struct MOVTrack {

int nb_frag_info;
MOVFragmentInfo *frag_info;
unsigned frag_info_capacity;

struct {
int64_t struct_offset;


Loading…
Cancel
Save