From patchwork Fri Sep 24 06:28:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Shun Ho X-Patchwork-Id: 30543 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp1196790iob; Thu, 23 Sep 2021 23:32:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxxxFJLlS+7WAhlXZPqaUumtKiVIR7TnYWxhb9d8ZUz0nfDLUGh0i3xBIxgyI0GCrdw0VRL X-Received: by 2002:a17:906:3383:: with SMTP id v3mr9765513eja.213.1632465147509; Thu, 23 Sep 2021 23:32:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632465147; cv=none; d=google.com; s=arc-20160816; b=uLwvtJjEPi2LE83ThXfTZ7/a4XqGPc+5vOh6CiJbFE7a74kKp6kDVhZhIH35arRPK4 VtiglwNQIs86CTQzNWVb8Iv4mY31wv+nzAD7kkNwfYYnk3yg1Wipi481PGslfVy/+mD4 hNYuOHMKIqpTA/ZKhpXAhCQAUXUqJtdWbfRDP5EdSBe6s0QOnNENooAg+8xMGDFNxHNm 2LYKZUe8X3ZskHiquekR6VeTGe/Q0q3+UlniabkdXvQfaBpUhDFDv6dIHLVvFOHLb1sc 8IXTg8dNIfSLMqIt2mTc/VhhS6+OVEK912F343U2WfZDj8dn3q7E76/klcAEQkG6WkqC sx7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=/12zpajLyGw5kNnVAnNFq1oXj+B219WhxTER4syxgj0=; b=qiWSxopmdaiOSDG6PNJy0ai+k45bH74lockIQWbx3tQhlDQHk6L4vTMSH82Ydm+bkP GtanFexIOclRGwO5EcTc5MmWfez34a1Rjeh8JVvGLaNWhFT/AlQzooicQ6QBkhkt/0P1 T1GcmEbT0L64WBqn/tDpp4B/lt6b0NNgRGolRx57ntEhK2J1w7M4ocd8v80tmEvo1DDn 5dLZpMMd78pbYCegvgID9dlk/asyEJ7T82+Wz/YkdDQhjCTo8aQQZ4tx4zaajFwr0OqE 4UbdKTs9rsgCI4FVcp3dG3ZlbY/xioBlMetAScC6fXklR6Ysk34gAmooeBxjumcSa2sy NpDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=m1blKJuD; 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 i14si8456495ejo.653.2021.09.23.23.32.27; Thu, 23 Sep 2021 23:32:27 -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=20210112 header.b=m1blKJuD; 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 AA61368A62F; Fri, 24 Sep 2021 09:32:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B347468A51F for ; Fri, 24 Sep 2021 09:32:12 +0300 (EEST) Received: by mail-pj1-f41.google.com with SMTP id me5-20020a17090b17c500b0019af76b7bb4so8893550pjb.2 for ; Thu, 23 Sep 2021 23:32:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vRsi5GaFSqRbVhqAUeHCD2zyx1f407pqNIu+ocownA8=; b=m1blKJuDqnwoksLlmcvj8cV/7RcXUIGKq3bN8TxzjRfVh5jCpEwdPNWG2Qim1g/u4K TiERzNlKbD8R5GWQ4tKQofDIN9y5rUQrthK8rMfDuYMR68ESFUFJbCCClw5dwMrOXPMY X9etbaY5ADTbT7jNpP9FmsZyjQ99vx3ha2TYUyYn6x2vyjlaaV/flx0hQrROEsYTpF2U qMs+g8UE08ZI3gR4pYX9ZgiGD/+LpIFcf+c/d7MjojXqiHrWa9sCSnPmStjW0PsTHjkf MjjM4HwMhagEZcVE5MEn10Pc4dYBT91t4Ec6fUX3YuWHUVXAn3F4UQ+caI+Qp1q0RgfC MxKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vRsi5GaFSqRbVhqAUeHCD2zyx1f407pqNIu+ocownA8=; b=UzMMVydzOJrHrl9UC2yazoqclquE0WysVf0Ph5xVDSPBdjczBlvnSrMoRaUG20O2Cj SC+UbZhD75ZuNdlkejqHFYkl5+OYNabF+TxUW0QMI39bLnSBQOGHPd01rDY4NNtTXhqE 1B6gRSdPa6w30jSOWE+7Q/2G2oLp7C+5Qk6DLTdecspdeBPUHr1BSyCP7PusgNIQ/F6Y v+vvdhbRXOtGyA/P7thdtOYegAdXfrLF0klOe+bjfpbk4GF/Is2QljlUIjsfg2w1sTnk ykkAvfdzDxRYSdrFSYdwmBFsG+xHbVrib02HsNmPM89l79Tw2Svn7tM3qFVT4z5J6+0p PaAA== X-Gm-Message-State: AOAM530Lf3ISOUqRyA7oTtyJN4V8FWm9DKc2By50vPOkBgYoZs8uD78u IQTSaaAnsuAEuJFOqXf2gtzq+vOLdk6Cww== X-Received: by 2002:a17:90a:9a8b:: with SMTP id e11mr324380pjp.102.1632465131024; Thu, 23 Sep 2021 23:32:11 -0700 (PDT) Received: from localhost.localdomain ([103.252.202.177]) by smtp.gmail.com with ESMTPSA id d3sm7427886pfn.156.2021.09.23.23.32.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Sep 2021 23:32:10 -0700 (PDT) From: Ho Ming Shun To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Sep 2021 14:28:36 +0800 Message-Id: <20210924062838.7461-3-cyph1984@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210924062838.7461-1-cyph1984@gmail.com> References: <20210924062838.7461-1-cyph1984@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/mmaldec: use avpkt from DecodeSimpleContext X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Ho Ming Shun Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 0YyfE0jC17iA Use spare packet allocated in DecodeSimpleContext to handle packet submission into ffmmal_add_packet. --- libavcodec/mmaldec.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavcodec/mmaldec.c b/libavcodec/mmaldec.c index b97cc6ff5e..aab107d325 100644 --- a/libavcodec/mmaldec.c +++ b/libavcodec/mmaldec.c @@ -786,10 +786,12 @@ done: static int ffmmal_receive_frame(AVCodecContext *avctx, AVFrame *frame) { MMALDecodeContext *ctx = avctx->priv_data; - AVPacket avpkt = {0}; int ret = 0; int got_frame = 0; + // use spare packet from DecodeSimpleContext meant for simple API + AVPacket *avpkt = avctx->internal->ds.in_pkt; + if (avctx->extradata_size && !ctx->extradata_sent) { AVPacket pkt = {0}; av_init_packet(&pkt); @@ -800,9 +802,9 @@ static int ffmmal_receive_frame(AVCodecContext *avctx, AVFrame *frame) return ret; } - ret = ff_decode_get_packet(avctx, &avpkt); + ret = ff_decode_get_packet(avctx, avpkt); if(ret == 0) { - if ((ret = ffmmal_add_packet(avctx, &avpkt, 0)) < 0) + if ((ret = ffmmal_add_packet(avctx, avpkt, 0)) < 0) return ret; } else if(ret < 0 && !(ret == AVERROR(EAGAIN))) return ret;