Unified · Split
| @@ -103,6 +103,10 @@ static const AVOption options[] = { · 102 unmodified lines | |||
| 103 | { "enforce_hrd", "Enforce HRD", OFFSET(enforce_hrd), AV_OPT_TYPE_BOOL, {.i64 = -1 }, -1, 1, VE}, | 103 | { "enforce_hrd", "Enforce HRD", OFFSET(enforce_hrd), AV_OPT_TYPE_BOOL, {.i64 = -1 }, -1, 1, VE}, |
| 104 | { "filler_data", "Filler Data Enable", OFFSET(filler_data), AV_OPT_TYPE_BOOL, {.i64 = -1 }, -1, 1, VE}, | 104 | { "filler_data", "Filler Data Enable", OFFSET(filler_data), AV_OPT_TYPE_BOOL, {.i64 = -1 }, -1, 1, VE}, |
| 105 | 105 | ||
| 106 | /// B-Frames | ||
| 107 | { "max_b_frames", "Maximum number of consecutive B Pictures", OFFSET(max_consecutive_b_frames), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 3, VE }, | ||
| 108 | { "bf", "B Picture Pattern", OFFSET(max_b_frames), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 3, VE }, | ||
| 109 | |||
| 106 | { "high_motion_quality_boost_enable", "Enable High motion quality boost mode", OFFSET(hw_high_motion_quality_boost), AV_OPT_TYPE_BOOL, {.i64 = -1 }, -1, 1, VE }, | 110 | { "high_motion_quality_boost_enable", "Enable High motion quality boost mode", OFFSET(hw_high_motion_quality_boost), AV_OPT_TYPE_BOOL, {.i64 = -1 }, -1, 1, VE }, |
| 107 | 111 | ||
| 108 | // min_qp_i -> min_qp_intra, min_qp_p -> min_qp_inter | 112 | // min_qp_i -> min_qp_intra, min_qp_p -> min_qp_inter |
| @@ -172,6 +176,9 @@ static const AVOption options[] = { · 63 unmodified lines | |||
| 172 | { "pa_high_motion_quality_boost_mode", "Sets the PA high motion quality boost mode", OFFSET(pa_high_motion_quality_boost_mode), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, AMF_PA_HIGH_MOTION_QUALITY_BOOST_MODE_AUTO, VE , .unit = "high_motion_quality_boost_mode" }, | 176 | { "pa_high_motion_quality_boost_mode", "Sets the PA high motion quality boost mode", OFFSET(pa_high_motion_quality_boost_mode), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, AMF_PA_HIGH_MOTION_QUALITY_BOOST_MODE_AUTO, VE , .unit = "high_motion_quality_boost_mode" }, |
| 173 | { "none", "no high motion quality boost", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_PA_HIGH_MOTION_QUALITY_BOOST_MODE_NONE }, 0, 0, VE, .unit = "high_motion_quality_boost_mode" }, | 177 | { "none", "no high motion quality boost", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_PA_HIGH_MOTION_QUALITY_BOOST_MODE_NONE }, 0, 0, VE, .unit = "high_motion_quality_boost_mode" }, |
| 174 | { "auto", "auto high motion quality boost", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_PA_HIGH_MOTION_QUALITY_BOOST_MODE_AUTO }, 0, 0, VE, .unit = "high_motion_quality_boost_mode" }, | 178 | { "auto", "auto high motion quality boost", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_PA_HIGH_MOTION_QUALITY_BOOST_MODE_AUTO }, 0, 0, VE, .unit = "high_motion_quality_boost_mode" }, |
| 179 | |||
| 180 | { "pa_adaptive_mini_gop", "Enable Adaptive B-frame", OFFSET(pa_adaptive_mini_gop), AV_OPT_TYPE_BOOL, { .i64 = -1 }, -1, 1, VE }, | ||
| 181 | |||
| 175 | { NULL } | 182 | { NULL } |
| 176 | 183 | ||
| 177 | }; | 184 | }; |
| @@ -456,6 +463,9 @@ FF_ENABLE_DEPRECATION_WARNINGS · 278 unmodified lines | |||
| 456 | if (ctx->pa_taq_mode != -1) { | 463 | if (ctx->pa_taq_mode != -1) { |
| 457 | AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_PA_TAQ_MODE, ctx->pa_taq_mode); | 464 | AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_PA_TAQ_MODE, ctx->pa_taq_mode); |
| 458 | } | 465 | } |
| 466 | if (ctx->pa_adaptive_mini_gop != -1) { | ||
| 467 | AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_ADAPTIVE_MINIGOP, ((ctx->pa_adaptive_mini_gop == 0) ? false : true)); | ||
| 468 | } | ||
| 459 | if (ctx->pa_ltr != -1) { | 469 | if (ctx->pa_ltr != -1) { |
| 460 | AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_PA_LTR_ENABLE, ((ctx->pa_ltr == 0) ? false : true)); | 470 | AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_PA_LTR_ENABLE, ((ctx->pa_ltr == 0) ? false : true)); |
| 461 | } | 471 | } |
| @@ -467,6 +477,62 @@ FF_ENABLE_DEPRECATION_WARNINGS · 5 unmodified lines | |||
| 467 | } | 477 | } |
| 468 | } | 478 | } |
| 469 | 479 | ||
| 480 | // B-Frames | ||
| 481 | AMFVariantStruct is_adaptive_b_frames = { 0 }; | ||
| 482 | res = ctx->encoder->pVtbl->GetProperty(ctx->encoder, AMF_VIDEO_ENCODER_AV1_ADAPTIVE_MINIGOP, &is_adaptive_b_frames); | ||
| 483 | if (ctx->max_consecutive_b_frames != -1 || ctx->max_b_frames != -1 || is_adaptive_b_frames.boolValue == true) { | ||
| 484 | |||
| 485 | //Get the capability of encoder | ||
| 486 | AMFCaps *encoder_caps = NULL; | ||
| 487 | ctx->encoder->pVtbl->GetCaps(ctx->encoder, &encoder_caps); | ||
| 488 | if (encoder_caps != NULL) | ||
| 489 | { | ||
| 490 | res = encoder_caps->pVtbl->GetProperty(encoder_caps, AMF_VIDEO_ENCODER_AV1_CAP_BFRAMES, &var); | ||
| 491 | if (res == AMF_OK) { | ||
| 492 | |||
| 493 | //encoder supports AV1 B-frame | ||
| 494 | if(var.boolValue == true){ | ||
| 495 | //adaptive b-frames is higher priority than max_b_frames | ||
| 496 | if (is_adaptive_b_frames.boolValue == true) | ||
| 497 | { | ||
| 498 | //force AMF_VIDEO_ENCODER_AV1_MAX_CONSECUTIVE_BPICTURES to 3 | ||
| 499 | AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_MAX_CONSECUTIVE_BPICTURES, 3); | ||
| 500 | |||
| 501 | if(ctx->pa_lookahead_buffer_depth < 1) | ||
| 502 | { | ||
| 503 | //force AMF_PA_LOOKAHEAD_BUFFER_DEPTH to 1 if not set or smaller than 1 | ||
| 504 | AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_PA_LOOKAHEAD_BUFFER_DEPTH, 1); | ||
| 505 | } | ||
| 506 | } | ||
| 507 | else { | ||
| 508 | if (ctx->max_b_frames != -1) { | ||
| 509 | //in case user sets B-frames | ||
| 510 | AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_B_PIC_PATTERN, ctx->max_b_frames); | ||
| 511 | if (res != AMF_OK) { | ||
| 512 | res = ctx->encoder->pVtbl->GetProperty(ctx->encoder, AMF_VIDEO_ENCODER_AV1_B_PIC_PATTERN, &var); | ||
| 513 | av_log(ctx, AV_LOG_WARNING, "B-frames=%d is not supported by this GPU, switched to %d\n", ctx->max_b_frames, (int)var.int64Value); | ||
| 514 | ctx->max_b_frames = (int)var.int64Value; | ||
| 515 | } | ||
| 516 | AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_MAX_CONSECUTIVE_BPICTURES, ctx->max_b_frames); | ||
| 517 | } | ||
| 518 | } | ||
| 519 | |||
| 520 | } | ||
| 521 | //encoder doesn't support AV1 B-frame | ||
| 522 | else { | ||
| 523 | av_log(ctx, AV_LOG_WARNING, "The current GPU in use does not support AV1 B-frame encoding, there will be no B-frame in bitstream.\n"); | ||
| 524 | } | ||
| 525 | } else { | ||
| 526 | //Can't get the capability of encoder | ||
| 527 | av_log(ctx, AV_LOG_WARNING, "Unable to get AV1 B-frame capability.\n"); | ||
| 528 | av_log(ctx, AV_LOG_WARNING, "There will be no B-frame in bitstream.\n"); | ||
| 529 | } | ||
| 530 | |||
| 531 | encoder_caps->pVtbl->Release(encoder_caps); | ||
| 532 | encoder_caps = NULL; | ||
| 533 | } | ||
| 534 | } | ||
| 535 | |||
| 470 | // Wait inside QueryOutput() if supported by the driver | 536 | // Wait inside QueryOutput() if supported by the driver |
| 471 | AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_QUERY_TIMEOUT, 1); | 537 | AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_QUERY_TIMEOUT, 1); |
| 472 | res = ctx->encoder->pVtbl->GetProperty(ctx->encoder, AMF_VIDEO_ENCODER_AV1_QUERY_TIMEOUT, &var); | 538 | res = ctx->encoder->pVtbl->GetProperty(ctx->encoder, AMF_VIDEO_ENCODER_AV1_QUERY_TIMEOUT, &var); |