virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity

fftools/ffmpeg_demux: move preparing DemuxMsg to separate function

Browse Source 
Will be useful in following commits, which will move more code into this
function.
This commit is contained in:
Anton Khirnov 2023-04-26 14:23:42 +02:00
parent 989e87b03c
commit abf9532bda
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
fftools/ffmpeg_demux.c
View File

@ -257,6 +257,26 @@ static void ts_fixup(Demuxer *d, AVPacket *pkt, int *repeat_pict)
SHOW_TS_DEBUG("demuxer+tsfixup"); SHOW_TS_DEBUG("demuxer+tsfixup");
} }
// process an input packet into a message to send to the consumer thread
// src is always cleared by this function
static int input_packet_process(Demuxer *d, DemuxMsg *msg, AVPacket *src)
{
AVPacket *pkt;
pkt = av_packet_alloc();
if (!pkt) {
av_packet_unref(src);
return AVERROR(ENOMEM);
}
av_packet_move_ref(pkt, src);
ts_fixup(d, pkt, &msg->repeat_pict);
msg->pkt = pkt;
return 0;
}
static void thread_set_name(InputFile *f) static void thread_set_name(InputFile *f)
{ {
char name[16]; char name[16];
@ -336,15 +356,10 @@ static void *input_thread(void *arg)
} }
} }
ts_fixup(d, pkt, &msg.repeat_pict); ret = input_packet_process(d, &msg, pkt);
if (ret < 0)
msg.pkt = av_packet_alloc();
if (!msg.pkt) {
av_packet_unref(pkt);
ret = AVERROR(ENOMEM);
break; break;
}
av_packet_move_ref(msg.pkt, pkt);
ret = av_thread_message_queue_send(d->in_thread_queue, &msg, flags); ret = av_thread_message_queue_send(d->in_thread_queue, &msg, flags);
if (flags && ret == AVERROR(EAGAIN)) { if (flags && ret == AVERROR(EAGAIN)) {
flags = 0; flags = 0;