RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/matroskadec: reference the existing data buffer when creating packets 

Newly allocated data buffers (wavpack, prores, compressed buffers)
are padded to meet the requirements of AVPacket.

About 10x speed up in matroska_parse_frame().

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2018-04-04 18:12:53 -03:00
parent b8e75a2a08
commit 9703b7d05f
1 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
libavformat/matroskadec.c
View File

@ -1367,7 +1367,7 @@ static int matroska_decode_buffer(uint8_t **buf, int *buf_size,
return 0; return 0;
pkt_size = isize + header_size; pkt_size = isize + header_size;
pkt_data = av_malloc(pkt_size); pkt_data = av_malloc(pkt_size + AV_INPUT_BUFFER_PADDING_SIZE);
if (!pkt_data) if (!pkt_data)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
@ -1379,7 +1379,8 @@ static int matroska_decode_buffer(uint8_t **buf, int *buf_size,
case MATROSKA_TRACK_ENCODING_COMP_LZO: case MATROSKA_TRACK_ENCODING_COMP_LZO:
do { do {
olen = pkt_size *= 3; olen = pkt_size *= 3;
newpktdata = av_realloc(pkt_data, pkt_size + AV_LZO_OUTPUT_PADDING); newpktdata = av_realloc(pkt_data, pkt_size + AV_LZO_OUTPUT_PADDING
+ AV_INPUT_BUFFER_PADDING_SIZE);
if (!newpktdata) { if (!newpktdata) {
result = AVERROR(ENOMEM); result = AVERROR(ENOMEM);
goto failed; goto failed;
@ -1404,7 +1405,7 @@ static int matroska_decode_buffer(uint8_t **buf, int *buf_size,
zstream.avail_in = isize; zstream.avail_in = isize;
do { do {
pkt_size *= 3; pkt_size *= 3;
newpktdata = av_realloc(pkt_data, pkt_size); newpktdata = av_realloc(pkt_data, pkt_size + AV_INPUT_BUFFER_PADDING_SIZE);
if (!newpktdata) { if (!newpktdata) {
inflateEnd(&zstream); inflateEnd(&zstream);
result = AVERROR(ENOMEM); result = AVERROR(ENOMEM);
@ -1437,7 +1438,7 @@ static int matroska_decode_buffer(uint8_t **buf, int *buf_size,
bzstream.avail_in = isize; bzstream.avail_in = isize;
do { do {
pkt_size *= 3; pkt_size *= 3;
newpktdata = av_realloc(pkt_data, pkt_size); newpktdata = av_realloc(pkt_data, pkt_size + AV_INPUT_BUFFER_PADDING_SIZE);
if (!newpktdata) { if (!newpktdata) {
BZ2_bzDecompressEnd(&bzstream); BZ2_bzDecompressEnd(&bzstream);
result = AVERROR(ENOMEM); result = AVERROR(ENOMEM);
@ -1464,6 +1465,8 @@ static int matroska_decode_buffer(uint8_t **buf, int *buf_size,
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
memset(pkt_data + pkt_size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
*buf = pkt_data; *buf = pkt_data;
*buf_size = pkt_size; *buf_size = pkt_size;
return 0; return 0;
@ -3001,7 +3004,7 @@ static int matroska_parse_wavpack(MatroskaTrack *track, uint8_t *src,
goto fail; goto fail;
} }
tmp = av_realloc(dst, dstlen + blocksize + 32); tmp = av_realloc(dst, dstlen + blocksize + 32 + AV_INPUT_BUFFER_PADDING_SIZE);
if (!tmp) { if (!tmp) {
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto fail; goto fail;
@ -3025,6 +3028,8 @@ static int matroska_parse_wavpack(MatroskaTrack *track, uint8_t *src,
offset += blocksize + 32; offset += blocksize + 32;
} }
memset(dst + dstlen, 0, AV_INPUT_BUFFER_PADDING_SIZE);
*pdst = dst; *pdst = dst;
*size = dstlen; *size = dstlen;
@ -3042,13 +3047,14 @@ static int matroska_parse_prores(MatroskaTrack *track, uint8_t *src,
int dstlen = *size; int dstlen = *size;
if (AV_RB32(&src[4]) != MKBETAG('i', 'c', 'p', 'f')) { if (AV_RB32(&src[4]) != MKBETAG('i', 'c', 'p', 'f')) {
dst = av_malloc(dstlen + 8); dst = av_malloc(dstlen + 8 + AV_INPUT_BUFFER_PADDING_SIZE);
if (!dst) if (!dst)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
AV_WB32(dst, dstlen); AV_WB32(dst, dstlen);
AV_WB32(dst + 4, MKBETAG('i', 'c', 'p', 'f')); AV_WB32(dst + 4, MKBETAG('i', 'c', 'p', 'f'));
memcpy(dst + 8, src, dstlen); memcpy(dst + 8, src, dstlen);
memset(dst + 8 + dstlen, 0, AV_INPUT_BUFFER_PADDING_SIZE);
dstlen += 8; dstlen += 8;
} }
@ -3175,7 +3181,7 @@ static int matroska_parse_webvtt(MatroskaDemuxContext *matroska,
static int matroska_parse_frame(MatroskaDemuxContext *matroska, static int matroska_parse_frame(MatroskaDemuxContext *matroska,
MatroskaTrack *track, AVStream *st, MatroskaTrack *track, AVStream *st,
uint8_t *data, int pkt_size, AVBufferRef *buf, uint8_t *data, int pkt_size,
uint64_t timecode, uint64_t lace_duration, uint64_t timecode, uint64_t lace_duration,
int64_t pos, int is_keyframe, int64_t pos, int is_keyframe,
uint8_t *additional, uint64_t additional_id, int additional_size, uint8_t *additional, uint64_t additional_id, int additional_size,
@ -3218,17 +3224,20 @@ static int matroska_parse_frame(MatroskaDemuxContext *matroska,
pkt_data = pr_data; pkt_data = pr_data;
} }
/* XXX: prevent data copy... */ av_init_packet(pkt);
if (av_new_packet(pkt, pkt_size) < 0) { if (pkt_data != data)
pkt->buf = av_buffer_create(pkt_data, pkt_size + AV_INPUT_BUFFER_PADDING_SIZE,
NULL, NULL, 0);
else
pkt->buf = av_buffer_ref(buf);
if (!pkt->buf) {
res = AVERROR(ENOMEM); res = AVERROR(ENOMEM);
goto fail; goto fail;
} }
memcpy(pkt->data, pkt_data, pkt_size); pkt->data = pkt_data;
pkt->size = pkt_size;
if (pkt_data != data)
av_freep(&pkt_data);
pkt->flags = is_keyframe; pkt->flags = is_keyframe;
pkt->stream_index = st->index; pkt->stream_index = st->index;
@ -3291,7 +3300,7 @@ fail:
return res; return res;
} }
static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, static int matroska_parse_block(MatroskaDemuxContext *matroska, AVBufferRef *buf, uint8_t *data,
int size, int64_t pos, uint64_t cluster_time, int size, int64_t pos, uint64_t cluster_time,
uint64_t block_duration, int is_keyframe, uint64_t block_duration, int is_keyframe,
uint8_t *additional, uint64_t additional_id, int additional_size, uint8_t *additional, uint64_t additional_id, int additional_size,
@ -3409,7 +3418,7 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data,
if (res) if (res)
goto end; goto end;
} else { } else {
res = matroska_parse_frame(matroska, track, st, data, lace_size[n], res = matroska_parse_frame(matroska, track, st, buf, data, lace_size[n],
timecode, lace_duration, pos, timecode, lace_duration, pos,
!n ? is_keyframe : 0, !n ? is_keyframe : 0,
additional, additional_id, additional_size, additional, additional_id, additional_size,
@ -3472,7 +3481,7 @@ static int matroska_parse_cluster_incremental(MatroskaDemuxContext *matroska)
blocks[i].additional.data : NULL; blocks[i].additional.data : NULL;
if (!blocks[i].non_simple) if (!blocks[i].non_simple)
blocks[i].duration = 0; blocks[i].duration = 0;
res = matroska_parse_block(matroska, blocks[i].bin.data, res = matroska_parse_block(matroska, blocks[i].bin.buf, blocks[i].bin.data,
blocks[i].bin.size, blocks[i].bin.pos, blocks[i].bin.size, blocks[i].bin.pos,
matroska->current_cluster.timecode, matroska->current_cluster.timecode,
blocks[i].duration, is_keyframe, blocks[i].duration, is_keyframe,
@ -3505,7 +3514,7 @@ static int matroska_parse_cluster(MatroskaDemuxContext *matroska)
for (i = 0; i < blocks_list->nb_elem; i++) for (i = 0; i < blocks_list->nb_elem; i++)
if (blocks[i].bin.size > 0 && blocks[i].bin.data) { if (blocks[i].bin.size > 0 && blocks[i].bin.data) {
int is_keyframe = blocks[i].non_simple ? blocks[i].reference == INT64_MIN : -1; int is_keyframe = blocks[i].non_simple ? blocks[i].reference == INT64_MIN : -1;
res = matroska_parse_block(matroska, blocks[i].bin.data, res = matroska_parse_block(matroska, blocks[i].bin.buf, blocks[i].bin.data,
blocks[i].bin.size, blocks[i].bin.pos, blocks[i].bin.size, blocks[i].bin.pos,
cluster.timecode, blocks[i].duration, cluster.timecode, blocks[i].duration,
is_keyframe, NULL, 0, 0, pos, is_keyframe, NULL, 0, 0, pos,