From patchwork Fri May 4 22:11:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhong Li X-Patchwork-Id: 8773 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp256529jad; Thu, 3 May 2018 23:12:49 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqWNSVa9nh87SzTV2xhNMh1u7lfutnFdbHOdOT6ifrnV7pm5NYHD702aKR8+6Uzp489oGx4 X-Received: by 10.28.173.198 with SMTP id w189mr15390609wme.15.1525414369356; Thu, 03 May 2018 23:12:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525414369; cv=none; d=google.com; s=arc-20160816; b=QRoAaEiv6Cf4P8oNKFjVeSoHhTrW20MaWMu6YNesrhLSA9zTm+K0JCwiYA2HzWQ7PT D38/Ig/yuOfY4093zTUFM9yeySzs9/yjJaWReM8EfcqWVleF9gNPgdi2qCQX4CbcvvYA RpUuZMlaHF0wZrQ4q7f62DH+4JcDQ4dLBBf3w0Xj1Ma6bYcHovKJ8mME8iJSOtvgEhes wG1/e5UqpwL/8N1L8xyAVMBFZwRSnoiUPuELeUuRjxcySkVOEW7Rv33pYvVTV6a1UdPT 0q1jTMG7qJ5yzVCOYX24Tx0cxnK1mKwrVNzccmINmjlD0GuBVcewh1E20yoqPsdAkskP zsHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=70bY2XtEPcDYQYtN8DfSWGe815XI7CB6ROcJ4gWF/Rk=; b=uwXqUYueaKpYQBkqjf3C3sPGel1dmRADEXqB2T04gvd0w/axLq58U7mSUc6VkI2bno oQiUTnTz5sDansGWZLbm16AaSfaQY9htUFpOFE0ka8alfHDepPMs0M6n1sBh/E38m6SX 5mOlxOOOBV9w3caJw7xPpYpTFzVrC7ZaojiAHeI6pFWPQZb820FFAQYbbkRZP3A7iUJh w3glBmXkvl/Z2P9j9YjjgeRkhr0cC6fijHgekaJ6U2nhSj664+KtaUHTZgc1w0iiTnXU D9uoWbT6kMFeWfDvaOo21VOp2bHxuKh70L39xq13sV+v3WNsAvaoCjYYkaIsv+xFNNdB Xbuw== 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 k50-v6si13669861wrk.294.2018.05.03.23.12.48; Thu, 03 May 2018 23:12:49 -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 00C0068A4F2; Fri, 4 May 2018 09:12:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 656D368A4F2 for ; Fri, 4 May 2018 09:12:02 +0300 (EEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 May 2018 23:12:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,361,1520924400"; d="scan'208";a="196643843" Received: from media_ffmpeg_skl_e3.sh.intel.com ([10.239.156.42]) by orsmga004.jf.intel.com with ESMTP; 03 May 2018 23:12:27 -0700 From: Zhong Li To: ffmpeg-devel@ffmpeg.org Date: Sat, 5 May 2018 06:11:40 +0800 Message-Id: <1525471900-3645-2-git-send-email-zhong.li@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1525471900-3645-1-git-send-email-zhong.li@intel.com> References: <1525471900-3645-1-git-send-email-zhong.li@intel.com> Subject: [FFmpeg-devel] [PATCH 2/2] lavc/qsvenc: add mf_max_num option for MFE 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: Zhong Li MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Maximum number of frames to be used for combining. Each encoder in joined sessions has to be initialized with the same value. Signed-off-by: Zhong Li --- libavcodec/qsvenc.c | 1 + libavcodec/qsvenc.h | 1 + libavcodec/qsvenc_h264.c | 2 ++ 3 files changed, 4 insertions(+) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 3ce5ffe..e58fdc2 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -661,6 +661,7 @@ FF_ENABLE_DEPRECATION_WARNINGS q->extmfp.Header.BufferSz = sizeof(q->extmfp); q->extmfp.MFMode = q->mfmode; + q->extmfp.MaxNumFrames = q->mf_max_num; av_log(avctx,AV_LOG_VERBOSE,"MFMode:%d\n", q->extmfp.MFMode); q->extparam_internal[q->nb_extparam_internal++] = (mfxExtBuffer *)&q->extmfp; } diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index d482722..76c8106 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -166,6 +166,7 @@ typedef struct QSVEncContext { #if QSV_HAVE_MF int mfmode; + int mf_max_num; #endif char *load_plugins; SetEncodeCtrlCB *set_encode_ctrl_cb; diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c index 5278a04..bee10b2 100644 --- a/libavcodec/qsvenc_h264.c +++ b/libavcodec/qsvenc_h264.c @@ -151,6 +151,8 @@ static const AVOption options[] = { { "off" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_MF_DISABLED }, INT_MIN, INT_MAX, VE, "mfmode" }, { "auto" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_MF_AUTO }, INT_MIN, INT_MAX, VE, "mfmode" }, { "manual" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_MF_MANUAL }, INT_MIN, INT_MAX, VE, "mfmode" }, + + { "mf_max_num", "Maximum frame number of Multi-Frame encoding", OFFSET(qsv.mf_max_num), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 3, VE}, #endif { NULL },