From patchwork Mon Oct 2 02:51:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 5370 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.61.8 with SMTP id n8csp1047956jan; Sun, 1 Oct 2017 19:52:21 -0700 (PDT) X-Received: by 10.28.238.73 with SMTP id m70mr8606447wmh.23.1506912741240; Sun, 01 Oct 2017 19:52:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506912741; cv=none; d=google.com; s=arc-20160816; b=g0ANdE3r8sTAM+gvJbYo2j5j7QOehK3nbmcx8RK7JKLT177AYlntuV0Ekfzd7Nz30l f95ysCCXRZFmJMqX2SoExUj4ev4SxH+WRO76trgRlzwOHEChHNAC/+rWK6Xo3zsT+Byo OC+aLrM65FUWtLYJiwYxfsyerLwIjTig/dAq2Q1VML3gChKbwUtTj5mR+M7IpHk/KfFy FaV/gT3O+goYd13PuxwQDKsJOoZmmMa7v19GnunCzkuUu1L1FTTH5tFBUOOaty/fLakp Zrlf9zDbuzBpHrkGNsgUexUSqw2lTVdrZ1yJ5esjV66cFtVE658/3xr31TPoCeTQlNhI /wCQ== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=iHrTKCNKI9At8o8UiRNLe5mrmgmOuaAhpTcHjI6lkWQ=; b=IY0BUi9yAt8cTCNsg3K2MarHAMmnTj5850Tro2wkOdDeoSYgiTrnJVYRg58NS1XdYf RG0ibj/jXfid+AJ3OJpkG8SAzqB5e6X89YEvdMMhxvsao21jD0lCQxVvF83jsBXtcvK6 PP17HP2gq/cd6fiwhTdG4nt+1V4cdVx0ZcZnxmPzXAWJy3Lbq6JUM0Vuz2drs/fJi86K xByyqhAbcS7vZPPCz3kNX6fLOD/H6ht3+YQe90K8MuH41BT58tJXh8xVfx/2+Kx8MTAj uWCr30PHfnVol07/qjIhxuUrSSGWEyW6d4OBFuYmEegg3hk7ABi+vUwNp+O/BXxRNg+6 SFsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=APWZ7ufM; 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=NONE 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 k128si6803947wmb.181.2017.10.01.19.52.20; Sun, 01 Oct 2017 19:52:21 -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=APWZ7ufM; 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=NONE 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 3276E689E0B; Mon, 2 Oct 2017 05:52:05 +0300 (EEST) 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 174ED68825F for ; Mon, 2 Oct 2017 05:51:58 +0300 (EEST) Received: by mail-qk0-f194.google.com with SMTP id b82so2765443qkc.0 for ; Sun, 01 Oct 2017 19:52:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=fLNwrD8PgXE47tmAnWg73boDtGQjlMLLBz+CEu5Au6g=; b=APWZ7ufMKPt4VLM/cMqsjXMwk5VPYNLXCfY2KvRM5D/xzO/tm6v6yyUZhUK3mqXQVj k+N7MRAalxp9UQJYTLRVoKWNlvZ1Dnwb9kOLZxJs18aS4wuUq/jktgRn0NDGIXb7jaR5 HNuGa52XtO6oCHkrsssZG07FwYWITU6K96FqjPyCI6CvWkhI2Q4Or5bH6zH2oZ1SRQFB zqoWVze6EyLs5rytPhX/ChUIhVG+u1IuP2v3Jrlsro/f4LrbVk3BxocAeaGvbA6oO0ad 6xAeHvV+BWpYJirWhl4mdi50TJt7XnuWMVt0TCwC2a1WUjAOvQTVR0vSGQVczpJ5KyH4 Oitw== 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; bh=fLNwrD8PgXE47tmAnWg73boDtGQjlMLLBz+CEu5Au6g=; b=Fp9vjopd/CM0An7t+t9SDcCuAg8PEl/LjlbN7HnPVOIUrwit2rTwaCPQEUcDast+Fu h3ctBtwqsH7QXzRz9etG75Xsur07dsTfjL5HvDr0cPn0Ko9yo8wkwEOt6Y64ctKOeyvv JiNKvvByW63N0axE3xyEk9vICZxQblY3qVxD/ipI4kZVNPl4c1zHA2yRMxs55NmBxDj/ ZAxGzxGMfQcHjDqifdcDx0Yrxzc36LyYNRrL1cFZcpKA+z2JkVPe4I+p+IQxx/u6xepZ Lm2S/9RlGdFjcItJe6Y5VBWixJrQ1siXuu7kgz5ELEECamZ1Akjz2/Shs/11Dbf106Xt C/Xg== X-Gm-Message-State: AMCzsaX65M2qHzATwDImkxTboOx5qfrIRMf2jjigcT+NEtu8FWupFSUv 9HZ489MmwI742tHUoF+STQFxhg== X-Google-Smtp-Source: AOwi7QAi/KqWfGr9eX+q1kn/PFMzKx8buGVEMjXL5C+cnJFwO7w9CddrujPvd8dtyS7mqt0mWgHcDA== X-Received: by 10.55.79.79 with SMTP id d76mr14063868qkb.173.1506912730988; Sun, 01 Oct 2017 19:52:10 -0700 (PDT) Received: from localhost.localdomain ([181.231.68.242]) by smtp.gmail.com with ESMTPSA id o138sm4039979qke.89.2017.10.01.19.52.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 01 Oct 2017 19:52:10 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 1 Oct 2017 23:51:50 -0300 Message-Id: <20171002025152.5648-1-jamrial@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/decklink_dec: use av_packet_from_data() to create packets from an already allocated 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" As a side effect, the packets will now be refcounted. Signed-off-by: James Almer --- Untested libavdevice/decklink_dec.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp index 8a14094474..b0c2fb8791 100644 --- a/libavdevice/decklink_dec.cpp +++ b/libavdevice/decklink_dec.cpp @@ -689,7 +689,6 @@ HRESULT decklink_input_callback::VideoInputFrameArrived( //To be made sure it still applies pkt.flags |= AV_PKT_FLAG_KEY; pkt.stream_index = ctx->video_st->index; - pkt.data = (uint8_t *)frameBytes; pkt.size = videoFrame->GetRowBytes() * videoFrame->GetHeight(); //fprintf(stderr,"Video Frame size %d ts %d\n", pkt.size, pkt.pts); @@ -749,16 +748,16 @@ HRESULT decklink_input_callback::VideoInputFrameArrived( txt_pkt.pts = pkt.pts; txt_pkt.dts = pkt.dts; txt_pkt.stream_index = ctx->teletext_st->index; - txt_pkt.data = txt_buf0; - txt_pkt.size = txt_buf - txt_buf0; - if (avpacket_queue_put(&ctx->queue, &txt_pkt) < 0) { + if (av_packet_from_data(&txt_pkt, txt_buf0, txt_buf - txt_buf0) < 0 || + avpacket_queue_put(&ctx->queue, &txt_pkt) < 0) { ++ctx->dropped; } } } } - if (avpacket_queue_put(&ctx->queue, &pkt) < 0) { + if (av_packet_from_data(&pkt, (uint8_t *)frameBytes, pkt.size) < 0 || + avpacket_queue_put(&ctx->queue, &pkt) < 0) { ++ctx->dropped; } } @@ -779,9 +778,9 @@ HRESULT decklink_input_callback::VideoInputFrameArrived( //fprintf(stderr,"Audio Frame size %d ts %d\n", pkt.size, pkt.pts); pkt.flags |= AV_PKT_FLAG_KEY; pkt.stream_index = ctx->audio_st->index; - pkt.data = (uint8_t *)audioFrameBytes; - if (avpacket_queue_put(&ctx->queue, &pkt) < 0) { + if (av_packet_from_data(&pkt, (uint8_t *)audioFrameBytes, pkt.size) < 0 || + avpacket_queue_put(&ctx->queue, &pkt) < 0) { ++ctx->dropped; } }