From patchwork Wed Apr 17 04:37:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 48094 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ce4e:b0:1a9:af23:56c1 with SMTP id id14csp776447pzb; Tue, 16 Apr 2024 21:38:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUynl5Uat9N9X96EBGXYw4L/Lw3CKMkDqrqmNSfikMHaLiMCrCcw6/eJqnHpeCt0wS0q99oyFlGZ1tehTdFOA+/HnIYFNVPLdntxQ== X-Google-Smtp-Source: AGHT+IF+5jdVlDub25DjOqhluGcGQxGbqXE2x57RnZxJCFauIDB35YWIAj+bamOph+mtpNo33YRM X-Received: by 2002:a05:6512:3a90:b0:516:d0c0:3c5 with SMTP id q16-20020a0565123a9000b00516d0c003c5mr11576568lfu.24.1713328705837; Tue, 16 Apr 2024 21:38:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713328705; cv=none; d=google.com; s=arc-20160816; b=q4Vgld1P6vmoR8EiTEJdm9GgYkHePI30C+CERpZXn9qgu7JagGTN2UadqAX+Aau+OT hNEt5J4Jjq8DN0BrY0k3xm4v+Gb3sCUE2axzl/XeISYhW+X6oY/9mV+2DumH/WrA15hx IQjcRC7HK/NzOe2NIWxv0eyzXF/qOHvWPJRZLajnOYxJ78UJgMRKYpvvau3hhY6C+rVf I9/gmGFV2UKI0laUzH1VM5SDRlTYSOc+wUGZEYK7ttGJAq9hbj+GUpjqns2YsY1wch4k CnonIQzhDKZOqkTs0AvxJ4/WtA4YbvqzOmt15I7G9qB1SxtgWHsfmafjWCArZSzObd3P 542w== 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:date :to:from:message-id:dkim-signature:delivered-to; bh=a0DVtuOcQThAML+k/fkIPA5i2WDkHSpu5LFlQtHdAGI=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=ViwQQ695z6mBsLZnzhbfmGizYlwXsMsrCZiiS5MX/oejyzHnxtg/zv2FR5sSMJyzNV 6Cb8xLgw40kGeYwFRRIXIOIuQVYfZXcBLpucO9ViBBNtQ2nT8TXeHseWJINPQGgbLu/X RjbzvpO70YvvP30vMdEhc+q4BxxtgbOejsLI1R3A3thL8LGYqaPuJLXU22wyW45K2DSz +oe40XDJNE1j2ke9j3W3XkrAV9ZCZU9CvFSX9kR9MOoOjFJo1lAW79bXL9DS+n0lS/bQ MoBUtcZVOfEQlvIbOoTWaQ6Ys7Zixi+RHVh4IwSmydG+mMgYQn0M0ydiB5PSeCYdJmRL 5Slg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=kcp+BLig; 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=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h34-20020a0564020ea200b0056baf460f94si6666116eda.635.2024.04.16.21.38.25; Tue, 16 Apr 2024 21:38:25 -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=@foxmail.com header.s=s201512 header.b=kcp+BLig; 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=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 18F7568CFAA; Wed, 17 Apr 2024 07:38:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-191.mail.qq.com (out203-205-221-191.mail.qq.com [203.205.221.191]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 734BC68CFE3 for ; Wed, 17 Apr 2024 07:37:53 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1713328665; bh=gJcVhda39ELjr3QZyoR+jl9mrZGWzn3k2G5Ud524EWE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=kcp+BLig8mwbaPLHYphL/czWyWmxZPxC4JnnsWP4dE6b4o1PbYfFAb7aw0xg/+ryG KBv6e/o+dfwEq5l052N89ZHc1V0LgysS/UvqeWoqwxl/NQP5ZQq9FvEacz4sLGqkNt 2P0Q+oQyyvDPoivG3nkuk15dpa543M2rOK7hCIxw= Received: from localhost.localdomain ([119.147.10.204]) by newxmesmtplogicsvrsza30-0.qq.com (NewEsmtp) with SMTP id 96A0DC1B; Wed, 17 Apr 2024 12:37:42 +0800 X-QQ-mid: xmsmtpt1713328664tpymmwdms Message-ID: X-QQ-XMAILINFO: NfHsM/dq2nWIrqcLrdSf3+aaRKCIyE9W0HihdOjoXuxgwf7tSvOLn/q2PiC37W g6xmtxIB+dnjvGeUfY7btDfwUkf6tIXU/5Wh3K8tvYm0OOsVs4cPv+0FZMRukRPQfu9lqHbsNAON 79Q1CYDzqOmAMPhYS1eDpwr2qYupaUPl3Sb/JsqwU7/9YlDIsmHpCp+C7qf1zB0VzeBMM1mp375N uaJUq7nasEqMpHfDVsYPDlvLcv6MO9DlWBUIFXJAZDEMoNrHVvUh3sT5to5tEff1ra0uyhLFuWiy og8/mbuNEePiw8YrgXmLEco9m8YPiPhfwCZgrlRbR4GMsKpthTeiTIEJOlNclAZuizdhE870L5m6 ifpUK9ZL5nM5cN+YajSQTxQa+nRzIUFtwshQwxPsO5pubtbiw5CAD2O3OlMQzZXhGGicHVeTBC3L obeUmvW2A0uLx+by5XTwl6xfSzjbJGJg2VLIZfve6WxteBfcFjeF7XS6oE+zJU8jn6TfcTqWJFSW guIS6rotWN1rQVEhxpRNbS7Hp0DWjD1YTbrfvoZEghX3C5sWcp2OMINabuCokfuSkCdZuNjTIzwa 71Eo1YizJZvx46pzPBTuwgZTqO2o4lJNd9Mydp5mbfkGFhsXuLy10nXdhcfszThrvjTe/sRRsnbt 0GSrpijFp5bVQEnKQKYghgkXVwq8C6hH6D7sfeLBxx9t+V8Q5AxplFwbRbQKu1UpAXVajdj+kxBi xFXCpSXCC/+5A4jufvq4EJQaBOjM+UndqtN8FvdpPP6P7F+O99geUMI2g0HFIog7oUi3DFcle3LY T0cON3bQ0lXWkPvcQr6I5sm4pizUOZ1QH/tAmPp3/cZ/5rVJ7ylkS67hJmjJQt7tukpuvlglwqQA Frpp2iMYTsy17FIUjLWwY6re3wpv23QrpN5CnrsVWzRjqqH2LhuF1UvsdYAZS4Y4oVb35JOpFqTI YdqJAcQapYjsaKBXV9is4QPnp6ii3FR76gQXAaPpLUbjQZH/+fymCj4bzE991tWPMJbXReslzgG7 9dcKPVbA== X-QQ-XMRINFO: MPJ6Tf5t3I/ycC2BItcBVIA= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Wed, 17 Apr 2024 12:37:39 +0800 X-OQ-MSGID: <20240417043742.505853-5-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240417043742.505853-1-quinkblack@foxmail.com> References: <20240417043742.505853-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/8] avcodec/mediacodecenc: Remove write only variable 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: XKeKJC9yBQmO From: Zhao Zhili Signed-off-by: Zhao Zhili --- libavcodec/mediacodecenc.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/libavcodec/mediacodecenc.c b/libavcodec/mediacodecenc.c index e562181120..8caaad729a 100644 --- a/libavcodec/mediacodecenc.c +++ b/libavcodec/mediacodecenc.c @@ -352,9 +352,7 @@ bailout: return ret; } -static int mediacodec_receive(AVCodecContext *avctx, - AVPacket *pkt, - int *got_packet) +static int mediacodec_receive(AVCodecContext *avctx, AVPacket *pkt) { MediaCodecEncContext *s = avctx->priv_data; FFAMediaCodec *codec = s->codec; @@ -400,7 +398,7 @@ static int mediacodec_receive(AVCodecContext *avctx, memcpy(s->extradata, out_buf + out_info.offset, out_info.size); ff_AMediaCodec_releaseOutputBuffer(codec, index, false); // try immediately - return mediacodec_receive(avctx, pkt, got_packet); + return mediacodec_receive(avctx, pkt); } ret = ff_get_encode_buffer(avctx, pkt, out_info.size + s->extradata_size, 0); @@ -419,7 +417,6 @@ static int mediacodec_receive(AVCodecContext *avctx, if (out_info.flags & ff_AMediaCodec_getBufferFlagKeyFrame(codec)) pkt->flags |= AV_PKT_FLAG_KEY; ret = 0; - *got_packet = 1; av_log(avctx, AV_LOG_TRACE, "receive packet pts %" PRId64 " dts %" PRId64 " flags %d extradata %d\n", @@ -510,7 +507,6 @@ static int mediacodec_encode(AVCodecContext *avctx, AVPacket *pkt) { MediaCodecEncContext *s = avctx->priv_data; int ret; - int got_packet = 0; // Return on three case: // 1. Serious error @@ -525,7 +521,7 @@ static int mediacodec_encode(AVCodecContext *avctx, AVPacket *pkt) return ret; } - ret = mediacodec_receive(avctx, pkt, &got_packet); + ret = mediacodec_receive(avctx, pkt); if (s->bsf) { if (!ret || ret == AVERROR_EOF) ret = av_bsf_send_packet(s->bsf, pkt);