diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-05-08 21:44:20 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-05-10 09:31:27 +0200 |
| commit | 16a4a18db089af8c432f1cdec62155000585b72c (patch) | |
| tree | baf975928c0ab9adbc9dcafab453242ab9f92314 | |
| parent | 72fbc9685c08baae7ab9996642707eaab873b6f1 (diff) | |
| download | ffmpeg-16a4a18db089af8c432f1cdec62155000585b72c.tar.gz | |
af_asyncts: fix offset calculation
delta is in samples, not bytes. Also the sample format is not guaranteed
to be planar.
CC:libav-stable@libav.org
| -rw-r--r-- | libavfilter/af_asyncts.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/libavfilter/af_asyncts.c b/libavfilter/af_asyncts.c index a76415b916..0ddd8b6aaa 100644 --- a/libavfilter/af_asyncts.c +++ b/libavfilter/af_asyncts.c @@ -237,18 +237,23 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *buf) } if (s->first_frame && delta > 0) { + int planar = av_sample_fmt_is_planar(buf_out->format); + int planes = planar ? nb_channels : 1; + int block_size = av_get_bytes_per_sample(buf_out->format) * + (planar ? 1 : nb_channels); + int ch; av_samples_set_silence(buf_out->extended_data, 0, delta, nb_channels, buf->format); - for (ch = 0; ch < nb_channels; ch++) - buf_out->extended_data[ch] += delta; + for (ch = 0; ch < planes; ch++) + buf_out->extended_data[ch] += delta * block_size; avresample_read(s->avr, buf_out->extended_data, out_size); - for (ch = 0; ch < nb_channels; ch++) - buf_out->extended_data[ch] -= delta; + for (ch = 0; ch < planes; ch++) + buf_out->extended_data[ch] -= delta * block_size; } else { avresample_read(s->avr, buf_out->extended_data, out_size); |