Fix for the error with an invalid GOP size parameter.
Unified · Split
| @@ -276,7 +276,9 @@ FF_ENABLE_DEPRECATION_WARNINGS · 275 unmodified lines | ||
| 276 | 276 | } |
| 277 | 277 | |
| 278 | 278 | // Picture control properties |
| 279 | − AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_GOP_SIZE, avctx->gop_size); | |
| 279 | + if (avctx->gop_size != -1) { | |
| 280 | + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_GOP_SIZE, avctx->gop_size); | |
| 281 | + } | |
| 280 | 282 | |
| 281 | 283 | // Setup header insertion mode only if this option was defined explicitly |
| 282 | 284 | if (ctx->header_insertion_mode != -1) { |
| @@ -517,7 +517,9 @@ FF_ENABLE_DEPRECATION_WARNINGS · 516 unmodified lines | ||
| 517 | 517 | AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_DE_BLOCKING_FILTER, !!deblocking_filter); |
| 518 | 518 | |
| 519 | 519 | // Keyframe Interval |
| 520 | − AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_IDR_PERIOD, avctx->gop_size); | |
| 520 | + if (avctx->gop_size != -1) { | |
| 521 | + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_IDR_PERIOD, avctx->gop_size); | |
| 522 | + } | |
| 521 | 523 | |
| 522 | 524 | // Header Insertion Spacing |
| 523 | 525 | if (ctx->header_spacing >= 0) |
| @@ -261,7 +261,9 @@ FF_ENABLE_DEPRECATION_WARNINGS · 260 unmodified lines | ||
| 261 | 261 | |
| 262 | 262 | // Picture control properties |
| 263 | 263 | AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_NUM_GOPS_PER_IDR, ctx->gops_per_idr); |
| 264 | − AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_GOP_SIZE, avctx->gop_size); | |
| 264 | + if (avctx->gop_size != -1) { | |
| 265 | + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_GOP_SIZE, avctx->gop_size); | |
| 266 | + } | |
| 265 | 267 | if (avctx->slices > 1) { |
| 266 | 268 | AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_SLICES_PER_FRAME, avctx->slices); |
| 267 | 269 | } |