From patchwork Wed Mar 21 15:03:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 8072 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp5241675jad; Wed, 21 Mar 2018 08:04:17 -0700 (PDT) X-Google-Smtp-Source: AG47ELveq6NynSrUYTFRgF/MxLMulrpmvTaHyJmQBIciAUxGbxNRkPtfFiJ1p43Jp2X3VK864u1E X-Received: by 10.28.91.143 with SMTP id p137mr2126197wmb.76.1521644657293; Wed, 21 Mar 2018 08:04:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521644657; cv=none; d=google.com; s=arc-20160816; b=DE4yZsnoxiNussuHaVrfN+J8crtnvrzaocMteg1WMEEjnEFuHg8t8YgzKf39A+H0S1 H9w1OSnzvxQ1C4tawztQL7jPAmpvjRdYriwdl1sX5xK/fBwje2Z8zAjr8fnNF6YYBWg3 PqalXesS0m5Pe0bmr3+ceja1mpqCYUHnvbqNMOiL9YWdSeyh8QldGW29B//MFACpQYXG k3t+2M19gk76VjIr7knoHnlTVDFtMU508tud1s1S1QEYQmv/qy+nELweNS4PcKrcHlxO inetg+K98/oj8ekLzjCA5kna6qyH46yMvuJjyL9LU7nvavYVnZH8Oh/ii6jGTKmbBJdq YUOw== 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=i5Z6IQuF30vF5mPQXHvSzCHR47lNqYFVSIxPaEZUGJc=; b=wNeknhZ8CRaruOcEpVzduRUie2gkJl8PILbdRfnVRnYj6XVa4QYrfF2M+kUtW1d9dQ fTegWgk5WSoqSz7PLZQausHCXyPrvFhX572GehlnvKwcfYmnZ1dRMWOWZbFeUiWFRjxM p+AQOuqBWl2uHCWa7xfTAZAHtiKK2HG/zX3wZ/EYrzo6PkamSsBH79IeQs4uKaq0wbVE b9Oj0MZZKn3MYSDo5eKnZmVBhITbesAojOvdVGInoSll6wuw4pQjtly2OsUBkzOYzM8F vvegUWWPZ3ZMEjCucFq043OAa5YaMgyzyRl++VQEUzbQ6ovIIiqRbgaxHrG+kljepjf2 1TWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=TouQYYTG; 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 x199si3025167wmd.31.2018.03.21.08.04.16; Wed, 21 Mar 2018 08:04: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=TouQYYTG; 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 0DB68689B4F; Wed, 21 Mar 2018 17:03:56 +0200 (EET) 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 9B461680504 for ; Wed, 21 Mar 2018 17:03:47 +0200 (EET) Received: by mail-qk0-f196.google.com with SMTP id z184so5768809qkc.1 for ; Wed, 21 Mar 2018 08:04:02 -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=e2jRdQZnCsHRtxJQl3L8/RwaGEnSvUNOQzBlcRaF98w=; b=TouQYYTGopjYNWUKumz+JmwXNQqRgOgHQkPkYtCDMDIjMKbEeVpQSrpnppJUk49Ms9 VhPQYIHYOfbKXOm4ACFzMNQcP9XrC0a7ONi09GSPAlROe4J7h+s+t0wPIhHbFfcoDOt6 DnFVILwZmINjes4YfQtvILJjyYlQMLEQ64Zx0OOOD4Pd3Fo3LJyCyHMukUk4aoavXAal mN8eiArarII5fIJGLUea4B8iLK8S/hXAwHnLJZdVfVeSJIb5PBVoqyIW/siqIUF2TTTQ V2Omz7sHOCNRFQvs1cqtfYCfQMREfHr3dR5rex26ljqCTAPQa/0EzNBs9T6zAhFaHoED LCMQ== 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=e2jRdQZnCsHRtxJQl3L8/RwaGEnSvUNOQzBlcRaF98w=; b=oCwVYNJ2txDi0BtfN+c/9dajbm/ZMpdOXTvAqQov8bNZVqe370+LpbrIqgVk1le8UB 1zL3RpNj1vyUi2bqitChic8CLOe+qZYDPr/Rq6K90hpeGRbWlQP0POV9b/PhJQb7MScC XRoNEl2nAkfyYksaGnTfnDIXfY1ElbV58dquWLuJ0NUU7wLRgueB8/z8iiy1w7BappCb l0B57BPSJYA0RzWlYybHiLZNZHoIP91LSKYXLML6y0zZrDYwapN4W6/Xj1IFdmVDFOpE o1pEerm3yqRfdGdV4pg8ZktMfey29GDz8ZuTixDUX4HTn6rFw2MABrzi0vKut0ZZz+Wk Rt7Q== X-Gm-Message-State: AElRT7G5I4uLdwDQp4M1vMumLW4xbMd626DIAzqWBYqZ8ePaVsZwjRtV IAfHDjjqi14dl7R79pmhSs13xg== X-Received: by 10.55.177.66 with SMTP id a63mr29662228qkf.116.1521644641395; Wed, 21 Mar 2018 08:04:01 -0700 (PDT) Received: from localhost.localdomain ([190.188.171.140]) by smtp.gmail.com with ESMTPSA id q189sm3486567qkb.2.2018.03.21.08.04.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Mar 2018 08:04:01 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 21 Mar 2018 12:03:32 -0300 Message-Id: <20180321150332.5244-2-jamrial@gmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180321150332.5244-1-jamrial@gmail.com> References: <20180321150332.5244-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] ffmpeg: pass reference counted packets on codec copy when possible 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" Should prevent unnecessary copy of data in cases where new references to the packet are created within the muxer or a bitstream filter. Signed-off-by: James Almer --- fftools/ffmpeg.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index ec9ce29097..1b2e37b8d8 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -2049,6 +2049,11 @@ static void do_streamcopy(InputStream *ist, OutputStream *ost, const AVPacket *p opkt.flags = pkt->flags; + if (pkt->buf) { + opkt.buf = av_buffer_ref(pkt->buf); + if (!opkt.buf) + exit_program(1); + } opkt.data = pkt->data; opkt.size = pkt->size;