Unified · Split
| @@ -133,7 +133,7 @@ static const AVOption options[] = { · 132 unmodified lines | ||
| 133 | 133 | { "height", "Output video height", OFFSET(oh), AV_OPT_TYPE_STRING, { .str="w*ch/cw" }, 0, 255, .flags = FLAGS }, |
| 134 | 134 | { "format", "Output pixel format", OFFSET(output_format_str), AV_OPT_TYPE_STRING, { .str = "same" }, .flags = FLAGS }, |
| 135 | 135 | { "async_depth", "Internal parallelization depth, the higher the value the higher the latency.", OFFSET(async_depth), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, .flags = FLAGS }, |
| 136 | − { "scale_mode", "scale mode: 0=auto, 1=low power, 2=high quality", OFFSET(scale_mode), AV_OPT_TYPE_INT, { .i64 = MFX_SCALING_MODE_DEFAULT }, MFX_SCALING_MODE_DEFAULT, MFX_SCALING_MODE_QUALITY, .flags = FLAGS, "scale mode" }, | |
| 136 | + { "scale_mode", "scale & format conversion mode: 0=auto, 1=low power, 2=high quality", OFFSET(scale_mode), AV_OPT_TYPE_INT, { .i64 = MFX_SCALING_MODE_DEFAULT }, MFX_SCALING_MODE_DEFAULT, MFX_SCALING_MODE_QUALITY, .flags = FLAGS, "scale mode" }, | |
| 137 | 137 | { NULL } |
| 138 | 138 | }; |
| 139 | 139 | |
| @@ -492,7 +492,7 @@ static int config_output(AVFilterLink *outlink) · 352 unmodified lines | ||
| 492 | 492 | } |
| 493 | 493 | } |
| 494 | 494 | |
| 495 | − if (inlink->w != outlink->w || inlink->h != outlink->h) { | |
| 495 | + if (inlink->w != outlink->w || inlink->h != outlink->h || in_format != vpp->out_format) { | |
| 496 | 496 | if (QSV_RUNTIME_VERSION_ATLEAST(mfx_version, 1, 19)) { |
| 497 | 497 | memset(&vpp->scale_conf, 0, sizeof(mfxExtVPPScaling)); |
| 498 | 498 | vpp->scale_conf.Header.BufferId = MFX_EXTBUFF_VPP_SCALING; |
| @@ -501,8 +501,8 @@ static int config_output(AVFilterLink *outlink) · 2 unmodified lines | ||
| 501 | 501 | |
| 502 | 502 | param.ext_buf[param.num_ext_buf++] = (mfxExtBuffer*)&vpp->scale_conf; |
| 503 | 503 | } else |
| 504 | − av_log(ctx, AV_LOG_WARNING, "The QSV VPP Scale option is " | |
| 505 | − "not supported with this MSDK version.\n"); | |
| 504 | + av_log(ctx, AV_LOG_WARNING, "The QSV VPP Scale & format conversion " | |
| 505 | + "option is not supported with this MSDK version.\n"); | |
| 506 | 506 | } |
| 507 | 507 | |
| 508 | 508 | if (vpp->use_frc || vpp->use_crop || vpp->deinterlace || vpp->denoise || |