From patchwork Mon Jan 9 02:10:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Zhengxu" X-Patchwork-Id: 2134 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp6862593vsb; Sun, 8 Jan 2017 18:10:28 -0800 (PST) X-Received: by 10.28.63.150 with SMTP id m144mr3304758wma.96.1483927827990; Sun, 08 Jan 2017 18:10:27 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w142si8931999wmw.30.2017.01.08.18.10.27; Sun, 08 Jan 2017 18:10:27 -0800 (PST) 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=@gmail.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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 08F8E68A605; Mon, 9 Jan 2017 04:10:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B4D5A68A5BC for ; Mon, 9 Jan 2017 04:10:11 +0200 (EET) Received: by mail-pg0-f65.google.com with SMTP id 204so3369993pge.2 for ; Sun, 08 Jan 2017 18:10:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version; bh=8TzdKczpe30hZrbJxrlbZeTD0UheuA+tol0oXOLDFl8=; b=vE8lpLyVaMNkAdfNe3GcIVvdSCOwTgas+rBc6sUiIsh15URjVXWLPcG5T6ROOeCzIz mUetMUb11wIwz34b+s5Tb7x0Z3zkSkHxe6efnzFVwF+bLKXwlhrJfZibzuGHeNLwh0/M Dl0GcQmr04tZNw+6u23RUrp4kpX7IBX1vyylPfYhAwV91r3qv9arjrjUGPaUPVhTPprE W0rfiBQeDcLjXmLGl6z9VmbXcS7ZHAnWTQ3NouGo77ZMpy+l9EZj+Eog78W/cUCgwa3b HHYki3XDKnZqMD7PRUkdsGDWm7aOH9ePAEZLyg17fMKRD8BtE/W3ZjRCNM2fD+ejA7PD vFvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version; bh=8TzdKczpe30hZrbJxrlbZeTD0UheuA+tol0oXOLDFl8=; b=NNKo+p1HN6/uSy5ML/cZOiKOC+d9oQzX6ac0xfycUZcqdmJjFdP4WsMMiFk/vjEZjS kvkIRK62sa+uVq9rdAUbsFcaNpqJos76xXOzsfpXU5CDcR82vhzcLnQHNszPzxTOxcwR gkurBzYAD7pLdllc1Q0DdT8OxOecEJ65Zf1H00aKccPiZFJjMGqDjwZ8DaipwzoCSJ8h qqAEfaJTOMxlD0h/k+loZr8X9bGmi1TuGA+JKiNNt//MJGNOkUarVe8YgNqOYwbKnrK6 mGNOH9Kn/gWEsU608pZdnZlgVHkY6CS0qNcL6zaNnltgw7PDOwpET0gk7kVxhx7j4UsA Mpfw== X-Gm-Message-State: AIkVDXI+CQ32zvePU74F68crhkmJZTLIm+w7BLcNi6FmqmyKJcouDvYrEJr399CsPgMhow== X-Received: by 10.84.174.129 with SMTP id r1mr192228493plb.19.1483927816983; Sun, 08 Jan 2017 18:10:16 -0800 (PST) Received: from [10.239.205.12] (fmdmzpr01-ext.fm.intel.com. [192.55.54.36]) by smtp.gmail.com with ESMTPSA id q7sm114702986pgn.20.2017.01.08.18.10.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Jan 2017 18:10:16 -0800 (PST) To: sw@jkqxz.net, huazh407@gmail.com, chaox.a.liu@gmail.com, FFmpeg development discussions and patches From: "Huang, Zhengxu" Message-ID: Date: Mon, 9 Jan 2017 10:10:13 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] libavcodec/qsvenc: Fix the encode part hwaccle issue when using system memory 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 256dd95eded93894c01e67648eec41d05e35d64e Mon Sep 17 00:00:00 2001 From: Zhengxu Date: Mon, 19 Dec 2016 03:39:39 -0500 Subject: [PATCH 2/2] libavcodec/qsvenc: Fix the encode part hwaccle issue when using system memory Description: when using system memory the encode actually uses the PARTIAL_ACCELERATION which means the SW encoder of MSDK. And the performance will quite poor compared with the HW MSDK. eg: ./ffmpeg -c:v h264 -i in -c:v h264_qsv output.h264 Fix: Use the HWContext to get the vaDisplay and configure the encode to HW mode. The performance will be improved significantly Signed-off-by: ChaoX A Liu Signed-off-by: Huang, Zhengxu Signed-off-by: Andrew, Zhang --- libavcodec/qsvenc.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++-- libavcodec/qsvenc.h | 2 +- 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index ac443c1..1ce2c3c 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -651,6 +651,56 @@ static int qsv_init_opaque_alloc(AVCodecContext *avctx, QSVEncContext *q) return 0; } +static int qsv_init_internal_session(AVCodecContext *avctx, mfxSession *session, + QSVEncContext *q, const char *load_plugins) +{ + mfxIMPL impl = MFX_IMPL_AUTO_ANY; + const char *desc; + int ret; + AVHWDeviceContext *device_hw; + AVQSVDeviceContext *hwctx; + AVBufferRef *hw_device_ctx; + + ret = av_hwdevice_ctx_create(&hw_device_ctx, AV_HWDEVICE_TYPE_QSV, NULL, NULL, 0); + if (ret < 0) { + av_log(NULL, AV_LOG_ERROR, "Failed to create a QSV device\n"); + return ret; + } + device_hw = (AVHWDeviceContext*)hw_device_ctx->data; + hwctx = device_hw->hwctx; + + *session = hwctx->session; + + q->device_ctx.hw_device_ctx = hw_device_ctx; + + ret = ff_qsv_load_plugins(*session, load_plugins, avctx); + if (ret < 0) { + av_log(avctx, AV_LOG_ERROR, "Error loading plugins\n"); + return ret; + } + MFXQueryIMPL(*session, &impl); + + switch (MFX_IMPL_BASETYPE(impl)) { + case MFX_IMPL_SOFTWARE: + desc = "software"; + break; + case MFX_IMPL_HARDWARE: + case MFX_IMPL_HARDWARE2: + case MFX_IMPL_HARDWARE3: + case MFX_IMPL_HARDWARE4: + desc = "hardware accelerated"; + break; + default: + desc = "unknown"; + } + + av_log(avctx, AV_LOG_VERBOSE, + "Initialized an internal MFX session using %s implementation\n", + desc); + + return 0; +} + static int qsvenc_init_session(AVCodecContext *avctx, QSVEncContext *q) { int ret; @@ -673,12 +723,12 @@ static int qsvenc_init_session(AVCodecContext *avctx, QSVEncContext *q) q->session = q->internal_session; } else { - ret = ff_qsv_init_internal_session(avctx, &q->internal_session, + ret = qsv_init_internal_session(avctx, &q->session, q, q->load_plugins); if (ret < 0) return ret; - q->session = q->internal_session; + // q->session = q->internal_session; } return 0; @@ -1088,6 +1138,7 @@ int ff_qsv_enc_close(AVCodecContext *avctx, QSVEncContext *q) q->internal_session = NULL; av_buffer_unref(&q->frames_ctx.hw_frames_ctx); + av_buffer_unref(&q->device_ctx.hw_device_ctx); av_freep(&q->frames_ctx.mids); q->frames_ctx.nb_mids = 0; diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index 361d933..d377ea4 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -105,7 +105,7 @@ typedef struct QSVEncContext { AVFifoBuffer *async_fifo; QSVFramesContext frames_ctx; - + QSVDeviceContext device_ctx; // options set by the caller int async_depth; int idr_interval;