mirror of
https://gitee.com/openharmony/third_party_ffmpeg
synced 2024-11-23 11:19:55 +00:00
Merge commit '077011b5af2b3150efc52a9b58f5ef9bb0235087'
* commit '077011b5af2b3150efc52a9b58f5ef9bb0235087':
qsv: Expose idr_interval for hevc as well
Also includes 98afe3fb71
.
Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
commit
643e336936
@ -186,6 +186,9 @@ static av_cold int qsv_enc_init(AVCodecContext *avctx)
|
||||
}
|
||||
}
|
||||
|
||||
// HEVC and H264 meaning of the value is shifted by 1, make it consistent
|
||||
q->qsv.idr_interval++;
|
||||
|
||||
ret = ff_qsv_enc_init(avctx, &q->qsv);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
@ -225,6 +228,8 @@ static av_cold int qsv_enc_close(AVCodecContext *avctx)
|
||||
static const AVOption options[] = {
|
||||
QSV_COMMON_OPTS
|
||||
|
||||
{ "idr_interval", "Distance (in I-frames) between IDR frames", OFFSET(qsv.idr_interval), AV_OPT_TYPE_INT, { .i64 = 0 }, -1, INT_MAX, VE, "idr_interval" },
|
||||
{ "begin_only", "Output an IDR-frame only at the beginning of the stream", 0, AV_OPT_TYPE_CONST, { .i64 = -1 }, 0, 0, VE, "idr_interval" },
|
||||
{ "load_plugin", "A user plugin to load in an internal session", OFFSET(load_plugin), AV_OPT_TYPE_INT, { .i64 = LOAD_PLUGIN_DEFAULT }, LOAD_PLUGIN_NONE, LOAD_PLUGIN_HEVC_HW, VE, "load_plugin" },
|
||||
{ "none", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = LOAD_PLUGIN_NONE }, 0, 0, VE, "load_plugin" },
|
||||
{ "hevc_sw", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = LOAD_PLUGIN_HEVC_SW }, 0, 0, VE, "load_plugin" },
|
||||
|
Loading…
Reference in New Issue
Block a user