Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-08 06:09:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

lavfi: make ff_framequeue_skip_samples() more useful.

Browse source 
Instead of just updating statistics and leaving the work to the
call site, have it actually do the work.

Also: skip the samples by updating the frame data pointers
instead of moving the samples. More efficient and avoid writing
into shared frames.
Found-By: Muhammad Faiz <mfcc64@gmail.com>
This commit is contained in:
Nicolas George 2017-01-29 10:10:40 +01:00
parent e05d2dd86a
commit 383057f8e7
3 changed files with 33 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libavfilter/avfilter.c
View file

@ -1235,13 +1235,7 @@ static int take_samples(AVFilterLink *link, unsigned min, unsigned max,
frame = ff_framequeue_peek(&link->fifo, 0);
av_samples_copy(buf->extended_data, frame->extended_data, p, 0, n,
link->channels, link->format);
frame->nb_samples -= n;
av_samples_copy(frame->extended_data, frame->extended_data, 0, n,
frame->nb_samples, link->channels, link->format);
if (frame->pts != AV_NOPTS_VALUE)
frame->pts += av_rescale_q(n, av_make_q(1, link->sample_rate), link->time_base);
ff_framequeue_update_peeked(&link->fifo, 0);
ff_framequeue_skip_samples(&link->fifo, n);
ff_framequeue_skip_samples(&link->fifo, n, link->time_base);
}
*rframe = buf;