Signed-off-by: James Almer <jamr...@gmail.com>
---
fftools/ffplay.c | 222 ++++++++++++++++++++++++++++-------------------
1 file changed, 135 insertions(+), 87 deletions(-)
diff --git a/fftools/ffplay.c b/fftools/ffplay.c
index 9ff0425163..ef954772ed 100644
--- a/fftools/ffplay.c
+++ b/fftools/ffplay.c
@@ -36,6 +36,7 @@
#include "libavutil/pixdesc.h"
#include "libavutil/imgutils.h"
#include "libavutil/dict.h"
+#include "libavutil/fifo.h"
#include "libavutil/parseutils.h"
#include "libavutil/samplefmt.h"
#include "libavutil/avassert.h"
@@ -111,13 +112,12 @@ const int program_birth_year = 2003;
static unsigned sws_flags = SWS_BICUBIC;
typedef struct MyAVPacketList {
- AVPacket pkt;
- struct MyAVPacketList *next;
+ AVPacket *pkt;
int serial;
} MyAVPacketList;
typedef struct PacketQueue {
- MyAVPacketList *first_pkt, *last_pkt;
+ AVFifoBuffer *pkt_list;
int nb_packets;
int size;
int64_t duration;
@@ -187,7 +187,7 @@ enum {
};
typedef struct Decoder {
- AVPacket pkt;
+ AVPacket *pkt;
PacketQueue *queue;
AVCodecContext *avctx;
int pkt_serial;
@@ -361,7 +361,7 @@ static int filter_nbthreads = 0;
static int is_full_screen;
static int64_t audio_callback_time;
-static AVPacket flush_pkt;
+static AVPacket *flush_pkt;
#define FF_QUIT_EVENT (SDL_USEREVENT + 2)
@@ -427,28 +427,25 @@ int64_t get_valid_channel_layout(int64_t channel_layout,
int channels)
static int packet_queue_put_private(PacketQueue *q, AVPacket *pkt)
{
- MyAVPacketList *pkt1;
+ MyAVPacketList pkt1;
if (q->abort_request)
return -1;
- pkt1 = av_malloc(sizeof(MyAVPacketList));
- if (!pkt1)
- return -1;
- pkt1->pkt = *pkt;
- pkt1->next = NULL;
- if (pkt == &flush_pkt)
+ if (av_fifo_space(q->pkt_list) < sizeof(pkt1)) {
+ if (av_fifo_grow(q->pkt_list, sizeof(pkt1)) < 0)
+ return -1;
+ }
+
+ if (pkt->data == flush_pkt->data)
q->serial++;
- pkt1->serial = q->serial;
+ pkt1.pkt = pkt;
+ pkt1.serial = q->serial;
- if (!q->last_pkt)
- q->first_pkt = pkt1;
- else
- q->last_pkt->next = pkt1;
- q->last_pkt = pkt1;
+ av_fifo_generic_write(q->pkt_list, &pkt1, sizeof(pkt1), NULL);
q->nb_packets++;
- q->size += pkt1->pkt.size + sizeof(*pkt1);
- q->duration += pkt1->pkt.duration;
+ q->size += pkt1.pkt->size + sizeof(pkt1);
+ q->duration += pkt1.pkt->duration;
/* XXX: should duplicate packet data in DV case */
SDL_CondSignal(q->cond);
return 0;
@@ -456,32 +453,51 @@ static int packet_queue_put_private(PacketQueue *q,
AVPacket *pkt)
static int packet_queue_put(PacketQueue *q, AVPacket *pkt)
{
+ AVPacket *pkt1;
int ret;
+ pkt1 = av_packet_clone(pkt);
+ if (!pkt1)
+ return -1;
+ if (pkt == flush_pkt)
+ pkt1->data = flush_pkt->data;
SDL_LockMutex(q->mutex);
- ret = packet_queue_put_private(q, pkt);
+ ret = packet_queue_put_private(q, pkt1);
SDL_UnlockMutex(q->mutex);
-
- if (pkt != &flush_pkt && ret < 0)
- av_packet_unref(pkt);
+ if (ret < 0) {
+ av_packet_free(&pkt1);
+ if (pkt != flush_pkt)
+ av_packet_unref(pkt);
+ }
return ret;
}
static int packet_queue_put_nullpacket(PacketQueue *q, int stream_index)
{
- AVPacket pkt1, *pkt = &pkt1;
- av_init_packet(pkt);
- pkt->data = NULL;
- pkt->size = 0;
+ AVPacket *pkt;
+ int ret;
+
+ pkt = av_packet_alloc();
+ if (!pkt)
+ return -1;
pkt->stream_index = stream_index;
- return packet_queue_put(q, pkt);
+ SDL_LockMutex(q->mutex);
+ ret = packet_queue_put_private(q, pkt);
+ SDL_UnlockMutex(q->mutex);
+ if (ret < 0)
+ av_packet_free(&pkt);
+
+ return ret;
}
/* packet queue handling */
static int packet_queue_init(PacketQueue *q)
{
memset(q, 0, sizeof(PacketQueue));
+ q->pkt_list = av_fifo_alloc(sizeof(MyAVPacketList));
+ if (!q->pkt_list)
+ return AVERROR(ENOMEM);
q->mutex = SDL_CreateMutex();
if (!q->mutex) {
av_log(NULL, AV_LOG_FATAL, "SDL_CreateMutex(): %s\n", SDL_GetError());
@@ -498,16 +514,13 @@ static int packet_queue_init(PacketQueue *q)
static void packet_queue_flush(PacketQueue *q)
{
- MyAVPacketList *pkt, *pkt1;
+ MyAVPacketList pkt1;
SDL_LockMutex(q->mutex);
- for (pkt = q->first_pkt; pkt; pkt = pkt1) {
- pkt1 = pkt->next;
- av_packet_unref(&pkt->pkt);
- av_freep(&pkt);
+ while (av_fifo_size(q->pkt_list) >= sizeof(pkt1)) {
+ av_fifo_generic_read(q->pkt_list, &pkt1, sizeof(pkt1), NULL);
+ av_packet_free(&pkt1.pkt);
}
- q->last_pkt = NULL;
- q->first_pkt = NULL;
q->nb_packets = 0;
q->size = 0;
q->duration = 0;
@@ -517,6 +530,7 @@ static void packet_queue_flush(PacketQueue *q)
static void packet_queue_destroy(PacketQueue *q)
{
packet_queue_flush(q);
+ av_fifo_freep(&q->pkt_list);
SDL_DestroyMutex(q->mutex);
SDL_DestroyCond(q->cond);
}
@@ -532,18 +546,29 @@ static void packet_queue_abort(PacketQueue *q)
SDL_UnlockMutex(q->mutex);
}
-static void packet_queue_start(PacketQueue *q)
+static int packet_queue_start(PacketQueue *q)
{
+ AVPacket *pkt;
+ int ret;
+
+ pkt = av_packet_alloc();
+ if (!pkt)
+ return -1;
+ pkt->data = flush_pkt->data;
SDL_LockMutex(q->mutex);
q->abort_request = 0;
- packet_queue_put_private(q, &flush_pkt);
+ ret = packet_queue_put_private(q, pkt);
SDL_UnlockMutex(q->mutex);
+ if (ret < 0)
+ av_packet_free(&pkt);
+
+ return ret;
}
/* return < 0 if aborted, 0 if no packet and > 0 if packet. */
static int packet_queue_get(PacketQueue *q, AVPacket *pkt, int block, int
*serial)
{
- MyAVPacketList *pkt1;
+ MyAVPacketList pkt1;
int ret;
SDL_LockMutex(q->mutex);
@@ -554,18 +579,15 @@ static int packet_queue_get(PacketQueue *q, AVPacket
*pkt, int block, int *seria
break;
}
- pkt1 = q->first_pkt;
- if (pkt1) {
- q->first_pkt = pkt1->next;
- if (!q->first_pkt)
- q->last_pkt = NULL;
+ if (av_fifo_size(q->pkt_list) >= sizeof(pkt1)) {
+ av_fifo_generic_read(q->pkt_list, &pkt1, sizeof(pkt1), NULL);
q->nb_packets--;
- q->size -= pkt1->pkt.size + sizeof(*pkt1);
- q->duration -= pkt1->pkt.duration;
- *pkt = pkt1->pkt;
+ q->size -= pkt1.pkt->size + sizeof(pkt1);
+ q->duration -= pkt1.pkt->duration;
+ av_packet_move_ref(pkt, pkt1.pkt);
if (serial)
- *serial = pkt1->serial;
- av_free(pkt1);
+ *serial = pkt1.serial;
+ av_packet_free(&pkt1.pkt);
ret = 1;
break;
} else if (!block) {
@@ -579,21 +601,23 @@ static int packet_queue_get(PacketQueue *q, AVPacket
*pkt, int block, int *seria
return ret;
}
-static void decoder_init(Decoder *d, AVCodecContext *avctx, PacketQueue
*queue, SDL_cond *empty_queue_cond) {
+static int decoder_init(Decoder *d, AVCodecContext *avctx, PacketQueue *queue,
SDL_cond *empty_queue_cond) {
memset(d, 0, sizeof(Decoder));
+ d->pkt = av_packet_alloc();
+ if (!d->pkt)
+ return AVERROR(ENOMEM);
d->avctx = avctx;
d->queue = queue;
d->empty_queue_cond = empty_queue_cond;
d->start_pts = AV_NOPTS_VALUE;
d->pkt_serial = -1;
+ return 0;
}
-static int decoder_decode_frame(Decoder *d, AVFrame *frame, AVSubtitle *sub) {
+static int decoder_decode_frame(Decoder *d, AVFrame *frame, AVPacket *pkt,
AVSubtitle *sub) {
int ret = AVERROR(EAGAIN);
for (;;) {
- AVPacket pkt;
-
if (d->queue->serial == d->pkt_serial) {
do {
if (d->queue->abort_request)
@@ -639,18 +663,18 @@ static int decoder_decode_frame(Decoder *d, AVFrame
*frame, AVSubtitle *sub) {
if (d->queue->nb_packets == 0)
SDL_CondSignal(d->empty_queue_cond);
if (d->packet_pending) {
- av_packet_move_ref(&pkt, &d->pkt);
+ av_packet_move_ref(pkt, d->pkt);
d->packet_pending = 0;
} else {
- if (packet_queue_get(d->queue, &pkt, 1, &d->pkt_serial) < 0)
+ if (packet_queue_get(d->queue, pkt, 1, &d->pkt_serial) < 0)
return -1;
}
if (d->queue->serial == d->pkt_serial)
break;
- av_packet_unref(&pkt);
+ av_packet_unref(pkt);
} while (1);
- if (pkt.data == flush_pkt.data) {
+ if (pkt->data == flush_pkt->data) {
avcodec_flush_buffers(d->avctx);
d->finished = 0;
d->next_pts = d->start_pts;
@@ -658,30 +682,30 @@ static int decoder_decode_frame(Decoder *d, AVFrame
*frame, AVSubtitle *sub) {
} else {
if (d->avctx->codec_type == AVMEDIA_TYPE_SUBTITLE) {
int got_frame = 0;
- ret = avcodec_decode_subtitle2(d->avctx, sub, &got_frame,
&pkt);
+ ret = avcodec_decode_subtitle2(d->avctx, sub, &got_frame, pkt);
if (ret < 0) {
ret = AVERROR(EAGAIN);
} else {
- if (got_frame && !pkt.data) {
+ if (got_frame && !pkt->data) {
d->packet_pending = 1;
- av_packet_move_ref(&d->pkt, &pkt);
+ av_packet_move_ref(d->pkt, pkt);
}
- ret = got_frame ? 0 : (pkt.data ? AVERROR(EAGAIN) :
AVERROR_EOF);
+ ret = got_frame ? 0 : (pkt->data ? AVERROR(EAGAIN) :
AVERROR_EOF);
}
} else {
- if (avcodec_send_packet(d->avctx, &pkt) == AVERROR(EAGAIN)) {
+ if (avcodec_send_packet(d->avctx, pkt) == AVERROR(EAGAIN)) {
av_log(d->avctx, AV_LOG_ERROR, "Receive_frame and
send_packet both returned EAGAIN, which is an API violation.\n");
d->packet_pending = 1;
- av_packet_move_ref(&d->pkt, &pkt);
+ av_packet_move_ref(d->pkt, pkt);
}
}
- av_packet_unref(&pkt);
+ av_packet_unref(pkt);
}
}
}
static void decoder_destroy(Decoder *d) {
- av_packet_unref(&d->pkt);
+ av_packet_free(&d->pkt);
avcodec_free_context(&d->avctx);
}
@@ -1775,11 +1799,11 @@ static int queue_picture(VideoState *is, AVFrame
*src_frame, double pts, double
return 0;
}
-static int get_video_frame(VideoState *is, AVFrame *frame)
+static int get_video_frame(VideoState *is, AVFrame *frame, AVPacket *pkt)
{
int got_picture;
- if ((got_picture = decoder_decode_frame(&is->viddec, frame, NULL)) < 0)
+ if ((got_picture = decoder_decode_frame(&is->viddec, frame, pkt, NULL)) <
0)
return -1;
if (got_picture) {
@@ -2038,6 +2062,7 @@ static int audio_thread(void *arg)
{
VideoState *is = arg;
AVFrame *frame = av_frame_alloc();
+ AVPacket *pkt = av_packet_alloc();
Frame *af;
#if CONFIG_AVFILTER
int last_serial = -1;
@@ -2048,11 +2073,14 @@ static int audio_thread(void *arg)
AVRational tb;
int ret = 0;
- if (!frame)
+ if (!frame || !pkt) {
+ av_frame_free(&frame);
+ av_packet_free(&pkt);
return AVERROR(ENOMEM);
+ }
do {
- if ((got_frame = decoder_decode_frame(&is->auddec, frame, NULL)) < 0)
+ if ((got_frame = decoder_decode_frame(&is->auddec, frame, pkt, NULL))
< 0)
goto the_end;
if (got_frame) {
@@ -2118,6 +2146,7 @@ static int audio_thread(void *arg)
avfilter_graph_free(&is->agraph);
#endif
av_frame_free(&frame);
+ av_packet_free(&pkt);
return ret;
}
@@ -2136,6 +2165,7 @@ static int video_thread(void *arg)
{
VideoState *is = arg;
AVFrame *frame = av_frame_alloc();
+ AVPacket *pkt = av_packet_alloc();
double pts;
double duration;
int ret;
@@ -2152,11 +2182,11 @@ static int video_thread(void *arg)
int last_vfilter_idx = 0;
#endif
- if (!frame)
+ if (!frame || !pkt)
return AVERROR(ENOMEM);
for (;;) {
- ret = get_video_frame(is, frame);
+ ret = get_video_frame(is, frame, pkt);
if (ret < 0)
goto the_end;
if (!ret)
@@ -2236,21 +2266,26 @@ static int video_thread(void *arg)
avfilter_graph_free(&graph);
#endif
av_frame_free(&frame);
+ av_packet_free(&pkt);
return 0;
}
static int subtitle_thread(void *arg)
{
VideoState *is = arg;
+ AVPacket *pkt = av_packet_alloc();
Frame *sp;
int got_subtitle;
double pts;
+ if (!pkt)
+ return AVERROR(ENOMEM);
+
for (;;) {
if (!(sp = frame_queue_peek_writable(&is->subpq)))
- return 0;
+ goto end;
- if ((got_subtitle = decoder_decode_frame(&is->subdec, NULL, &sp->sub))
< 0)
+ if ((got_subtitle = decoder_decode_frame(&is->subdec, NULL, pkt,
&sp->sub)) < 0)
break;
pts = 0;
@@ -2270,6 +2305,8 @@ static int subtitle_thread(void *arg)
avsubtitle_free(&sp->sub);
}
}
+end:
+ av_packet_free(&pkt);
return 0;
}
@@ -2685,7 +2722,8 @@ static int stream_component_open(VideoState *is, int
stream_index)
is->audio_stream = stream_index;
is->audio_st = ic->streams[stream_index];
- decoder_init(&is->auddec, avctx, &is->audioq,
is->continue_read_thread);
+ if ((ret = decoder_init(&is->auddec, avctx, &is->audioq,
is->continue_read_thread)) < 0)
+ goto fail;
if ((is->ic->iformat->flags & (AVFMT_NOBINSEARCH | AVFMT_NOGENSEARCH |
AVFMT_NO_BYTE_SEEK)) && !is->ic->iformat->read_seek) {
is->auddec.start_pts = is->audio_st->start_time;
is->auddec.start_pts_tb = is->audio_st->time_base;
@@ -2698,7 +2736,8 @@ static int stream_component_open(VideoState *is, int
stream_index)
is->video_stream = stream_index;
is->video_st = ic->streams[stream_index];
- decoder_init(&is->viddec, avctx, &is->videoq,
is->continue_read_thread);
+ if ((ret = decoder_init(&is->viddec, avctx, &is->videoq,
is->continue_read_thread)) < 0)
+ goto fail;
if ((ret = decoder_start(&is->viddec, video_thread, "video_decoder",
is)) < 0)
goto out;
is->queue_attachments_req = 1;
@@ -2707,7 +2746,8 @@ static int stream_component_open(VideoState *is, int
stream_index)
is->subtitle_stream = stream_index;
is->subtitle_st = ic->streams[stream_index];
- decoder_init(&is->subdec, avctx, &is->subtitleq,
is->continue_read_thread);
+ if ((ret = decoder_init(&is->subdec, avctx, &is->subtitleq,
is->continue_read_thread)) < 0)
+ goto fail;
if ((ret = decoder_start(&is->subdec, subtitle_thread,
"subtitle_decoder", is)) < 0)
goto out;
break;
@@ -2760,7 +2800,7 @@ static int read_thread(void *arg)
AVFormatContext *ic = NULL;
int err, i, ret;
int st_index[AVMEDIA_TYPE_NB];
- AVPacket pkt1, *pkt = &pkt1;
+ AVPacket *pkt = NULL;
int64_t stream_start_time;
int pkt_in_play_range = 0;
AVDictionaryEntry *t;
@@ -2777,6 +2817,12 @@ static int read_thread(void *arg)
memset(st_index, -1, sizeof(st_index));
is->eof = 0;
+ pkt = av_packet_alloc();
+ if (!pkt) {
+ av_log(NULL, AV_LOG_FATAL, "Could not allocate packet.\n");
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
ic = avformat_alloc_context();
if (!ic) {
av_log(NULL, AV_LOG_FATAL, "Could not allocate context.\n");
@@ -2962,15 +3008,15 @@ static int read_thread(void *arg)
} else {
if (is->audio_stream >= 0) {
packet_queue_flush(&is->audioq);
- packet_queue_put(&is->audioq, &flush_pkt);
+ packet_queue_put(&is->audioq, flush_pkt);
}
if (is->subtitle_stream >= 0) {
packet_queue_flush(&is->subtitleq);
- packet_queue_put(&is->subtitleq, &flush_pkt);
+ packet_queue_put(&is->subtitleq, flush_pkt);
}
if (is->video_stream >= 0) {
packet_queue_flush(&is->videoq);
- packet_queue_put(&is->videoq, &flush_pkt);
+ packet_queue_put(&is->videoq, flush_pkt);
}
if (is->seek_flags & AVSEEK_FLAG_BYTE) {
set_clock(&is->extclk, NAN, 0);
@@ -2986,10 +3032,7 @@ static int read_thread(void *arg)
}
if (is->queue_attachments_req) {
if (is->video_st && is->video_st->disposition &
AV_DISPOSITION_ATTACHED_PIC) {
- AVPacket copy;
- if ((ret = av_packet_ref(©, &is->video_st->attached_pic))
< 0)
- goto fail;
- packet_queue_put(&is->videoq, ©);
+ packet_queue_put(&is->videoq, &is->video_st->attached_pic);
packet_queue_put_nullpacket(&is->videoq, is->video_stream);
}
is->queue_attachments_req = 0;
@@ -3066,6 +3109,7 @@ static int read_thread(void *arg)
if (ic && !is->ic)
avformat_close_input(&ic);
+ av_packet_free(&pkt);
if (ret != 0) {
SDL_Event event;
@@ -3738,9 +3782,6 @@ int main(int argc, char **argv)
SDL_EventState(SDL_SYSWMEVENT, SDL_IGNORE);
SDL_EventState(SDL_USEREVENT, SDL_IGNORE);
- av_init_packet(&flush_pkt);
- flush_pkt.data = (uint8_t *)&flush_pkt;
-
if (!display_disable) {
int flags = SDL_WINDOW_HIDDEN;
if (alwaysontop)
@@ -3772,6 +3813,13 @@ int main(int argc, char **argv)
}
}
+ flush_pkt = av_packet_alloc();
+ if (!flush_pkt) {
+ av_log(NULL, AV_LOG_FATAL, "Failed to allocate packet\n");
+ do_exit(NULL);
+ }
+ flush_pkt->data = (uint8_t *)flush_pkt;
+
is = stream_open(input_filename, file_iformat);
if (!is) {
av_log(NULL, AV_LOG_FATAL, "Failed to initialize VideoState!\n");
--
2.30.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
