virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

fftools/ffmpeg: drop init_input_threads()

Browse Source 
Start threads implicitly when ifile_get_packet() is called. Simplifies
the demuxer API.
This commit is contained in:
Anton Khirnov 2022-10-17 11:23:55 +02:00
parent 6975320506
commit 09cd147dcc
3 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fftools/ffmpeg.c
View File

@ -3912,9 +3912,6 @@ static int transcode(void)
timer_start = av_gettime_relative(); timer_start = av_gettime_relative();
if ((ret = init_input_threads()) < 0)
goto fail;
while (!received_sigterm) { while (!received_sigterm) {
int64_t cur_time= av_gettime_relative(); int64_t cur_time= av_gettime_relative();

1
fftools/ffmpeg.h
View File

@ -770,7 +770,6 @@ int ifile_open(OptionsContext *o, const char *filename);
* - a negative error code on failure * - a negative error code on failure
*/ */
int ifile_get_packet(InputFile *f, AVPacket **pkt); int ifile_get_packet(InputFile *f, AVPacket **pkt);
int init_input_threads(void);
void free_input_threads(void); void free_input_threads(void);
#define SPECIFIER_OPT_FMT_str "%s" #define SPECIFIER_OPT_FMT_str "%s"

24
fftools/ffmpeg_demux.c
View File

@ -346,11 +346,10 @@ void free_input_threads(void)
free_input_thread(i); free_input_thread(i);
} }
static int init_input_thread(int i) static int thread_start(Demuxer *d)
{ {
int ret; int ret;
InputFile *f = input_files[i]; InputFile *f = &d->f;
Demuxer *d = demuxer_from_ifile(f);
if (f->thread_queue_size <= 0) if (f->thread_queue_size <= 0)
f->thread_queue_size = (nb_input_files > 1 ? 8 : 1); f->thread_queue_size = (nb_input_files > 1 ? 8 : 1);
@ -393,24 +392,19 @@ fail:
return ret; return ret;
} }
int init_input_threads(void)
{
int i, ret;
for (i = 0; i < nb_input_files; i++) {
ret = init_input_thread(i);
if (ret < 0)
return ret;
}
return 0;
}
int ifile_get_packet(InputFile *f, AVPacket **pkt) int ifile_get_packet(InputFile *f, AVPacket **pkt)
{ {
Demuxer *d = demuxer_from_ifile(f);
InputStream *ist; InputStream *ist;
DemuxMsg msg; DemuxMsg msg;
int ret; int ret;
if (!f->in_thread_queue) {
ret = thread_start(d);
if (ret < 0)
return ret;
}
if (f->readrate || f->rate_emu) { if (f->readrate || f->rate_emu) {
int i; int i;
int64_t file_start = copy_ts * ( int64_t file_start = copy_ts * (