generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

movenc: Grow the frag_info array in chunks

Browse Source 
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>
This commit is contained in:
Andrey Semashev 2013-06-02 23:26:18 +03:00 committed by Martin Storsjö
parent ab1189766a
commit 7c020e1ad3
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/movenc.c
View File

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

2
libavformat/movenc.h
View File

@ -26,6 +26,7 @@
#include "avformat.h" #include "avformat.h"
#define MOV_FRAG_INFO_ALLOC_INCREMENT 64
#define MOV_INDEX_CLUSTER_SIZE 1024 #define MOV_INDEX_CLUSTER_SIZE 1024
#define MOV_TIMESCALE 1000 #define MOV_TIMESCALE 1000
@ -121,6 +122,7 @@ typedef struct MOVTrack {
int nb_frag_info; int nb_frag_info;
MOVFragmentInfo *frag_info; MOVFragmentInfo *frag_info;
unsigned frag_info_capacity;
struct { struct {
int64_t struct_offset; int64_t struct_offset;