From patchwork Wed Apr 4 23:43:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 8336 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp5440252jad; Wed, 4 Apr 2018 16:44:17 -0700 (PDT) X-Google-Smtp-Source: AIpwx48N2pSPsyZDfzz8phWTPS6J+FxSdUOrBsWYDOxKo6B+9Y8+QX+qqql3FmjjsR5ezYwAidFj X-Received: by 10.223.225.210 with SMTP id l18mr15575622wri.251.1522885457068; Wed, 04 Apr 2018 16:44:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522885457; cv=none; d=google.com; s=arc-20160816; b=fefT1lkWAOtXmmDXWx2M7IV78vmZGTLgUVnFzixM11KGz69eDp9+L+MXMMPTgj+paa WpZzJ8Yet/wnO/3M6FV6DRrooiFnOgQy6kyo7FEhzQ+YCQAMBUchw0ZWDooZ9Gc8VVrf IhDp//7qJKHl67e2nptDgk6pmqJXuvmw4FV6Kq0uEEsRU2lcjgdKNm4G57dIwXQ2B2+Q zZ+ZnUKDauCc+8IGsvzqgB8bP7XOaG2xEymoGCPx5g16t5EzRtEBhS303FsMXgNfboD7 XUSmJmAcMoo8hfYZqUaEkzy6fW0jjDsr3xgWdOd2X4vUkVDb3eTTeiAWnuHC4DZivWLP JoEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=HpMz2Bz5ALX3LkvPq4VMtA610Axc7H7vMWMLc1yNOFE=; b=dstrWX9+23BxAg8knG9zrdQA2Pc5yajvpasuSEM72PZZZbWce/gw+YMTkmtlteuuwl 8OmKg093/oqULf3J+Ea1PSNSKQ/3mePOtKAnnBPhdtiJwPmvKWZwUy2Pbwnxga2n22L1 CsN5O9WSUsHFFDZZUN+4TkNbwb/bfPglPheyqNHyCnfv43lB448dokkAkbvBkxuPFoKE dIjF4MrMCxPBOadNCq0J+9A9GbuTvIuCmNLtERaKPVbLJV6MZLNTlfrtndilZRyPLejj PSaEOJn6j1Pp/BX0Y7PjrA3dVtFb5qiz0Tetx2k7Ab4gN/sMY+mE46/WLhtokgkYufzr GIOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=sN0wosdK; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e17si4517976wrj.272.2018.04.04.16.44.15; Wed, 04 Apr 2018 16:44:17 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=sN0wosdK; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 57944689E29; Thu, 5 Apr 2018 02:43:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f196.google.com (mail-qk0-f196.google.com [209.85.220.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 65647689DD6 for ; Thu, 5 Apr 2018 02:43:31 +0300 (EEST) Received: by mail-qk0-f196.google.com with SMTP id d206so24519731qkb.0 for ; Wed, 04 Apr 2018 16:43:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=JAn2bZy30E5nAwRselHTHcxGg8juH1aTRLOEPnpLa9E=; b=sN0wosdKhIZgFustGgxmk4rXhZnke64ZsS/br+58NT4Nv4Ju7VbFViWSrjzZwsuI/w KEYTvliB62BhrcLgHo3uyf/aKgpyQPb2ieAmE4gkGYNadpltnq6zN9R9CtzkkIPhi+OO AjVhiUmqh0/DwKP8TaPm4o43T9cWe7hu76+jdk2/IsI7xTs8ucCSp+5jrs3c68JqTY/p zh/ag9+BHCuiPtSpZApQFLBtI3XhdHmWEntDCJag8xGDDP2Zh2hHe9x7/GJ8AV3gM1mH oLWkZenTMn9ZiAo1qU75ddV8o50dhM4EzoID4to/bZ+MnAskzPnHT8BDU8f+0OleshDz QYwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=JAn2bZy30E5nAwRselHTHcxGg8juH1aTRLOEPnpLa9E=; b=A3TCUYmCm9yHUqN22yWhTMzaN6Dl+sXcA3ZYbhjJhWSMkhV0vcGwIrzJvMLzDl4Uts gRNbSdY1uVsaZTGSDZc54qJI13o60THtaQE/f61JfJt2NFv/wuVkxS7Ggyl5abUGVh9j yOh88EjmQjyYJ+dP+I9J6AbCsl6J7CYLAcYqQqLDN/K1OheBEcpKQmfZcVCnrnHNqH49 beWJZfv2l+dZeKkv8LKket6ttP7l42Md1lNxpuzScJQ5G+cb3LPjffIyUSeWZGet4wv1 hPU4FIiJwGepV6csIj6XnJS7kPm9JnMGFF1xfOq/Q8kAKt8ZzC2hlB6f+BzgEbhPf7Ni uyHg== X-Gm-Message-State: ALQs6tCqnJJtJ9DoxJhH4Ut248nnRI+wIaFU0/0ti69cgh9omiaSMCH1 x4e3/2B0T+sYV79hU1NMQWwE0Q== X-Received: by 10.55.64.22 with SMTP id n22mr27016985qka.186.1522885431612; Wed, 04 Apr 2018 16:43:51 -0700 (PDT) Received: from localhost.localdomain ([190.188.171.140]) by smtp.gmail.com with ESMTPSA id a11sm1924200qtc.3.2018.04.04.16.43.50 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Apr 2018 16:43:51 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 Apr 2018 20:43:34 -0300 Message-Id: <20180404234334.9052-3-jamrial@gmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180404234334.9052-1-jamrial@gmail.com> References: <20180404234334.9052-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/3] avformat/matroskadec: reference the existing data buffer when creating packets X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Newly allocated data buffers (wavpack, prores, compressed buffers) are padded to meet the requirements of AVPacket. matroska_parse_frame() speed up is ~10x. Signed-off-by: James Almer --- libavformat/matroskadec.c | 45 +++++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index e74db4ff1b..a6c095199f 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1367,7 +1367,7 @@ static int matroska_decode_buffer(uint8_t **buf, int *buf_size, return 0; 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) return AVERROR(ENOMEM); @@ -1379,7 +1379,8 @@ static int matroska_decode_buffer(uint8_t **buf, int *buf_size, case MATROSKA_TRACK_ENCODING_COMP_LZO: do { 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) { result = AVERROR(ENOMEM); goto failed; @@ -1404,7 +1405,7 @@ static int matroska_decode_buffer(uint8_t **buf, int *buf_size, zstream.avail_in = isize; do { pkt_size *= 3; - newpktdata = av_realloc(pkt_data, pkt_size); + newpktdata = av_realloc(pkt_data, pkt_size + AV_INPUT_BUFFER_PADDING_SIZE); if (!newpktdata) { inflateEnd(&zstream); result = AVERROR(ENOMEM); @@ -1437,7 +1438,7 @@ static int matroska_decode_buffer(uint8_t **buf, int *buf_size, bzstream.avail_in = isize; do { pkt_size *= 3; - newpktdata = av_realloc(pkt_data, pkt_size); + newpktdata = av_realloc(pkt_data, pkt_size + AV_INPUT_BUFFER_PADDING_SIZE); if (!newpktdata) { BZ2_bzDecompressEnd(&bzstream); result = AVERROR(ENOMEM); @@ -1464,6 +1465,8 @@ static int matroska_decode_buffer(uint8_t **buf, int *buf_size, return AVERROR_INVALIDDATA; } + memset(pkt_data + pkt_size, 0, AV_INPUT_BUFFER_PADDING_SIZE); + *buf = pkt_data; *buf_size = pkt_size; return 0; @@ -3001,7 +3004,7 @@ static int matroska_parse_wavpack(MatroskaTrack *track, uint8_t *src, goto fail; } - tmp = av_realloc(dst, dstlen + blocksize + 32); + tmp = av_realloc(dst, dstlen + blocksize + 32 + AV_INPUT_BUFFER_PADDING_SIZE); if (!tmp) { ret = AVERROR(ENOMEM); goto fail; @@ -3025,6 +3028,8 @@ static int matroska_parse_wavpack(MatroskaTrack *track, uint8_t *src, offset += blocksize + 32; } + memset(dst + dstlen, 0, AV_INPUT_BUFFER_PADDING_SIZE); + *pdst = dst; *size = dstlen; @@ -3042,13 +3047,14 @@ static int matroska_parse_prores(MatroskaTrack *track, uint8_t *src, int dstlen = *size; if (AV_RB32(&src[4]) != MKBETAG('i', 'c', 'p', 'f')) { - uint8_t *dst = av_malloc(dstlen + 8); + uint8_t *dst = av_malloc(dstlen + 8 + AV_INPUT_BUFFER_PADDING_SIZE); if (!dst) return AVERROR(ENOMEM); AV_WB32(dst, dstlen); AV_WB32(dst + 4, MKBETAG('i', 'c', 'p', 'f')); memcpy(dst + 8, src, dstlen); + memset(dst + 8 + dstlen, 0, AV_INPUT_BUFFER_PADDING_SIZE); dstlen += 8; } @@ -3175,7 +3181,7 @@ static int matroska_parse_webvtt(MatroskaDemuxContext *matroska, static int matroska_parse_frame(MatroskaDemuxContext *matroska, 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, int64_t pos, int is_keyframe, 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; } - /* XXX: prevent data copy... */ - if (av_new_packet(pkt, pkt_size) < 0) { + av_init_packet(pkt); + 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); goto fail; } - memcpy(pkt->data, pkt_data, pkt_size); - - if (pkt_data != data) - av_freep(&pkt_data); - + pkt->data = pkt_data; + pkt->size = pkt_size; pkt->flags = is_keyframe; pkt->stream_index = st->index; @@ -3291,7 +3300,7 @@ fail: 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, uint64_t block_duration, int is_keyframe, 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) goto end; } 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, !n ? is_keyframe : 0, additional, additional_id, additional_size, @@ -3472,7 +3481,7 @@ static int matroska_parse_cluster_incremental(MatroskaDemuxContext *matroska) blocks[i].additional.data : NULL; if (!blocks[i].non_simple) 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, matroska->current_cluster.timecode, 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++) if (blocks[i].bin.size > 0 && blocks[i].bin.data) { 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, cluster.timecode, blocks[i].duration, is_keyframe, NULL, 0, 0, pos,