| @@ -56,6 +56,7 @@ static const enum AVPixelFormat supported_formats[] = { · 55 unmodified lines |
| 56 | enum { | 56 | enum { |
| 57 | INTERP_ALGO_DEFAULT, | 57 | INTERP_ALGO_DEFAULT, |
| 58 | | 58 | |
| | 59 | INTERP_ALGO_NEAREST, |
| 59 | INTERP_ALGO_BILINEAR, | 60 | INTERP_ALGO_BILINEAR, |
| 60 | INTERP_ALGO_BICUBIC, | 61 | INTERP_ALGO_BICUBIC, |
| 61 | | 62 | |
| @@ -273,6 +274,12 @@ static av_cold int cudascale_config_props(AVFilterLink *outlink) · 211 unmodified lines |
| 273 | extern char vf_scale_cuda_bicubic_ptx[]; | 274 | extern char vf_scale_cuda_bicubic_ptx[]; |
| 274 | | 275 | |
| 275 | switch(s->interp_algo) { | 276 | switch(s->interp_algo) { |
| | 277 | case INTERP_ALGO_NEAREST: |
| | 278 | scaler_ptx = vf_scale_cuda_ptx; |
| | 279 | function_infix = "_Nearest"; |
| | 280 | s->interp_use_linear = 0; |
| | 281 | s->interp_as_integer = 1; |
| | 282 | break; |
| 276 | case INTERP_ALGO_BILINEAR: | 283 | case INTERP_ALGO_BILINEAR: |
| 277 | scaler_ptx = vf_scale_cuda_ptx; | 284 | scaler_ptx = vf_scale_cuda_ptx; |
| 278 | function_infix = "_Bilinear"; | 285 | function_infix = "_Bilinear"; |
| @@ -591,6 +598,7 @@ static const AVOption options[] = { · 312 unmodified lines |
| 591 | { "w", "Output video width", OFFSET(w_expr), AV_OPT_TYPE_STRING, { .str = "iw" }, .flags = FLAGS }, | 598 | { "w", "Output video width", OFFSET(w_expr), AV_OPT_TYPE_STRING, { .str = "iw" }, .flags = FLAGS }, |
| 592 | { "h", "Output video height", OFFSET(h_expr), AV_OPT_TYPE_STRING, { .str = "ih" }, .flags = FLAGS }, | 599 | { "h", "Output video height", OFFSET(h_expr), AV_OPT_TYPE_STRING, { .str = "ih" }, .flags = FLAGS }, |
| 593 | { "interp_algo", "Interpolation algorithm used for resizing", OFFSET(interp_algo), AV_OPT_TYPE_INT, { .i64 = INTERP_ALGO_DEFAULT }, 0, INTERP_ALGO_COUNT - 1, FLAGS, "interp_algo" }, | 600 | { "interp_algo", "Interpolation algorithm used for resizing", OFFSET(interp_algo), AV_OPT_TYPE_INT, { .i64 = INTERP_ALGO_DEFAULT }, 0, INTERP_ALGO_COUNT - 1, FLAGS, "interp_algo" }, |
| | 601 | { "nearest", "nearest neighbour", 0, AV_OPT_TYPE_CONST, { .i64 = INTERP_ALGO_NEAREST }, 0, 0, FLAGS, "interp_algo" }, |
| 594 | { "bilinear", "bilinear", 0, AV_OPT_TYPE_CONST, { .i64 = INTERP_ALGO_BILINEAR }, 0, 0, FLAGS, "interp_algo" }, | 602 | { "bilinear", "bilinear", 0, AV_OPT_TYPE_CONST, { .i64 = INTERP_ALGO_BILINEAR }, 0, 0, FLAGS, "interp_algo" }, |
| 595 | { "bicubic", "bicubic", 0, AV_OPT_TYPE_CONST, { .i64 = INTERP_ALGO_BICUBIC }, 0, 0, FLAGS, "interp_algo" }, | 603 | { "bicubic", "bicubic", 0, AV_OPT_TYPE_CONST, { .i64 = INTERP_ALGO_BICUBIC }, 0, 0, FLAGS, "interp_algo" }, |
| 596 | { "passthrough", "Do not process frames at all if parameters match", OFFSET(passthrough), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, FLAGS }, | 604 | { "passthrough", "Do not process frames at all if parameters match", OFFSET(passthrough), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, FLAGS }, |