From patchwork Thu May 16 22:29:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 13166 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 2D704449AEB for ; Fri, 17 May 2019 01:49:49 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 178A868A3DF; Fri, 17 May 2019 01:49:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 777B2689AD1 for ; Fri, 17 May 2019 01:49:47 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id m3so4910510wrv.2 for ; Thu, 16 May 2019 15:49:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vdJGf8Fh5XjYiWdfWnI6FhEUIup716atz8s/OcxloO0=; b=BfmuQToomQkn5gCCwWcmCyBLmi9Iup/TZFKRIkkiOn9fslIYonhZXJ9GtHlYFAZSb5 hloovV/lCCtRw1AIyi+lsQkKqyz8VqilErU6MDxMGnEQ0vaeOhrabYKfbdlQZVSFwvNR 80S03bYuj5DnDZL2+cwR8DOF94xxQVj64JFZEHdcyDcPhp7vIwTVi5SPjJbKuV1X3dZx v/E7apGgCTpXIg3ERwBJiufXdZk4WYymxh+uAnUIQuC4ObrOlySU7wxXMPEWjnRSqIhE 0Il6Mm8ZpnPGz9iRcmGm0raGjtY8KHUJymgpAB9RQMEI6DH4EQlCKxaJcPdDoWW0ytoF Da2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vdJGf8Fh5XjYiWdfWnI6FhEUIup716atz8s/OcxloO0=; b=qStJhjgVQ1uyUQLBUgMvUECa1jRuN1zPgtTWhKmO5icTa9FzYWuoXBwWwhzxLr3kh3 PHPp3ncz6l1t2Z6O4kbJp9digcZ5Ws4WvRxudbo8W8QRsg3kVs9feWnT7aTWfb+bK/gH Xo7beYlKInNBVzZeWk8uZb1EYdhxxMn/+jce3UeZLibQofuL2Y6pb0flM3Dn6sb3AbQo h/wcJxGoaT1DwrA1HL6MQ49ZRvC4vAWQtkaN43R9t0HDEmTCFcSUX09CYf+4jIuVec78 YiRpuhkOAcTzxsg2gMrfwf1NHPpG7cC3e7GWo0UR8ejy/INBgbrL5ACTMcsxH8htgu0m 5N6A== X-Gm-Message-State: APjAAAXTV3cEDg7QxzKi1toE0k4bpEy19sDE8vpS8pMPS0oQNGhUHQIX svTTTBiZ8K6sixJwud83+NOx4qk9 X-Google-Smtp-Source: APXvYqw450JSpC5SOerw+UIx46uOiw/k6t+ruuIfQzvDK2LWgRYVlkdXka6BObIFItrrJV+QJjUIWg== X-Received: by 2002:adf:e902:: with SMTP id f2mr32612462wrm.301.1558046588346; Thu, 16 May 2019 15:43:08 -0700 (PDT) Received: from localhost.localdomain (ipbcc18715.dynamic.kabel-deutschland.de. [188.193.135.21]) by smtp.gmail.com with ESMTPSA id i185sm11168725wmg.32.2019.05.16.15.43.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 May 2019 15:43:07 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 May 2019 00:29:52 +0200 Message-Id: <20190516223018.30827-9-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190516223018.30827-1-andreas.rheinhardt@gmail.com> References: <20190516223018.30827-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/37] avformat/matroskadec: Don't copy attached pictures 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This commit replaces copying attached pictures by using references to the already existing buffers. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskadec.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 1cda5d5b76..0f9d55566f 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2713,15 +2713,19 @@ static int matroska_read_header(AVFormatContext *s) attachments[j].stream = st; if (st->codecpar->codec_id != AV_CODEC_ID_NONE) { + AVPacket *pkt = &st->attached_pic; + st->disposition |= AV_DISPOSITION_ATTACHED_PIC; st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; - av_init_packet(&st->attached_pic); - if ((res = av_new_packet(&st->attached_pic, attachments[j].bin.size)) < 0) - return res; - memcpy(st->attached_pic.data, attachments[j].bin.data, attachments[j].bin.size); - st->attached_pic.stream_index = st->index; - st->attached_pic.flags |= AV_PKT_FLAG_KEY; + av_init_packet(pkt); + pkt->buf = av_buffer_ref(attachments[j].bin.buf); + if (!pkt->buf) + return AVERROR(ENOMEM); + pkt->data = attachments[j].bin.data; + pkt->size = attachments[j].bin.size; + pkt->stream_index = st->index; + pkt->flags |= AV_PKT_FLAG_KEY; } else { st->codecpar->codec_type = AVMEDIA_TYPE_ATTACHMENT; if (ff_alloc_extradata(st->codecpar, attachments[j].bin.size))