From patchwork Fri Sep 24 09:04: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: 30548 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp1291919iob; Fri, 24 Sep 2021 02:06:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw4OpJRI5zdzlajDUWiwoYvjKq4nVWVc8WsWK2CV8gB7rjGsbNaQ9F9uinbwf9FvYGYH4f9 X-Received: by 2002:a17:907:3e0f:: with SMTP id hp15mr135462ejc.58.1632474396265; Fri, 24 Sep 2021 02:06:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632474396; cv=none; d=google.com; s=arc-20160816; b=TfdAjiw/fuUrojKu31PYcD3kpGWY3nYbt6el4E4OzPzzFjjuZXdgAOcI6HVxTS0nVv NTfapsCrfhi04yNtga/uker3WP0jxB2lYklvOkLWqfy6Eji90qkHqEnhnFj9Ba69wioN MtetL2jXTwib7fE4nRaQaAx+5VoHIlvO/MbbbMuBVNWGvSrVioh6D3KG3quLBoZ8qT0I sK1ErIKTRRNT2kpmZbTnWtx/IadiFiSyLVsiU0nGfc0XG5R3T03RIJDR25R7vu8nC6Jh pKIpc9ZIXwYIMnbKV+1MEwIbpO2U8EmgBxeCJ8Lu9GOAVMQfT0oJ1uYb+Kjc4xrPcNcN wyhQ== 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=0ts8yiuxn4OH5iHcGrd5YuaQ61nTHpm+kBvOzYzrdFA=; b=qVwmZxNoSb0OV7kYucmeoc1EIDHH3HdSglESvZtLKl+6Z1P7IaQ0zZVh9H6pf0CWGP 0AVnkFh+Xrq0fMYJd3CAOqzkl39En5QcgI9zNKoWfjBGttN2zhAkTMZSFCwuPt5XpG5f 5B+4OBkF8aT4HkZwe0FMZLWBi8J16R4PQr4kOdlmdy1v7dRWzi6zDspDA2uk8u/Mh9jx jTNJKRiNi5v8olF/WmGQXvVX51olKUOfjcxeZ5RJut5pxhSyOIYhTU8Na1OUUO20xwS0 RNUltcMCeZLL+ClScdsCwP39xApMr86dFyz8ZiY0w/WyYsErRRQvavYxCm+LvtvoR3SX tCNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=nPG7dYim; 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 v9si8501583edw.524.2021.09.24.02.06.35; Fri, 24 Sep 2021 02:06:36 -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=nPG7dYim; 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 E1D5668A5DE; Fri, 24 Sep 2021 12:06:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E8018688162 for ; Fri, 24 Sep 2021 12:06:08 +0300 (EEST) Received: by mail-pg1-f181.google.com with SMTP id k24so9265369pgh.8 for ; Fri, 24 Sep 2021 02:06:08 -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=TKea38c5rHCLzT2DaF6di5aXWfS8zGTA5HB4aq6qMRk=; b=nPG7dYimu+/urlGET3eBNyiPd8kRuvUUOklhA2T3+N6iup9i7JlOlttpAS/kOn6kul nxzwwtaXkhAP4HvwtIg/gCQ7UI3aXWzaaiU2AGrTDlEZLi0Iklw45oTuuu8+NwJ1qmCc yhycgwiPIC0DF3KsQ1Li3xN1QNKqQBskkxRBQDK0hpxvWjlix/se2DPeqqb2KS0c+E58 hFdjGMk2PDlwZoxk1sGk+rxpl64ak9LUwlUSTxmcTc0zSXlAGjot6lXXrCV9JeJLFrNp BSwfO2/cmyRDhSvKLw88dfxXbhWgNk8ZgEEJeRoR+MeDXwaNX2PB9rhB2dGUoc+1ekR6 7BQQ== 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=TKea38c5rHCLzT2DaF6di5aXWfS8zGTA5HB4aq6qMRk=; b=iFUGTc6TtFn+WKBe4jIXM3hmsNL8rE1dfZEXL9Qx5Xo4C2auzbJgpJMhc3Vupq+apA foyIdpNWszqXcLRZr2/N3zDaUXyfv0cI2T63wr+RLQzaJwyl/7EEDaAxkCoVDGvkhJkQ +ZS89f1hkHJHYnTEKXgOAMKKsVN0JzZGsHjWqJCT5AudyD8jUzg3/HQWPN8WtVWgpOl0 yCkcORgMpVhglQGN4hBSoMEmpcqVEDkMEFeb5LA6E+a7DEvduAu47BRQae4xQHJhy1lX F/hy4nacB6PvG5FbTCYedyYIAl4SQKYDAoOuf7Uv6hP4VjwylDgMfPGrHqmx2ZGY5ogq CODg== X-Gm-Message-State: AOAM533OoGg3zc2EBLkQyy86qByNgnZ29MGvSgGMlHlheUdTCz6s5Bxp PZ793hU7A7Lo1Jz5BJKr4l1UWGnC4oIhiA== X-Received: by 2002:a62:7985:0:b0:437:36f1:d0df with SMTP id u127-20020a627985000000b0043736f1d0dfmr9000888pfc.52.1632474366861; Fri, 24 Sep 2021 02:06:06 -0700 (PDT) Received: from localhost.localdomain ([103.252.202.177]) by smtp.gmail.com with ESMTPSA id s2sm8029279pfe.215.2021.09.24.02.06.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:06:06 -0700 (PDT) From: Ho Ming Shun To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Sep 2021 17:04:36 +0800 Message-Id: <20210924090438.11954-3-cyph1984@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210924090438.11954-1-cyph1984@gmail.com> References: <20210924090438.11954-1-cyph1984@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: rIJhXwgecUfa Use spare packet allocated in DecodeSimpleContext to handle packet submission into ffmmal_add_packet. Signed-off-by: Ho Ming Shun --- libavcodec/mmaldec.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavcodec/mmaldec.c b/libavcodec/mmaldec.c index d4788b33f3..a8a568d239 100644 --- a/libavcodec/mmaldec.c +++ b/libavcodec/mmaldec.c @@ -781,10 +781,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); @@ -795,9 +797,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;