From patchwork Thu May 12 11:20:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 35743 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp396180pzb; Thu, 12 May 2022 04:20:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx0aNRiHCkXQ4LSnGbAL4oc0/JPeZyBA1CnfcDPH9btGxWqpeRbQntR7/LNdzXellRnn4NZ X-Received: by 2002:a17:907:c28:b0:6f4:2a80:f355 with SMTP id ga40-20020a1709070c2800b006f42a80f355mr29042121ejc.101.1652354440235; Thu, 12 May 2022 04:20:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652354440; cv=none; d=google.com; s=arc-20160816; b=YekXP0dUtfzxkWSTVL57anC3jgRvxososaA729ugdc8wJTBSsnFLWZszcAB2IV7ub/ DknEZYIta8OLSLXolRGtQ4Kjm9hz3dMqEuFgJQfsGqamAh+wXIgSUutzhHAMBcQbAvHZ zmBuzih7I7aUKmvBrIvIIsup+XQUl2KfvA4Ihs65Swgs+/3sPcRpsu6s4jJgF/rrKp7h Zmm4sjq8VSOX0/uuOqviXS+MwYoYxrXLp4yC/aYfkGmjcM+HynooBvo+wsSeLSJG6z0+ 8aCv8yWkNaTrGStBSaXqyDH1zNLXJIYod3ZFjA62SfvANQp7YNHM61Ac9VNxw3zXrs4q IHgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=Uvwi4LwJAH9TBtUreRxoXufGavXUOiOn1aUvrLwcRyQ=; b=GdCrKi8nKbKESxCb1PgRvHf3QcmeqrnW8VasLGJbGcdZ3di5sFxWnE/n3xjHhq+Xc+ y18K9QGmQZUWXs2fJ+bAIIlomxntvCo5+FloiVHThoZbaHVVBaFv2BVxy/qVnmPQbxIr T70WlWpK4mi1uyduf9cb1CtXokBxMiBuXae49mHx++8yJrd1K6gTPRuP/BJh7WcXmalq 5oTiSq88lIlXPeSXmF7/cjvlb1N6srbAQOUmq/QL5rTMWGFLKvJcbiuSFyMxIM/LIDkd abadBH/4yYT4wHmxJAs0F5GizaWzSo7jGGRdW0vmj9ZYX1i9tqMg1fJP9DA+WmCR4hlf I5IA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=kKdz8xAY; 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=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v24-20020a50a458000000b0041962abfa3fsi5079990edb.387.2022.05.12.04.20.38; Thu, 12 May 2022 04:20:40 -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=@foxmail.com header.s=s201512 header.b=kKdz8xAY; 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=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 78E2568B451; Thu, 12 May 2022 14:20:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-49.mail.qq.com (out162-62-57-49.mail.qq.com [162.62.57.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9CAFC68B3A7 for ; Thu, 12 May 2022 14:20:28 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1652354425; bh=QvVXuQUT2xHgcqfLoQDflAAVPOiErTWvYubTmFNsEpg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=kKdz8xAYsxJt+vFumH/lG18KlUv8cEWZsGT7m/Dyo6fjsNXmjLlK0fiUaQyn5NQqZ r9VyfIoBfeqQBEJnKexp/CqaRg44pFyN5KEgDgvpxq8VWzGeCLM8ImAw0chESYCItJ G+TDywzDXFUkGoABGOmPi+JoAIDRc2AHoh+2TTYg= Received: from ZHILIZHAO-MB2.tencent.com ([113.118.102.173]) by newxmesmtplogicsvrsza9.qq.com (NewEsmtp) with SMTP id 51792C62; Thu, 12 May 2022 19:20:23 +0800 X-QQ-mid: xmsmtpt1652354423tve4olyah Message-ID: X-QQ-XMAILINFO: OaoBA5NOFC/jofILTPjK/nYEFp1HD3+ZC6Tla11K+tTKVu+v8gp25WXavdY+yv ldK2XEXr2yBG4f2PLp0UxvLT8xEwfOMwCh9TLNF10qW/jo40qN8bTDztlTkrixJQYjhp+G6p5QN9 TV2trQHHJ+UARI27PDBvGzirRfFobRjkMT0RF8pp2HzF//b0UKNVfL+fFMLU4Lr84cqmdpPO6B+m 10NB+VRGohBzX4+8evIw23sMf6GMKA0al0+aKSfzxGA8xEZyVIIkd5a5bI1D/80QD2IJb7XSi2BN XUpES9eYkV4kn93R8xnbfA0I7UyBbwSjw/TOrLCcv8HyUDt14GG44Eu3Ki1a7NrhIdlCU89/B2Sa D1m8aK8svoLsau4SO1fACqDZu2igppjbPpjZy/TJAjuQ5qogseWm2mmpo2t3J02K4W7LYN/KujcD tcUzTHIaDa8OEFEyMiYAbpvB9gbblDS6kNKHT5ZMcKv87cRAfAiXIBSRJYuLUb9ZhJ8iTACn8DWZ i037zmHxzp7uB+aK5t5aXQAQsK1KUPGTS5KnOi3tlCiJL4GgPgKK3P+AEb5YRiQhiVuZt5fdvb7z JqPYg20ARkZ0roauszzgD5lePwXEK47xjDuB90L8rn9WG9ICQSIGNCCRIB6UpAWJTw6Fg0WCaTnB jcUnzsVrSDq711BW4PhA/dm/H7uyBr8sZFWmIaLxQ2Ef6Q1rd55Ee9YalgF22I9csb8mpsblJula ZYhA9A/EgUe3q09QA95kutdCx4DGCgm0HvmCzUfmkGpiaggNeOiD4Vt3ofJ5M6/91xrkyd/GjrUF XCFtVF+jkSFwedvF9/EMKsNK+agOi7l84NMwI4lou+cdzUQWEvWTiKwC49a75jpHRw1JqnjgVmIB gqRkAGcf/iVSBEjhyKT53Das+rK7Ef8yahP5gLwN+ZhMDENvI6lnzRuE+Ib0HumzIic+IHyKS8Bs GQt35qM0fLqYCQkMxpkA== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 May 2022 19:20:22 +0800 X-OQ-MSGID: <20220512112022.72884-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] avcodec/amfenc: add query_timeout option for h264/hevc X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: 21pages , Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: q+sh6iyjGW8w From: 21pages Signed-off-by: 21pages Co-authored-by: Zhao Zhili --- v2: fix range libavcodec/amfenc.h | 1 + libavcodec/amfenc_h264.c | 4 ++++ libavcodec/amfenc_hevc.c | 4 ++++ libavcodec/version.h | 2 +- 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libavcodec/amfenc.h b/libavcodec/amfenc.h index 1ab98d2f78..e92120ea39 100644 --- a/libavcodec/amfenc.h +++ b/libavcodec/amfenc.h @@ -87,6 +87,7 @@ typedef struct AmfContext { int quality; int b_frame_delta_qp; int ref_b_frame_delta_qp; + int64_t query_timeout; // Dynamic options, can be set after Init() call diff --git a/libavcodec/amfenc_h264.c b/libavcodec/amfenc_h264.c index efb04589f6..13e2b01a0a 100644 --- a/libavcodec/amfenc_h264.c +++ b/libavcodec/amfenc_h264.c @@ -121,6 +121,7 @@ static const AVOption options[] = { { "aud", "Inserts AU Delimiter NAL unit", OFFSET(aud) ,AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { "log_to_dbg", "Enable AMF logging to debug output", OFFSET(log_to_dbg) , AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, + { "query_timeout", "Timeout for QueryOutput call in ms", OFFSET(query_timeout), AV_OPT_TYPE_INT64, { .i64 = -1 }, -1, 60000, VE }, { NULL } }; @@ -155,6 +156,9 @@ static av_cold int amf_encode_init_h264(AVCodecContext *avctx) AMF_ASSIGN_PROPERTY_RATE(res, ctx->encoder, AMF_VIDEO_ENCODER_FRAMERATE, framerate); + if (ctx->query_timeout >= 0) + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_QUERY_TIMEOUT, ctx->query_timeout); + switch (avctx->profile) { case FF_PROFILE_H264_BASELINE: profile = AMF_VIDEO_ENCODER_PROFILE_BASELINE; diff --git a/libavcodec/amfenc_hevc.c b/libavcodec/amfenc_hevc.c index 8ab9330730..e4f268ef67 100644 --- a/libavcodec/amfenc_hevc.c +++ b/libavcodec/amfenc_hevc.c @@ -89,6 +89,7 @@ static const AVOption options[] = { { "aud", "Inserts AU Delimiter NAL unit", OFFSET(aud) ,AV_OPT_TYPE_BOOL,{ .i64 = 0 }, 0, 1, VE }, { "log_to_dbg", "Enable AMF logging to debug output", OFFSET(log_to_dbg), AV_OPT_TYPE_BOOL,{ .i64 = 0 }, 0, 1, VE }, + { "query_timeout", "Timeout for QueryOutput call in ms", OFFSET(query_timeout), AV_OPT_TYPE_INT64, { .i64 = -1 }, -1, 60000, VE }, { NULL } }; @@ -122,6 +123,9 @@ static av_cold int amf_encode_init_hevc(AVCodecContext *avctx) AMF_ASSIGN_PROPERTY_RATE(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_FRAMERATE, framerate); + if (ctx->query_timeout >= 0) + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_QUERY_TIMEOUT, ctx->query_timeout); + switch (avctx->profile) { case FF_PROFILE_HEVC_MAIN: profile = AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN; diff --git a/libavcodec/version.h b/libavcodec/version.h index 87b7284a95..b564e2d849 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #include "version_major.h" #define LIBAVCODEC_VERSION_MINOR 28 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \