Modifying data pointer when skipping samples may make it unaligned. Workaround for Ticket6349. This should fix the crash of ticket's testcase and a crash/regression with avxsynth (reported by Michael Niedermayer). Also change frame->nb_samples < max to frame->nb_samples <= max. This improves performance. Benchmark: ./ffmpeg -filter_complex "aevalsrc=0:n=1166,firequalizer=fixed=on" -f null null old: 25767 decicycles in take_samples, 1023 runs, 1 skips 25422 decicycles in take_samples, 2047 runs, 1 skips 25181 decicycles in take_samples, 4095 runs, 1 skips 24904 decicycles in take_samples, 8191 runs, 1 skips new: 550 decicycles in take_samples, 1024 runs, 0 skips 548 decicycles in take_samples, 2048 runs, 0 skips 545 decicycles in take_samples, 4096 runs, 0 skips 544 decicycles in take_samples, 8192 runs, 0 skips
Unified · Split
| @@ -1191,7 +1191,7 @@ static int take_samples(AVFilterLink *link, unsigned min, unsigned max, · 1190 unmodified lines | |||
| 1191 | called with enough samples. */ | 1191 | called with enough samples. */ |
| 1192 | av_assert1(samples_ready(link, link->min_samples)); | 1192 | av_assert1(samples_ready(link, link->min_samples)); |
| 1193 | frame0 = frame = ff_framequeue_peek(&link->fifo, 0); | 1193 | frame0 = frame = ff_framequeue_peek(&link->fifo, 0); |
| 1194 | if (frame->nb_samples >= min && frame->nb_samples < max) { | 1194 | if (!link->fifo.samples_skipped && frame->nb_samples >= min && frame->nb_samples <= max) { |
| 1195 | *rframe = ff_framequeue_take(&link->fifo); | 1195 | *rframe = ff_framequeue_take(&link->fifo); |
| 1196 | return 0; | 1196 | return 0; |
| 1197 | } | 1197 | } |
| @@ -1522,6 +1522,12 @@ int ff_inlink_consume_frame(AVFilterLink *link, AVFrame **rframe) · 324 unmodified lines | |||
| 1522 | *rframe = NULL; | 1522 | *rframe = NULL; |
| 1523 | if (!ff_inlink_check_available_frame(link)) | 1523 | if (!ff_inlink_check_available_frame(link)) |
| 1524 | return 0; | 1524 | return 0; |
| 1525 | |||
| 1526 | if (link->fifo.samples_skipped) { | ||
| 1527 | frame = ff_framequeue_peek(&link->fifo, 0); | ||
| 1528 | return ff_inlink_consume_samples(link, frame->nb_samples, frame->nb_samples, rframe); | ||
| 1529 | } | ||
| 1530 | |||
| 1525 | frame = ff_framequeue_take(&link->fifo); | 1531 | frame = ff_framequeue_take(&link->fifo); |
| 1526 | consume_update(link, frame); | 1532 | consume_update(link, frame); |
| 1527 | *rframe = frame; | 1533 | *rframe = frame; |
| @@ -107,6 +107,7 @@ AVFrame *ff_framequeue_take(FFFrameQueue *fq) · 106 unmodified lines | |||
| 107 | fq->tail &= fq->allocated - 1; | 107 | fq->tail &= fq->allocated - 1; |
| 108 | fq->total_frames_tail++; | 108 | fq->total_frames_tail++; |
| 109 | fq->total_samples_tail += b->frame->nb_samples; | 109 | fq->total_samples_tail += b->frame->nb_samples; |
| 110 | fq->samples_skipped = 0; | ||
| 110 | check_consistency(fq); | 111 | check_consistency(fq); |
| 111 | return b->frame; | 112 | return b->frame; |
| 112 | } | 113 | } |
| @@ -146,5 +147,6 @@ void ff_framequeue_skip_samples(FFFrameQueue *fq, size_t samples, AVRational tim · 33 unmodified lines | |||
| 146 | for (i = 0; i < planes && i < AV_NUM_DATA_POINTERS; i++) | 147 | for (i = 0; i < planes && i < AV_NUM_DATA_POINTERS; i++) |
| 147 | b->frame->data[i] = b->frame->extended_data[i]; | 148 | b->frame->data[i] = b->frame->extended_data[i]; |
| 148 | fq->total_samples_tail += samples; | 149 | fq->total_samples_tail += samples; |
| 150 | fq->samples_skipped = 1; | ||
| 149 | ff_framequeue_update_peeked(fq, 0); | 151 | ff_framequeue_update_peeked(fq, 0); |
| 150 | } | 152 | } |
| @@ -100,6 +100,11 @@ typedef struct FFFrameQueue { · 99 unmodified lines | |||
| 100 | */ | 100 | */ |
| 101 | uint64_t total_samples_tail; | 101 | uint64_t total_samples_tail; |
| 102 | 102 | ||
| 103 | /** | ||
| 104 | * Indicate that samples are skipped | ||
| 105 | */ | ||
| 106 | int samples_skipped; | ||
| 107 | |||
| 103 | } FFFrameQueue; | 108 | } FFFrameQueue; |
| 104 | 109 | ||
| 105 | /** | 110 | /** |