From patchwork Fri Sep 6 13:57:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Bouron X-Patchwork-Id: 14957 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 A977E447858 for ; Fri, 6 Sep 2019 16:58:18 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 995C368803C; Fri, 6 Sep 2019 16:58:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1D05E687F42 for ; Fri, 6 Sep 2019 16:58:12 +0300 (EEST) Received: by mail-wm1-f52.google.com with SMTP id t17so6634793wmi.2 for ; Fri, 06 Sep 2019 06:58:12 -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:mime-version :content-transfer-encoding; bh=9YYCDmI214CBUdkGHtn9nCT8OumWjAv0Lhx+ZT+lxF0=; b=iGu6VXayClVgtYhBxTGPwsk9ivO1Q0rWqhMHpvcWucqQnAZMvpbvtrh9BOnGFIv28t eMsYEcYZthrMZDWVM0kxQIXmsIyndjk7mv4BJ6XeZYBz4M1RXBYpz/+5lKdk18lmzUCL My1RuHgpGrnVPrk6yy5jjQmyokq01s5v21lwMSxBPfx/oHFRMRXZh7FHwSINWIPjwEg5 NxbDzaJ5jNBxgtuXXxsHg7l91FUmElnacEO8+SxxPNxbVMK8Obj39rYpLsfJ/UeyMOVi O1gHysnKJfwh3r/ySFe+MvVeZC4DPpXAQEXNAmdbk4WeBAbISrFFc1T773LuIf//Y0wb x02g== 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:mime-version :content-transfer-encoding; bh=9YYCDmI214CBUdkGHtn9nCT8OumWjAv0Lhx+ZT+lxF0=; b=hIkJU1bM4e1OjSOdKSHxEu/VisI7kX30x2aWsHt70O9/icGaDJP0hC1quhHzJPyura VuXq96wBdEkjHPVZr4nyPi0HO8Ur1/6TQYgpA5JTIGlMlvWW1lP7nhR8Rx+p/8xt12g4 5F9Y/GqLMiBE7LL/pwTJexgn98AmU3qWKOnulUiqlQEHTkE+A0sb2eZLWL+ekDchwqJf 9yBRsSi6O/5ah3k8+6G1EhWyMG6IXe+Qu08Td62Oiu2VFovASEEvGa/O90U3lXFUdotb wwMC94Gl4MHBS9kWFnPjMFYqgW6+cCu9rfS8MQ32YW2a1uzAjuJYq8xx/vAY2WZ7Ftpv CG8w== X-Gm-Message-State: APjAAAXGC1vFJGUyz327I6jcqULOjEBZf04cHplMMyJ98zqYERDh9SB2 30cTReUOj+O2Wnies1jf0vQjw745 X-Google-Smtp-Source: APXvYqxF3NmO/pJ4xHb4DDLCDn++sD1v4GsnOAzUL/BYnZ5tDC7z3AplhbiUz/R5VFwX2k8D70i9fQ== X-Received: by 2002:a1c:7a12:: with SMTP id v18mr7209229wmc.56.1567778290589; Fri, 06 Sep 2019 06:58:10 -0700 (PDT) Received: from boken.gopro.lcl (73.136-14-84.ripe.coltfrance.com. [84.14.136.73]) by smtp.gmail.com with ESMTPSA id w1sm5899585wrm.38.2019.09.06.06.58.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Sep 2019 06:58:09 -0700 (PDT) From: Matthieu Bouron To: ffmpeg-devel@ffmpeg.org Date: Fri, 6 Sep 2019 15:57:57 +0200 Message-Id: <20190906135758.14768-1-matthieu.bouron@gmail.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/mediacodecdec_common: simplify 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 | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavcodec/mediacodecdec_common.c b/libavcodec/mediacodecdec_common.c index 1656cd6664..6c0a1212c1 100644 --- a/libavcodec/mediacodecdec_common.c +++ b/libavcodec/mediacodecdec_common.c @@ -567,7 +567,7 @@ int ff_mediacodec_dec_send(AVCodecContext *avctx, MediaCodecDecContext *s, AVPacket *pkt, bool wait) { int offset = 0; - int need_draining = 0; + int need_draining = pkt->size == 0; uint8_t *data; ssize_t index = s->current_input_buffer; size_t size; @@ -582,10 +582,6 @@ int ff_mediacodec_dec_send(AVCodecContext *avctx, MediaCodecDecContext *s, return AVERROR_EXTERNAL; } - if (pkt->size == 0) { - need_draining = 1; - } - if (s->draining && s->eos) { return AVERROR_EOF; }