From patchwork Thu May 12 10:26:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 35742 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp375776pzb; Thu, 12 May 2022 03:26:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxiDM1PfiIiySn/u2PZkYckubbx6afMDOnYfyQhI2MlpR2IbfnzvLoff5HRij3+iuL21PC4 X-Received: by 2002:a17:907:1625:b0:6f4:55aa:4213 with SMTP id hb37-20020a170907162500b006f455aa4213mr30009664ejc.594.1652351214254; Thu, 12 May 2022 03:26:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652351214; cv=none; d=google.com; s=arc-20160816; b=rGR7x2paae6FkPshsrA5+e4Yxwp1Rq0HGTDrj3yisbFQeG9MaqnAVGsHebBGrF6J5G 2OzulJahCBnLRhCOnSxp7M6Cdxqw/M5MT4drVpzQKxifiHeKg6mZ1HzM4Uh3IP+Q5ac6 6VsVIsraE8HJBk+2bXQ79ZKpSCIvC9Hnr3sJO7dxv077oEhmRcY8V4TsUke2a8HmzZIq yfujbLVenapBqq+yGwSH9zRohzU7tHk+AWb8rksB4dlE9a30f+6J4rxW/g7T7k9Pkakt x5qKX0Zqx9w3BCUEwOVzqgTfaCl4k2kGfywjGJJDcJAfWCdsm5H1BiCm9ldq7dAjL15K LWgA== 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:date:to:from:message-id :dkim-signature:delivered-to; bh=FrRPQJKM/dWBujczfgpoHx/eQs1/a6h7KfgFjIPNqpQ=; b=UBmp2CRNX+4Lv78XfkiiY8ntMWcG0fu7sO+Le22NsRk2VZbv+mfgLmPZIkYdxhr0fm eaw5FqYWuJWJyke9QpHNxZrBGEZIu1vl+2XJSTVxWw0mDKhYaeazFVUftWur0uE8IEdX Xa6JkybVtFoKfTkte8rwBqMCgc6llwRPxr4EiYyGHD/A3XS/MxMfmq64tCN6p9u/neCB n0LPZ+GcNXLpsj1p3Hbn/KEgTQsOayC/rz0XCf9wvlg7WcHQ5wBcjTtz01PBmFT01DVO DJ/2ZjHHvlu8IY3kIWHh+i3x98KLC7bG1kykLP6W6HEOd/r6bDeP2T5no+Z8L76Zu4Xo Rckw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=PHgL4Dpv; 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 q16-20020aa7d450000000b00425b05ec03fsi5827619edr.299.2022.05.12.03.26.52; Thu, 12 May 2022 03:26:54 -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=PHgL4Dpv; 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 2A62068B441; Thu, 12 May 2022 13:26:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-245.mail.qq.com (out203-205-221-245.mail.qq.com [203.205.221.245]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C93C268B0EE for ; Thu, 12 May 2022 13:26:40 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1652351195; bh=3XS1XO/o5L4Rzju/DkgCbdz48RNGtAbgkxeWW73L8x0=; h=From:To:Cc:Subject:Date; b=PHgL4Dpv7HEWr+xKjr71ok9CXO8h/5y5L4zyEOeTeEG5f7X1+3eV0Qs61eugYHg7v 9TYiImRXGRIEFx3R+KPlT1Vh1s5nJuYBHqpP+QOJKA4yHLn7VOF0szyoGakdPVwjQh 2mLx8tR7hZxFH4pOgLrIoyOy1t5Guwk4T85yZIwE= Received: from ZHILIZHAO-MB2.tencent.com ([113.118.102.173]) by newxmesmtplogicsvrsza7.qq.com (NewEsmtp) with SMTP id 6A1BFAD3; Thu, 12 May 2022 18:26:33 +0800 X-QQ-mid: xmsmtpt1652351193t7qfm1diu Message-ID: X-QQ-XMAILINFO: Ms5xyImz3IR/HWYy2B5XOURBVWtun0NZDFtBCdnowwF0cY5FnswElJXXKGvDO3 b4hijifrBv/p++dbwRB3lR2SZC4DmaCqOGRBUFoj1STF8EKHwtr1D3zLKC+OJQ8ji/gDkh1a3OnT /Oe2EdprY19GzKIg+XJAza+zau8MJz29gNvNgvVxfsNH0YxKNu6mzGmU4XpZTrGMmlAjam4O8pCy MJ7xXHbPIXsI12ioJkk0L5Cm8Kedh7+UUhzSHt+TE1UCn/gCZfre3GMUWT9ZJeMQJPgL1q1werYW W9AGQaY4J8IZC/MxidDmzqJIPH6qUeq/CeBEwS63O1ppw3+h8q51VPszeJ4LYWBXrll0l/8x/YEW cjy7yGb8i/LZIs29+YS13ThhlUbgMn2+4n2+kqCN/70SmZA+ofqQDTNb1alVELTsCyzEW+jl0ZXl WQZYKAh6wwcWahyx7LNmcR01QjbIXaZdtErlXCA4pg2047IR4j9eiBYRhcuL/5f+i9f3vYgqnowG xjr/CKdVlKaJfUJBxKjC8HY2SnMe5m4yYn6Y665QKX54PygI8JCSkZSt4gYR+pvw04/piccbUZdF KfQycuhDYQ67OmrmP6D8n+eL6cMZ9JyrpxYSIZ2P8pVCfppsG8KMXWBCcz4LQZ2JNFYkKKcbf9F4 7Iv6A+mEy8sZsbqFP7fNMFPUnNGOPUO9peDgM77vCC/+Jj4fwz+LYEDkJlFbDMbgmjWDpTuMAciR pUJ+Oz3AXEo/jeij/0gxQRmEOCPFod6GrehGqS0oHsJrRrQLCGlIk2q0I24aICl5cN9goiOgAYfG g80kiD6SXGYxTzRJKE0uoJ4h/9/RpeyXVnfVZJd0TUpFy7S137pp2BO5pusOpDOz7N00T/Zr//ph 2AbTmhUP/ww7nBQPnidZ+rRo7UuHUSFa/RbsFzdvs/QnwJGvuAKTRmdOod0O+uheSRjuBDoMyW From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 May 2022 18:26:30 +0800 X-OQ-MSGID: <20220512102630.69280-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] 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: jbFNBG5LWoUt From: 21pages Signed-off-by: 21pages Co-authored-by: Zhao Zhili --- 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..ccf4aaf496 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 }, 0, 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..864274d4ae 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 }, 0, 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, \