Showing the changes to libavfilter (1 of 2 files). Show all
Unified · Split
| @@ -67,6 +67,7 @@ typedef struct AVSyncTestContext { · 66 unmodified lines | |||
| 67 | #define OFFSET(x) offsetof(AVSyncTestContext, x) | 67 | #define OFFSET(x) offsetof(AVSyncTestContext, x) |
| 68 | #define A AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM | 68 | #define A AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM |
| 69 | #define V AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM | 69 | #define V AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM |
| 70 | #define R AV_OPT_FLAG_RUNTIME_PARAM | ||
| 70 | 71 | ||
| 71 | static const AVOption avsynctest_options[] = { | 72 | static const AVOption avsynctest_options[] = { |
| 72 | {"size", "set frame size", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, {.str="hd720"}, 0, 0, V }, | 73 | {"size", "set frame size", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, {.str="hd720"}, 0, 0, V }, |
| @@ -75,14 +76,14 @@ static const AVOption avsynctest_options[] = { · 2 unmodified lines | |||
| 75 | {"fr", "set frame rate", OFFSET(frame_rate), AV_OPT_TYPE_VIDEO_RATE, {.str="30"}, 0,INT_MAX, V }, | 76 | {"fr", "set frame rate", OFFSET(frame_rate), AV_OPT_TYPE_VIDEO_RATE, {.str="30"}, 0,INT_MAX, V }, |
| 76 | {"samplerate", "set sample rate", OFFSET(sample_rate), AV_OPT_TYPE_INT, {.i64=44100},8000,384000, A }, | 77 | {"samplerate", "set sample rate", OFFSET(sample_rate), AV_OPT_TYPE_INT, {.i64=44100},8000,384000, A }, |
| 77 | {"sr", "set sample rate", OFFSET(sample_rate), AV_OPT_TYPE_INT, {.i64=44100},8000,384000, A }, | 78 | {"sr", "set sample rate", OFFSET(sample_rate), AV_OPT_TYPE_INT, {.i64=44100},8000,384000, A }, |
| 78 | {"amplitude", "set beep amplitude", OFFSET(amplitude), AV_OPT_TYPE_FLOAT, {.dbl=.7}, 0., 1., A }, | 79 | {"amplitude", "set beep amplitude", OFFSET(amplitude), AV_OPT_TYPE_FLOAT, {.dbl=.7}, 0., 1., A|R }, |
| 79 | {"a", "set beep amplitude", OFFSET(amplitude), AV_OPT_TYPE_FLOAT, {.dbl=.7}, 0., 1., A }, | 80 | {"a", "set beep amplitude", OFFSET(amplitude), AV_OPT_TYPE_FLOAT, {.dbl=.7}, 0., 1., A|R }, |
| 80 | {"period", "set beep period", OFFSET(period), AV_OPT_TYPE_INT, {.i64=3}, 1, 99., A }, | 81 | {"period", "set beep period", OFFSET(period), AV_OPT_TYPE_INT, {.i64=3}, 1, 99., A }, |
| 81 | {"p", "set beep period", OFFSET(period), AV_OPT_TYPE_INT, {.i64=3}, 1, 99., A }, | 82 | {"p", "set beep period", OFFSET(period), AV_OPT_TYPE_INT, {.i64=3}, 1, 99., A }, |
| 82 | {"delay", "set flash delay", OFFSET(delay), AV_OPT_TYPE_INT, {.i64=0}, -30, 30, V }, | 83 | {"delay", "set flash delay", OFFSET(delay), AV_OPT_TYPE_INT, {.i64=0}, -30, 30, V|R }, |
| 83 | {"dl", "set flash delay", OFFSET(delay), AV_OPT_TYPE_INT, {.i64=0}, -30, 30, V }, | 84 | {"dl", "set flash delay", OFFSET(delay), AV_OPT_TYPE_INT, {.i64=0}, -30, 30, V|R }, |
| 84 | {"cycle", "set delay cycle", OFFSET(cycle), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, V }, | 85 | {"cycle", "set delay cycle", OFFSET(cycle), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, V|R }, |
| 85 | {"c", "set delay cycle", OFFSET(cycle), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, V }, | 86 | {"c", "set delay cycle", OFFSET(cycle), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, V|R }, |
| 86 | {"duration", "set duration", OFFSET(duration), AV_OPT_TYPE_DURATION, {.i64=0}, 0, INT64_MAX, V|A }, | 87 | {"duration", "set duration", OFFSET(duration), AV_OPT_TYPE_DURATION, {.i64=0}, 0, INT64_MAX, V|A }, |
| 87 | {"d", "set duration", OFFSET(duration), AV_OPT_TYPE_DURATION, {.i64=0}, 0, INT64_MAX, V|A }, | 88 | {"d", "set duration", OFFSET(duration), AV_OPT_TYPE_DURATION, {.i64=0}, 0, INT64_MAX, V|A }, |
| 88 | {"fg", "set foreground color", OFFSET(rgba[0]), AV_OPT_TYPE_COLOR, {.str="white"}, 0, 0, V }, | 89 | {"fg", "set foreground color", OFFSET(rgba[0]), AV_OPT_TYPE_COLOR, {.str="white"}, 0, 0, V }, |
| @@ -278,6 +279,9 @@ static int video_frame(AVFilterLink *outlink) · 189 unmodified lines | |||
| 278 | int64_t delta, temp, intpart; | 279 | int64_t delta, temp, intpart; |
| 279 | AVFrame *out; | 280 | AVFrame *out; |
| 280 | 281 | ||
| 282 | if (!s->cycle) | ||
| 283 | s->vdelay = av_make_q(s->delay, 1); | ||
| 284 | |||
| 281 | delta = av_rescale_q(s->apts, s->frame_rate, av_make_q(s->sample_rate, 1)) - s->vpts; | 285 | delta = av_rescale_q(s->apts, s->frame_rate, av_make_q(s->sample_rate, 1)) - s->vpts; |
| 282 | if (delta < 0) | 286 | if (delta < 0) |
| 283 | return 1; | 287 | return 1; |
| @@ -401,4 +405,5 @@ const AVFilter ff_avsrc_avsynctest = { · 117 unmodified lines | |||
| 401 | .activate = activate, | 405 | .activate = activate, |
| 402 | FILTER_OUTPUTS(avsynctest_outputs), | 406 | FILTER_OUTPUTS(avsynctest_outputs), |
| 403 | FILTER_QUERY_FUNC(query_formats), | 407 | FILTER_QUERY_FUNC(query_formats), |
| 408 | .process_command = ff_filter_process_command, | ||
| 404 | }; | 409 | }; |