From patchwork Thu Apr 5 15:32:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 8340 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp6189325jad; Thu, 5 Apr 2018 08:38:45 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/Kf6Jf00n04jGQyI8PMWiobnNTSfttjRw+YS9pt96Zjq9woVT/Q4NFBUApNM5kfuqJrHRI X-Received: by 10.28.216.69 with SMTP id p66mr12389634wmg.84.1522942725664; Thu, 05 Apr 2018 08:38:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522942725; cv=none; d=google.com; s=arc-20160816; b=YNPT74uGvrqKNZhNpyNqdu4K2rN87/xtwgkVc1z80k5C8DKhgYe3LoHHXGFhGacLCr wap0xB5ogBLyFNCnnk+K+9d+MsOl4aeG+zNP0vQ/rcS9sU1B9D6r5cIDb9VpYhnS2m3B ct8bnFJ/j0qTzduXQ77VGqzOVLAvS8UZNA3lVTOFzJKvpOwfWAvxQv9l+Jpl785YgGWQ ztArRm514kTgENdmPh59pY/BhOtna5IbIm6v9XWXfipA6yS40DLT5G1x8FU7z2Szew1r BR5X3hQ0Qdh4bTjTmA7AHHu8BHNwA01pHX+91XRdXwHICKvbY4k34XViPiFjdqDEkULE ReCA== 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=X2TPEtxXxSWbqx8lfv+ALpbX7UEihYeRK47s+jD8oNk=; b=n+Tx11/sAPnHPuSdiMtvcnIY+YzMQT18GpBgVWzG8zl3mwP23GzZrCPV7i0VIiCt8h 952xCb0u2RCWtm/OjwJO0VoMDJ8xMJGdUpo2XA+N8xUPPnpsG7chPFlDteRsvNZwV6ZR 7a5U9sD0y9nmGul6zo4VlT/pIgxDfFgrc36aD/gUQjlz0oW/eccyhx+76P588cm6XIar Axfl9H+V/aNr+ziOIeEhJ95Y/sK5pb7VV+K4Cxqxm/PhNnvk8qH/dSAOfQnDN+uCvOfG byTI4MVqH68vjLrDKfz03pZZvrRUUzTTp5lLNwRQncBkRR+p1/8QDwDtVixliajxfP78 tNkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=cpOJBAgz; 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 l1si4335888wmc.128.2018.04.05.08.38.45; Thu, 05 Apr 2018 08:38:45 -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=cpOJBAgz; 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 3977268987F; Thu, 5 Apr 2018 18:38:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f196.google.com (mail-qt0-f196.google.com [209.85.216.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AF5D168045D for ; Thu, 5 Apr 2018 18:38:15 +0300 (EEST) Received: by mail-qt0-f196.google.com with SMTP id d50so19957603qtc.0 for ; Thu, 05 Apr 2018 08:38:37 -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=mAXFALsSlq5pvS7Tkra7Yh3rqG9WiLzu172VdZmQWOo=; b=cpOJBAgz2fgNuTKE4OhTNTwsAutU6w37/JQrPfw08dMOf9Ybm0fVu3xc6w2llzo5qR 8ZXQ23/7JYc8sBMIGWklVvcfXt4/WQlRkcfE5r7jIGjo3fzkAkQ2Hqt5VZU6U85Dodpc TgETU4iodgNGT/uu2tFVeujv3y5SA4OwK4z7XR8qZDXEVndQi68akfHolIFjyoK6l9DJ HoD/RTS+fgpGValPzw3io0mJKqb/KTiLWQ3hYutXGj+cBwD7bUdVPbaoRDENLvJJiGzq sXJq+GzDcvtFcyjdVpYshOCqzE5WJmMHg8qzr5T1G6W5JBsd5fN78zIxu58rdFtwaw0n fNvw== 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=mAXFALsSlq5pvS7Tkra7Yh3rqG9WiLzu172VdZmQWOo=; b=Fwxbvag1FPBJfsFug27zvx4JnG2ykfo3jOcxJs3rShegLlHqa/1RuqBfK62cm/wf9F HW+shOg4DtYcZzDALd89xhoeQjf5j+C+p2z1/3OoROyBAG88WjtMPCP5nIZm50+fS7es PWdhsyxQm03eGS4XCX6TtpnYWZNiYRm/Ja6oZNC+Z856zHmbSABBgKWfCssmUDf3jPA3 IZX7l6WOXjFbQSTeCkO7cLiClhEobYT/VQ2h/sT6TPycqMBqvuDV2rz6vopF0lLCx+1F d/PbeOtVI5f7VpWliF1wnSAxvbG0pq0kd/ioZ4BpfvPpE11jl2wJRVEHpTg39tZfFxKe zhLw== X-Gm-Message-State: ALQs6tCyGsdu2Xk7IuMGHmL2XpTcuix4N8BpRejuyiXWJ2Uxo9wx5TTu zGySkPzNdEXr75T6gNWLfA8Awg== X-Received: by 10.200.63.6 with SMTP id c6mr33499158qtk.286.1522942382815; Thu, 05 Apr 2018 08:33:02 -0700 (PDT) Received: from localhost.localdomain ([190.188.171.140]) by smtp.gmail.com with ESMTPSA id y5sm379409qkd.36.2018.04.05.08.33.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Apr 2018 08:33:02 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 Apr 2018 12:32:47 -0300 Message-Id: <20180405153247.11068-1-jamrial@gmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180404234334.9052-3-jamrial@gmail.com> References: <20180404234334.9052-3-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/3 v2] 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. About 10x speed up in matroska_parse_frame(). Signed-off-by: James Almer --- Rebased after the prores fix in Patch 2/3 v2. libavformat/matroskadec.c | 45 +++++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 30f0da5bee..1ded431b80 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')) { - dst = av_malloc(dstlen + 8); + 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,