avcodec/amfenc: GOP size check

Fix for the error with an invalid GOP size parameter.
master
Araz Iusubov 2 weeks ago committed by Dmitrii Ovchinnikov
parent 4047b887fc
commit f63f164125
  1. 4
      libavcodec/amfenc_av1.c
  2. 4
      libavcodec/amfenc_h264.c
  3. 4
      libavcodec/amfenc_hevc.c

@ -276,7 +276,9 @@ FF_ENABLE_DEPRECATION_WARNINGS
} }
// Picture control properties // Picture control properties
AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_GOP_SIZE, avctx->gop_size); if (avctx->gop_size != -1) {
AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_GOP_SIZE, avctx->gop_size);
}
// Setup header insertion mode only if this option was defined explicitly // Setup header insertion mode only if this option was defined explicitly
if (ctx->header_insertion_mode != -1) { if (ctx->header_insertion_mode != -1) {

@ -517,7 +517,9 @@ FF_ENABLE_DEPRECATION_WARNINGS
AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_DE_BLOCKING_FILTER, !!deblocking_filter); AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_DE_BLOCKING_FILTER, !!deblocking_filter);
// Keyframe Interval // Keyframe Interval
AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_IDR_PERIOD, avctx->gop_size); if (avctx->gop_size != -1) {
AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_IDR_PERIOD, avctx->gop_size);
}
// Header Insertion Spacing // Header Insertion Spacing
if (ctx->header_spacing >= 0) if (ctx->header_spacing >= 0)

@ -261,7 +261,9 @@ FF_ENABLE_DEPRECATION_WARNINGS
// Picture control properties // Picture control properties
AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_NUM_GOPS_PER_IDR, ctx->gops_per_idr); AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_NUM_GOPS_PER_IDR, ctx->gops_per_idr);
AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_GOP_SIZE, avctx->gop_size); if (avctx->gop_size != -1) {
AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_GOP_SIZE, avctx->gop_size);
}
if (avctx->slices > 1) { if (avctx->slices > 1) {
AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_SLICES_PER_FRAME, avctx->slices); AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_SLICES_PER_FRAME, avctx->slices);
} }

Loading…
Cancel
Save