har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fftools/ffmpeg: discard packets for unused streams in demuxing thread

Browse Source 
Avoids the pointless overhead of transferring them to the main thread.
This commit is contained in:
Anton Khirnov 2023-04-26 14:13:58 +02:00
parent a0174a235b
commit 2d43c23b81
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fftools/ffmpeg.c
View File

@ -1961,9 +1961,6 @@ static int process_input(int file_index)
ist->data_size += pkt->size; ist->data_size += pkt->size;
ist->nb_packets++; ist->nb_packets++;
if (ist->discard)
goto discard_packet;
/* add the stream-global side data to the first packet */ /* add the stream-global side data to the first packet */
if (ist->nb_packets == 1) { if (ist->nb_packets == 1) {
for (i = 0; i < ist->st->nb_side_data; i++) { for (i = 0; i < ist->st->nb_side_data; i++) {
@ -2002,7 +1999,6 @@ static int process_input(int file_index)
process_input_packet(ist, pkt, 0); process_input_packet(ist, pkt, 0);
discard_packet:
av_packet_free(&pkt); av_packet_free(&pkt);
return 0; return 0;

3
fftools/ffmpeg_demux.c
View File

@ -318,7 +318,8 @@ static void *input_thread(void *arg)
/* the following test is needed in case new streams appear /* the following test is needed in case new streams appear
dynamically in stream : we ignore them */ dynamically in stream : we ignore them */
if (pkt->stream_index >= f->nb_streams) { if (pkt->stream_index >= f->nb_streams ||
f->streams[pkt->stream_index]->discard) {
report_new_stream(d, pkt); report_new_stream(d, pkt);
av_packet_unref(pkt); av_packet_unref(pkt);
continue; continue;