RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fftools/ffmpeg: report new streams from the input thread 

This avoids a potential race with the demuxer adding new streams. It is
also more efficient, since we no longer do inter-thread transfers of
packets that will be just discarded.
This commit is contained in:
Anton Khirnov 2022-03-21 17:29:21 +01:00
parent 9c16310fe5
commit 07da07ddb0
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
fftools/ffmpeg.c
View File

@ -3277,21 +3277,6 @@ static int init_output_stream(OutputStream *ost, AVFrame *frame,
return ret; return ret;
} }
static void report_new_stream(int input_index, AVPacket *pkt)
{
InputFile *file = input_files[input_index];
AVStream *st = file->ctx->streams[pkt->stream_index];
if (pkt->stream_index < file->nb_streams_warn)
return;
av_log(file->ctx, AV_LOG_WARNING,
"New %s stream %d:%d at pos:%"PRId64" and DTS:%ss\n",
av_get_media_type_string(st->codecpar->codec_type),
input_index, pkt->stream_index,
pkt->pos, av_ts2timestr(pkt->dts, &st->time_base));
file->nb_streams_warn = pkt->stream_index + 1;
}
static int transcode_init(void) static int transcode_init(void)
{ {
int ret = 0, i, j, k; int ret = 0, i, j, k;
@ -3831,13 +3816,6 @@ static int process_input(int file_index)
reset_eagain(); reset_eagain();
/* the following test is needed in case new streams appear
dynamically in stream : we ignore them */
if (pkt->stream_index >= ifile->nb_streams) {
report_new_stream(file_index, pkt);
goto discard_packet;
}
ist = input_streams[ifile->ist_index + pkt->stream_index]; ist = input_streams[ifile->ist_index + pkt->stream_index];
ist->data_size += pkt->size; ist->data_size += pkt->size;

23
fftools/ffmpeg_demux.c
View File

@ -20,6 +20,7 @@
#include "libavutil/error.h" #include "libavutil/error.h"
#include "libavutil/time.h" #include "libavutil/time.h"
#include "libavutil/timestamp.h"
#include "libavutil/thread.h" #include "libavutil/thread.h"
#include "libavutil/threadmessage.h" #include "libavutil/threadmessage.h"
@ -27,6 +28,20 @@
#include "libavformat/avformat.h" #include "libavformat/avformat.h"
static void report_new_stream(InputFile *file, const AVPacket *pkt)
{
AVStream *st = file->ctx->streams[pkt->stream_index];
if (pkt->stream_index < file->nb_streams_warn)
return;
av_log(file->ctx, AV_LOG_WARNING,
"New %s stream %d:%d at pos:%"PRId64" and DTS:%ss\n",
av_get_media_type_string(st->codecpar->codec_type),
file->index, pkt->stream_index,
pkt->pos, av_ts2timestr(pkt->dts, &st->time_base));
file->nb_streams_warn = pkt->stream_index + 1;
}
static void *input_thread(void *arg) static void *input_thread(void *arg)
{ {
InputFile *f = arg; InputFile *f = arg;
@ -51,6 +66,14 @@ static void *input_thread(void *arg)
f->ctx->streams[pkt->stream_index]); f->ctx->streams[pkt->stream_index]);
} }
/* the following test is needed in case new streams appear
dynamically in stream : we ignore them */
if (pkt->stream_index >= f->nb_streams) {
report_new_stream(f, pkt);
av_packet_unref(pkt);
continue;
}
queue_pkt = av_packet_alloc(); queue_pkt = av_packet_alloc();
if (!queue_pkt) { if (!queue_pkt) {
av_packet_unref(pkt); av_packet_unref(pkt);