diff mbox series

[FFmpeg-devel,v2] avcodec/amfenc: add query_timeout option for h264/hevc

Message ID tencent_D72770E22D949A5940AD9A9F9F3EAB3F4E08@qq.com
State New
Headers show
Series [FFmpeg-devel,v2] avcodec/amfenc: add query_timeout option for h264/hevc | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

zhilizhao(赵志立) May 12, 2022, 11:20 a.m. UTC
From: 21pages <pages21@163.com>

Signed-off-by: 21pages <pages21@163.com>

Co-authored-by: Zhao Zhili <zhilizhao@tencent.com>
---
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(-)

Comments

zhilizhao(赵志立) May 12, 2022, 1:06 p.m. UTC | #1
> On May 12, 2022, at 7:34 PM, 孙波 <pages21@163.com> wrote:
> 
> I think set maximum to 1000ms is better, because value bigger than 1000 can't effect in my test.

Please send v3 to update the default value and range. And check
AMF_VIDEO_ENCODER_HEVC_QUERY_TIMEOUT/AMF_VIDEO_ENCODER_QUERY_TIMEOUT
are defined. Current patch can break the build.

By the way, please don’t top-post.

> At 2022-05-12 19:20:22, "Zhao Zhili" <quinkblack@foxmail.com> wrote:
>> From: 21pages <pages21@163.com>
>> 
>> Signed-off-by: 21pages <pages21@163.com>
>> 
>> Co-authored-by: Zhao Zhili <zhilizhao@tencent.com>
>> ---
>> 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, \
>> -- 
>> 2.35.3
diff mbox series

Patch

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, \