virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

fftools/sync_queue: make sure audio duration matches sample count

Browse Source 
For audio AVFrames, nb_samples is typically more trustworthy than
duration. Since sync queues look at durations, make sure they match the
sample count.

The last audio frame in the fate-shortest test is now gone. This is more
correct, since it outlasts the last video frame.
This commit is contained in:
Anton Khirnov 2023-03-22 15:09:49 +01:00
parent 9a85245adf
commit 81cca3dae3
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fftools/sync_queue.c
View File

@ -116,6 +116,11 @@ static int64_t frame_ts(const SyncQueue *sq, SyncQueueFrame frame)
frame.f->pts + frame.f->duration; frame.f->pts + frame.f->duration;
} }
static int frame_samples(const SyncQueue *sq, SyncQueueFrame frame)
{
return (sq->type == SYNC_QUEUE_PACKETS) ? 0 : frame.f->nb_samples;
}
static int frame_null(const SyncQueue *sq, SyncQueueFrame frame) static int frame_null(const SyncQueue *sq, SyncQueueFrame frame)
{ {
return (sq->type == SYNC_QUEUE_PACKETS) ? (frame.p == NULL) : (frame.f == NULL); return (sq->type == SYNC_QUEUE_PACKETS) ? (frame.p == NULL) : (frame.f == NULL);
@ -293,7 +298,7 @@ int sq_send(SyncQueue *sq, unsigned int stream_idx, SyncQueueFrame frame)
SyncQueueStream *st; SyncQueueStream *st;
SyncQueueFrame dst; SyncQueueFrame dst;
int64_t ts; int64_t ts;
int ret; int ret, nb_samples;
av_assert0(stream_idx < sq->nb_streams); av_assert0(stream_idx < sq->nb_streams);
st = &sq->streams[stream_idx]; st = &sq->streams[stream_idx];
@ -313,6 +318,14 @@ int sq_send(SyncQueue *sq, unsigned int stream_idx, SyncQueueFrame frame)
frame_move(sq, dst, frame); frame_move(sq, dst, frame);
nb_samples = frame_samples(sq, dst);
// make sure frame duration is consistent with sample count
if (nb_samples) {
av_assert0(dst.f->sample_rate > 0);
dst.f->duration = av_rescale_q(nb_samples, (AVRational){ 1, dst.f->sample_rate },
dst.f->time_base);
}
ts = frame_ts(sq, dst); ts = frame_ts(sq, dst);
ret = av_fifo_write(st->fifo, &dst, 1); ret = av_fifo_write(st->fifo, &dst, 1);

1
tests/ref/fate/shortest
View File

@ -115,4 +115,3 @@
0, 48, 48, 1, 11212, 0xc61a3f0a, S=1, 8 0, 48, 48, 1, 11212, 0xc61a3f0a, S=1, 8
1, 85760, 85760, 1536, 418, 0xae06ca91 1, 85760, 85760, 1536, 418, 0xae06ca91
0, 49, 49, 1, 1423, 0x45fba9e4, F=0x0, S=1, 8 0, 49, 49, 1, 1423, 0x45fba9e4, F=0x0, S=1, 8
1, 87296, 87296, 1536, 418, 0x7bdcc3c7