From patchwork Sun Mar 11 17:58:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 7904 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp801873jad; Sun, 11 Mar 2018 11:00:17 -0700 (PDT) X-Google-Smtp-Source: AG47ELs3EAOsGH6vDhsBdtXhQCIaUGq6hpGCmZy3rlm7ucUgNFiZfg/WYdjRGx8HtUgAm5Uf47WB X-Received: by 10.223.167.5 with SMTP id c5mr3852013wrd.188.1520791217842; Sun, 11 Mar 2018 11:00:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520791217; cv=none; d=google.com; s=arc-20160816; b=c7dguH6fwFejI6GwXsTITat6glDOTbt8K6sSTrYNLLh/T5d03BYezsKWx7QjRH7PjP 4fYg5ZXP88sdGmqAxhUL9R8k4Fwje+83gNXXNSuaXTmTm8DFPEepgOPucoCEmJ1AMCnB Z9/ndaeAQ+RN+DPSjs/d3eykNyf1HbLXLpXQej5UcqGOVeOLiOn1R47IYM87KMsw9Qyg cyg9FG4++bay2aOAu5EpGmBMVmcCX5xf/0UxIgBu1wemXWsyjEwdFPsejfJ56rR7DRNL Z8YLC7/nSftjgchvy+YpvKvqj4TDBTsIyXeZFCgrdoKli1+VlagcOY9Z18YcZmYcOvYG 4hWQ== 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=dlwHmXlo0eHVCiwWDYghAwSJqG0Lbi9bQgfQrjM46VM=; b=WSlCEQPRjgaiNQ4tTKFTybIewThUq5ydDTnwraNbIcB/qK0/7yN7qhNWrKtl4igU0F KMGgtFb1K+c7zztjp+wGygDAjXBVkTSfzn2uca2vZhHgMYIk81DHz+GyBL4jOXtoM4RI qEJzyn4hdVZWphUuJ9FinSaANDa7H+vm+h7eRId6gVRuvNaEEF1iKsHEwJMnUD8SDnVA IPlgSR3j8pMCSAERoHch+7BLk0Y/zujqqwXBHRLiugHwScM5PuKQrWKye17CZVH+93V6 QJ9itJjPT0w6ddPIFmbPGpXvS/eS62AxGCEbDl40Y/3MR0BV2N1v2uUix41JH2BfgGIc 4iOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=D0z/DiyV; 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 e77si2164565wmd.91.2018.03.11.11.00.17; Sun, 11 Mar 2018 11:00: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=D0z/DiyV; 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 1658768A20F; Sun, 11 Mar 2018 19:59:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f194.google.com (mail-qk0-f194.google.com [209.85.220.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E90E968A1FB for ; Sun, 11 Mar 2018 19:59:37 +0200 (EET) Received: by mail-qk0-f194.google.com with SMTP id d206so9102066qkb.3 for ; Sun, 11 Mar 2018 10:59:48 -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=OnG3fMOhhXEAzE9MUcifxAfTPR7KoCbutD+2UWejHIo=; b=D0z/DiyVtW/aavwp8tnruO7Hp982FjmcHjLVLsmFwSD0Sf/l4ytjAryDI7LNx0psYe w3oEI65DrFVqTyNM19fhQkuJeYZp/Nv3nYuy1yqx5bLdtb9d5AdpJ3rKlpG1G64TOSKx KsVKHDerFPi6OfshPdXrBQlGE201Z9rVADpkRm7PcZzNC7UCaQaEIUJDckV7UfZm2E06 6va2N7DSL/mGsi5EUMWBQBxdTRO9revBSlKMilY/IIKUIhgs3i4CcnfQ4AznfYXriIwG qGZyaH7ppCTs6/ik7DIzj2POOoQCXgiqDas6fZO5NZH5v86R8bD10j5fN13/uSiPBnZp WbwQ== 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=OnG3fMOhhXEAzE9MUcifxAfTPR7KoCbutD+2UWejHIo=; b=H1lWvoX8BD7pJ6xV3DAQHkVC+eDrMtQBzsdiVUAWuzuPzKhMT6a6neZaJ1sJrzPQni ArMrApTKk561g6yluYumVZVemyxHukzF0r2DCFemXBPowBx7SsvJEGFTrBly4R2YzJM4 hfNBga3OpZpxouiXtqBLC1vJ8fl5yhHKEZOYJb/dj2b1rHksKsSt0v5GCvVYTvhzoeNu ge/DpDkykaWPnPLEjk2LUjIxg2cqP+aHo5qvdy1s/5qO+StI66HF8LFYQ5rwHXfxsPV7 cbwo9/dq93ASpavw3RXQApFL/oWw+O+ijBzAHr8/2e37t54ojTo9e5xmJQSE3Z8Uz1X1 ExFg== X-Gm-Message-State: AElRT7HejHNj0WVAdiHFS3ml1Rupy+gwI/cVIdtFgZA8TaN5km0MUHUx tvz7eiGPKmbZn2wuBIvaiRRgHQ== X-Received: by 10.55.33.37 with SMTP id h37mr7511877qkh.208.1520791186953; Sun, 11 Mar 2018 10:59:46 -0700 (PDT) Received: from localhost.localdomain ([190.188.171.140]) by smtp.gmail.com with ESMTPSA id 16sm4029946qtp.88.2018.03.11.10.59.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Mar 2018 10:59:46 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Mar 2018 14:58:52 -0300 Message-Id: <20180311175854.10096-4-jamrial@gmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180311175854.10096-1-jamrial@gmail.com> References: <20180311175854.10096-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 4/6] avcodec/trace_headers: move the reference in the bsf internal buffer 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" There's no need to allocate a new packet for it. Signed-off-by: James Almer --- libavcodec/trace_headers_bsf.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/libavcodec/trace_headers_bsf.c b/libavcodec/trace_headers_bsf.c index 93d04cb509..d59bc828a9 100644 --- a/libavcodec/trace_headers_bsf.c +++ b/libavcodec/trace_headers_bsf.c @@ -71,41 +71,39 @@ static int trace_headers(AVBSFContext *bsf, AVPacket *out) { TraceHeadersContext *ctx = bsf->priv_data; CodedBitstreamFragment au; - AVPacket *in; char tmp[256] = { 0 }; int err; - err = ff_bsf_get_packet(bsf, &in); + err = ff_bsf_get_packet_ref(bsf, out); if (err < 0) return err; - if (in->flags & AV_PKT_FLAG_KEY) + if (out->flags & AV_PKT_FLAG_KEY) av_strlcat(tmp, ", key frame", sizeof(tmp)); - if (in->flags & AV_PKT_FLAG_CORRUPT) + if (out->flags & AV_PKT_FLAG_CORRUPT) av_strlcat(tmp, ", corrupt", sizeof(tmp)); - if (in->pts != AV_NOPTS_VALUE) - av_strlcatf(tmp, sizeof(tmp), ", pts %"PRId64, in->pts); + if (out->pts != AV_NOPTS_VALUE) + av_strlcatf(tmp, sizeof(tmp), ", pts %"PRId64, out->pts); else av_strlcat(tmp, ", no pts", sizeof(tmp)); - if (in->dts != AV_NOPTS_VALUE) - av_strlcatf(tmp, sizeof(tmp), ", dts %"PRId64, in->dts); + if (out->dts != AV_NOPTS_VALUE) + av_strlcatf(tmp, sizeof(tmp), ", dts %"PRId64, out->dts); else av_strlcat(tmp, ", no dts", sizeof(tmp)); - if (in->duration > 0) - av_strlcatf(tmp, sizeof(tmp), ", duration %"PRId64, in->duration); + if (out->duration > 0) + av_strlcatf(tmp, sizeof(tmp), ", duration %"PRId64, out->duration); - av_log(bsf, AV_LOG_INFO, "Packet: %d bytes%s.\n", in->size, tmp); + av_log(bsf, AV_LOG_INFO, "Packet: %d bytes%s.\n", out->size, tmp); - err = ff_cbs_read_packet(ctx->cbc, &au, in); - if (err < 0) + err = ff_cbs_read_packet(ctx->cbc, &au, out); + if (err < 0) { + av_packet_unref(out); return err; + } ff_cbs_fragment_uninit(ctx->cbc, &au); - av_packet_move_ref(out, in); - av_packet_free(&in); - return 0; }