From patchwork Sat Oct 6 06:21:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Landgraph X-Patchwork-Id: 10616 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:ab0:73d2:0:0:0:0:0 with SMTP id m18csp4315414uaq; Mon, 8 Oct 2018 18:50:27 -0700 (PDT) X-Google-Smtp-Source: ACcGV6026oIlRFnVdVgY7CNloNhPYk3cmqevURtblikKwS+UJkM9mt2bBnZ6mOvI6AdRdr47cBwl X-Received: by 2002:a5d:4791:: with SMTP id w17-v6mr19591097wrq.319.1539049827776; Mon, 08 Oct 2018 18:50:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539049827; cv=none; d=google.com; s=arc-20160816; b=wWZjXC9nXOM1E15ng/iv0/MkU0Mh5OfnF4E1yRmF31VoJbnfVy1gEwcusq4mVUytys ebZt1VxKKEwN9FYhm9boXN5CwrXffX1T79m49UvY5JWF7AdPoWVvbLpggxNq0I1thtiO sfDPOttYJBhaS1g5JJLaKuYKS8feB1PBU0S61HFTriu90dG3PwjSOodLyRHmSzPDtaBw CCRnf+vgWdqM46ytGkiu52ARllwNiG+xzbclazvQf0L1Hk4ofL+Z2aApXeY5Kvdi1WiD kUnoQpcUyTnfqfgKNHqefz689rmLmGrCbP6aJe3W773NChzqsiQlPWCwWmCpoLOwWOmt S0/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:content-language:mime-version:user-agent:date :message-id:to:from:delivered-to; bh=2sr2eKXoWMcsdbrlzTAjl6d6rdTiUZXwcGXXuZtRpLs=; b=cyy4IGwGdXgL8bYI5JCc7Tnd91S16RRxfUL2PUWWyYxCTMLR6EUIlJHzPvMiMyImjP R3pyG3Klq/4UWkVG22zf14Wvz3+bHER0ojkpwcNp7PxdFw0XmJnr5lD83vYiNHMOK7zV tA0zrqc+MCo1bYJZ/sfQN37MTSI7CWVi/ntjymKpyFpUqSqj810Zg8iXSa6isn66o2zu eLlwxT3IAB95T+KX6ENHsscg6pl22Ra6aD8w5ntIgnoWxhMt2v8xEO3/dbmA+RmuItW2 xVkhaWVNXVV0Mdd1tZzK0M/o/+daRgFBBGfQdk5f+uWQJpOTB6M0KUShC4rN5U4sZVdr tuDQ== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a9-v6si14249581wrv.187.2018.10.08.18.50.27; Mon, 08 Oct 2018 18:50:27 -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; 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 3B87C68A1DB; Tue, 9 Oct 2018 04:49:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from forward106o.mail.yandex.net (forward106o.mail.yandex.net [37.140.190.187]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9642F689720 for ; Sat, 6 Oct 2018 09:21:14 +0300 (EEST) Received: from mxback5o.mail.yandex.net (mxback5o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1f]) by forward106o.mail.yandex.net (Yandex) with ESMTP id 1DF03781477 for ; Sat, 6 Oct 2018 09:21:34 +0300 (MSK) Received: from smtp4p.mail.yandex.net (smtp4p.mail.yandex.net [2a02:6b8:0:1402::15:6]) by mxback5o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id xiOmlGp2N7-LYNKxsBY; Sat, 06 Oct 2018 09:21:34 +0300 Received: by smtp4p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id hLLsTQ8yjm-LXOSFbbJ; Sat, 06 Oct 2018 09:21:33 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client certificate not present) From: Landgraph To: ffmpeg-devel@ffmpeg.org Message-ID: Date: Sat, 6 Oct 2018 09:21:31 +0300 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 Content-Language: ru X-Mailman-Approved-At: Tue, 09 Oct 2018 04:49:58 +0300 Subject: [FFmpeg-devel] [PATCH] libavcodec/qsvenc_hevc: correction for QSV HEVC default plugin selection on Windows 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" 1. Old logic meaned: everywhere, except Windows, ffmpeg has to use HW acceleration, but on Windows ffmpeg has to use (unavailable) software encode by default 2. Software encode is available only if you provide corresponding software MediaSDK library, which isn't provided with ffmpeg. More information could be found in https://github.com/Intel-Media-SDK/MediaSDK/blob/master/doc/samples/readme-encode_linux.pdf 3. HW encode is available on Windows in the driver by default ---  libavcodec/qsvenc_hevc.c | 4 ----  1 file changed, 4 deletions(-) diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c index 4339b316a3..e7ca27d49f 100644 --- a/libavcodec/qsvenc_hevc.c +++ b/libavcodec/qsvenc_hevc.c @@ -217,11 +217,7 @@ static av_cold int qsv_enc_close(AVCodecContext *avctx)      return ff_qsv_enc_close(avctx, &q->qsv);  } -#if defined(_WIN32) -#define LOAD_PLUGIN_DEFAULT LOAD_PLUGIN_HEVC_SW -#else  #define LOAD_PLUGIN_DEFAULT LOAD_PLUGIN_HEVC_HW -#endif  #define OFFSET(x) offsetof(QSVHEVCEncContext, x)  #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM