From patchwork Tue Dec 1 22:42:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: galinart X-Patchwork-Id: 24230 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 D59AB44BB86 for ; Wed, 2 Dec 2020 00:51:11 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B69106897E3; Wed, 2 Dec 2020 00:51:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 25C136881B6 for ; Wed, 2 Dec 2020 00:51:05 +0200 (EET) Received: by mail-wm1-f50.google.com with SMTP id k10so8444375wmi.3 for ; Tue, 01 Dec 2020 14:51:05 -0800 (PST) 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=ryTH8WCkp22YJTjFtrVI9csCXkyBKeGgMH8Ru/R43Bs=; b=b7PowjviAmk9nZKBVY08Wa09g1mprTG5ngt7ppTNNIDTAFqt078WnE/yYeqW3wm1FQ mGVtjw3rGa8zoJBXHMhNsBrpsNl5WCvPO/57n73MeBsYaq2Niaj2tLZY/LmSUGK5gsWQ 4DDBzEEOCeKQ75X9eTVpTSX24iq6qUU/9umTp2OCj69UiCdUbLfmmGsgUcQbRt3ENO/O lSW0RM2+dI/RIlyKcUjzm2LlRHgWQsp5CgGelaD4Yrs+WeXddpeTP8JtLDo6nmgtKxdU qO0SsA6E1pURL4KMgw4U28dPVaHW6w2eBeq3hEsd3ZFO27Hl9HLDknwUSsdV5e7NBJaL 2LSQ== 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=ryTH8WCkp22YJTjFtrVI9csCXkyBKeGgMH8Ru/R43Bs=; b=UWFlNx/KlDvKUjZ6SA1qwU8InfN65aD+Y4UJfyU6tMJve2EejXsp6a71yBEmu/11mv LTQjW4Wx9mr0I4WLZe3vZKJG/+IHtI9pKtMfRojsHt3bJ5Ly/pfJYCSafWMwOb1ycx64 R891ZVmziOrlavFMSitk3N19vfH4fHlAPNZ1xKtvotjjrjQdfs5tiPvyuNarq0BEVAp8 MEBw+4H6+TstXY1E2NxvOLsZcdH3jEB2tKuKTsI4H7vNlCwld6CvD5kUmhACb3kgBKZi npdaw0kKoTbO3pCW5KysNOl6oN97TVB4yCzsnnYaijq/LHg0ROtI42vQMlK3hDdD69+s 67rw== X-Gm-Message-State: AOAM531o2jfPLg0Z08HY+Zkhp0pTV+Ay4CmGHk30jHQlvJgg9M12cPiZ SG2WXT3yQcipsXEowD++sFeSldHwCUfdP9l7 X-Google-Smtp-Source: ABdhPJzd6FZTRJfTfCFWdW6UI4nL5XyyXnE0FBJlJV6/MsJNOyExnHMPkEvqXaNxmmBUFxEs1gaTQQ== X-Received: by 2002:a1c:4684:: with SMTP id t126mr3883457wma.165.1606862559395; Tue, 01 Dec 2020 14:42:39 -0800 (PST) Received: from localhost.localdomain ([2a02:c7f:3015:4e00:410d:9860:8e11:8265]) by smtp.googlemail.com with ESMTPSA id z22sm1682375wml.1.2020.12.01.14.42.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Dec 2020 14:42:39 -0800 (PST) From: Artem Galin X-Google-Original-From: Artem Galin To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Dec 2020 22:42:18 +0000 Message-Id: <20201201224218.19896-1-artem.galin@intel.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavf/qsv_scale: add interpolation methods support 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: Artem Galin Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Since 1.33 API version https://github.com/Intel-Media-SDK/MediaSDK/blob/master/api/include/mfxstructures.h#L2088 Signed-off-by: Artem Galin --- libavfilter/vf_scale_qsv.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/libavfilter/vf_scale_qsv.c b/libavfilter/vf_scale_qsv.c index 5064dcbb60..1a6121c295 100644 --- a/libavfilter/vf_scale_qsv.c +++ b/libavfilter/vf_scale_qsv.c @@ -70,6 +70,7 @@ enum var_name { }; #define QSV_HAVE_SCALING_CONFIG QSV_VERSION_ATLEAST(1, 19) +#define QSV_HAVE_INTERPOLATION_METHOD QSV_VERSION_ATLEAST(1, 33) typedef struct QSVScaleContext { const AVClass *class; @@ -95,6 +96,7 @@ typedef struct QSVScaleContext { mfxExtVPPScaling scale_conf; #endif int mode; + int interpmethod; mfxExtBuffer *ext_buffers[1 + QSV_HAVE_SCALING_CONFIG]; int num_ext_buf; @@ -409,6 +411,10 @@ static int init_out_session(AVFilterContext *ctx) s->scale_conf.Header.BufferId = MFX_EXTBUFF_VPP_SCALING; s->scale_conf.Header.BufferSz = sizeof(mfxExtVPPScaling); s->scale_conf.ScalingMode = s->mode; +#if QSV_HAVE_INTERPOLATION_METHOD + s->scale_conf.InterpolationMethod = s->interpmethod; + av_log(ctx, AV_LOG_VERBOSE, "Interpolation method: %d\n", s->interpmethod); +#endif s->ext_buffers[s->num_ext_buf++] = (mfxExtBuffer*)&s->scale_conf; av_log(ctx, AV_LOG_VERBOSE, "Scaling mode: %d\n", s->mode); #endif @@ -624,6 +630,17 @@ static const AVOption options[] = { { "low_power", "", 0, AV_OPT_TYPE_CONST, { .i64 = 1}, 0, 0, FLAGS, "mode"}, { "hq", "", 0, AV_OPT_TYPE_CONST, { .i64 = 2}, 0, 0, FLAGS, "mode"}, #endif +#if QSV_HAVE_INTERPOLATION_METHOD + { "interpmethod", "set interpolation method", OFFSET(interpmethod), AV_OPT_TYPE_INT, { .i64 = MFX_INTERPOLATION_DEFAULT}, MFX_INTERPOLATION_DEFAULT, MFX_INTERPOLATION_ADVANCED, FLAGS, "interpmethod"}, + { "nearest", "nearest neighbor method", 0, AV_OPT_TYPE_CONST, { .i64 = MFX_INTERPOLATION_NEAREST_NEIGHBOR}, INT_MIN, INT_MAX, FLAGS, "interpmethod"}, + { "bilinear", "bilinear method", 0, AV_OPT_TYPE_CONST, { .i64 = MFX_INTERPOLATION_BILINEAR}, INT_MIN, INT_MAX, FLAGS, "interpmethod"}, + { "advanced", "advanced method", 0, AV_OPT_TYPE_CONST, { .i64 = MFX_INTERPOLATION_ADVANCED}, INT_MIN, INT_MAX, FLAGS, "interpmethod"}, +#else + { "interpmethod", "(not supported)", OFFSET(interpmethod), AV_OPT_TYPE_INT, { .i64 = 0}, 0, INT_MAX, FLAGS, "interpmethod"}, + { "nearest", "", 0, AV_OPT_TYPE_CONST, { .i64 = 1}, 0, 0, FLAGS, "interpmethod"}, + { "bilinear", "", 0, AV_OPT_TYPE_CONST, { .i64 = 2}, 0, 0, FLAGS, "interpmethod"}, + { "advanced", "", 0, AV_OPT_TYPE_CONST, { .i64 = 3}, 0, 0, FLAGS, "interpmethod"}, +#endif { NULL }, };