From patchwork Wed Apr 24 07:59:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Bouron X-Patchwork-Id: 12887 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id E3AE54495B5 for ; Wed, 24 Apr 2019 10:59:42 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D184768A646; Wed, 24 Apr 2019 10:59:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BCA40680280 for ; Wed, 24 Apr 2019 10:59:35 +0300 (EEST) Received: by mail-wm1-f53.google.com with SMTP id v14so3600859wmf.2 for ; Wed, 24 Apr 2019 00:59:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=42mZAQbKr8a4ZUMlVa8n0QEm+hikKyLsjEoHC6jeYX8=; b=LXO7JV9iF94wzyFR8nK2tvEapHwA6tz5C04HLzk2hCotSsBtIil9O8nPl/gIGNm9E1 E03Ji7GgoTbcTVb8DpDfOB0sXKyxhKLNxDGfRzPm/j0+lqgJTHu0mBu29OLNaDFQA5Pi +oOh/k2PBBE8KSO4eu2WcfVgC1CJB79NFVCii1itLIJiIgORM/v2LBG5bvtslKMbzoig rVrSm7Ruolj02BeJWxO6H8xCoNRXTrdlcGZ0w84fCMdcINE47vZfhwrtdkRZUQpGdKyX 2CxRvuxoiPVar8S5KZffXYgDjSk/FSADl8DqnEAY2mDljcmdu+sUkjTG7fpQPTzAUfXH y09A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=42mZAQbKr8a4ZUMlVa8n0QEm+hikKyLsjEoHC6jeYX8=; b=ZcVZ5/dmx8ZGOG+Beq+0jNo5W8OmxkfhFCEEQTWmrbGE29MbtTlmJqoTvTWssaCDEt t3V51bcYlIj6B/sal8ceA2ML9do8p5+sxE0tka0ZwDUiXhir2do+xdC1ehZi4YBFm1kT 1CYhsOvAJ0wCtVZ1dI725KKQtqTrGQIj2d6FfM1bf6U/d7wU/PHIg9rm6ZgnyjBBoJ3E 6l8SoZHd+kUMTTrBATcaDJjfv1gl+oEZxgW3AbOCrOgYXBXu5LAXY9icQ3xghmaH7sRc 8dcDJtEJXHPu6Z5IcE7hoGAfJeNmUq/B36LTEqikzU411nopTZXhjuYiiQ5CcuUQSt40 no4A== X-Gm-Message-State: APjAAAXQgC7TS7vcKyxWFn1DKx/c7KlKWv6OAMcYa6FkTubUh6FPRTg6 kHIh3Vu/o7njTLW3p0AjBgDcmNji X-Google-Smtp-Source: APXvYqyHbO5MRfrhqCqTj99m99nZQtDvGfBsmCKvYpw7JaCDQVqQGA/Rbtj7FBA9mtnF9XibrLErGg== X-Received: by 2002:a1c:9691:: with SMTP id y139mr5048125wmd.64.1556092775039; Wed, 24 Apr 2019 00:59:35 -0700 (PDT) Received: from kusa.lan (lfbn-idf2-1-381-242.w82-123.abo.wanadoo.fr. [82.123.96.242]) by smtp.gmail.com with ESMTPSA id f10sm18111221wrs.17.2019.04.24.00.59.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Apr 2019 00:59:34 -0700 (PDT) From: Matthieu Bouron To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Apr 2019 09:59:29 +0200 Message-Id: <20190424075930.16157-2-matthieu.bouron@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190424075930.16157-1-matthieu.bouron@gmail.com> References: <20190424075930.16157-1-matthieu.bouron@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/mediacodecdec: remove unneeded else block in ff_mediacodec_dec_send() 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 Cc: Matthieu Bouron Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/mediacodecdec_common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/mediacodecdec_common.c b/libavcodec/mediacodecdec_common.c index f7a06cdc6d..f90e2f1a23 100644 --- a/libavcodec/mediacodecdec_common.c +++ b/libavcodec/mediacodecdec_common.c @@ -632,7 +632,8 @@ int ff_mediacodec_dec_send(AVCodecContext *avctx, MediaCodecDecContext *s, s->draining = 1; return 0; - } else { + } + size = FFMIN(pkt->size - offset, size); memcpy(data, pkt->data + offset, size); offset += size; @@ -645,7 +646,6 @@ int ff_mediacodec_dec_send(AVCodecContext *avctx, MediaCodecDecContext *s, av_log(avctx, AV_LOG_TRACE, "Queued input buffer %zd size=%zd ts=%"PRIi64"\n", index, size, pts); - } } if (offset == 0)