From patchwork Thu Nov 3 19:55:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 1275 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp970700vsb; Thu, 3 Nov 2016 13:02:13 -0700 (PDT) X-Received: by 10.194.36.70 with SMTP id o6mr8724121wjj.45.1478203333828; Thu, 03 Nov 2016 13:02:13 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u6si10768259wjc.228.2016.11.03.13.02.12; Thu, 03 Nov 2016 13:02:13 -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=@jkqxz-net.20150623.gappssmtp.com; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 78781689DED; Thu, 3 Nov 2016 22:02:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com [74.125.82.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 27690689DD0 for ; Thu, 3 Nov 2016 22:02:01 +0200 (EET) Received: by mail-wm0-f42.google.com with SMTP id a197so9384027wmd.0 for ; Thu, 03 Nov 2016 13:02:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=to:from:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=1GDEsfu/Cfa6ne4XWEyroKgewM/hBNs4P8HkzTGnfsc=; b=eNKD+ZJh7nyNsk0AatII7gHIWhyT/EopOWcJKAdxlhnou+91M/GLK/HOGPeqyqxkez jRj7FJ8AjloFMBCvgriakif2kHN42uZ8CFYYox0mHdYpnUHt7mVjk8mgNp0wITyYVREK 3J99hCLAcHq0bO7TFzLWHP8EQ4DRqjsbwM1E9rWhgHDBCG6a4VqkwmTD4f9W8qwgzzVT IrueUAdyDCLW4YzfBN921rmFiU9gWoDx22cWAashn+VYpsGO/eFD+SaHj2pXKhoHvJSA /26WdNn2Z9qK7YvMPZny4LNlW25XvR5HI3lTYrCREDNO0BufbnbdOupinLjYqbjoaLOq UC2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=1GDEsfu/Cfa6ne4XWEyroKgewM/hBNs4P8HkzTGnfsc=; b=h57Wq3Qcdn0PqZL2L0Y09ivEulyh9ED894QVjV8nRh19sK0F7ab9W7Uv2u8Wm8UYmU anxi+iBQ4RS0r9nD5pvzw2QyHm8PixxzaEOVThHlp2hrdJHBRFhDlKKrJWbnGTUpgQFl DgtX59K0Da6mAI6zHjDjEMVPrbREAeYN92OEFGWqRRTTYB5DB6g/DhBY2BMhxOSi8Rkc RuXsijWsn4rhlBF3JLWB2HkYg8uAJut5dE1rCoRwIwB0Nb5rEACQDMhL4VVAAEVVd7qd k2mZ5ToBtWwg6AZ39ZnHCLOtD+Pvnav/jGM1xwAlcg/a+amhfsJM6hZGwbhoGn5AIXS2 rHdw== X-Gm-Message-State: ABUngvfRCTcfIM66CC22UFfW9aZwObUm8vu74nonn7g9HIC+D8lka6ajkL4wY9oUu54SRA== X-Received: by 10.194.146.131 with SMTP id tc3mr4707047wjb.129.1478202906927; Thu, 03 Nov 2016 12:55:06 -0700 (PDT) Received: from [192.168.0.7] (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id vr9sm4455336wjc.35.2016.11.03.12.55.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 Nov 2016 12:55:06 -0700 (PDT) To: FFmpeg development discussions and patches From: Mark Thompson Message-ID: Date: Thu, 3 Nov 2016 19:55:05 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] qsvenc: do not re-execute encoding on all positive status codes 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Anton Khirnov It should only be done for DEVICE_BUSY/IN_EXECUTION (cherry picked from commit 0956fd460681e8ccbdae19f135f0d3970bf95c2f) Fixes ticket #5924. --- libavcodec/qsvenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 7445d5b..ac443c1 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -982,7 +982,7 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q, ret = MFXVideoENCODE_EncodeFrameAsync(q->session, enc_ctrl, surf, bs, sync); if (ret == MFX_WRN_DEVICE_BUSY) av_usleep(500); - } while (ret > 0); + } while (ret == MFX_WRN_DEVICE_BUSY || ret == MFX_WRN_IN_EXECUTION); if (ret < 0) { av_packet_unref(&new_pkt);