Signed-off-by: James Almer <jamr...@gmail.com>
---
libavcodec/decode.c | 31 +++++++++++++++++++------------
libavcodec/internal.h | 4 ++--
libavcodec/utils.c | 26 +++++++++++++++++++++-----
3 files changed, 42 insertions(+), 19 deletions(-)
diff --git a/libavcodec/decode.c b/libavcodec/decode.c
index 5a1849f944..68cdeccd06 100644
--- a/libavcodec/decode.c
+++ b/libavcodec/decode.c
@@ -147,20 +147,28 @@ fail2:
static int extract_packet_props(AVCodecInternal *avci, AVPacket *pkt)
{
+ AVPacket tmp;
int ret = 0;
- ret = avpriv_packet_list_put(&avci->pkt_props, &avci->pkt_props_tail, pkt,
- av_packet_copy_props, 0);
+ if (av_fifo_space(avci->pkt_props) < sizeof(*pkt)) {
+ ret = av_fifo_grow(avci->pkt_props, sizeof(*pkt));
+ if (ret < 0)
+ return ret;
+ }
+
+ av_init_packet(&tmp);
+ ret = av_packet_copy_props(&tmp, pkt);
if (ret < 0)
return ret;
- avci->pkt_props_tail->pkt.size = pkt->size; // HACK: Needed for
ff_decode_frame_props().
- avci->pkt_props_tail->pkt.data = (void*)1; // HACK: Needed for IS_EMPTY().
+ tmp.size = pkt->size; // HACK: Needed for ff_decode_frame_props().
+ tmp.data = (void*)1; // HACK: Needed for IS_EMPTY().
+
+ ret = av_fifo_generic_write(avci->pkt_props, &tmp, sizeof(tmp), NULL);
+ av_assert0(ret == sizeof(tmp));
if (IS_EMPTY(avci->last_pkt_props)) {
- ret = avpriv_packet_list_get(&avci->pkt_props,
- &avci->pkt_props_tail,
- avci->last_pkt_props);
- av_assert0(ret != AVERROR(EAGAIN));
+ ret = av_fifo_generic_read(avci->pkt_props, avci->last_pkt_props,
+ sizeof(*avci->last_pkt_props), NULL);
}
return ret;
}
@@ -1721,10 +1729,9 @@ int ff_decode_frame_props(AVCodecContext *avctx, AVFrame
*frame)
{ AV_PKT_DATA_S12M_TIMECODE, AV_FRAME_DATA_S12M_TIMECODE
},
};
- if (IS_EMPTY(pkt))
- avpriv_packet_list_get(&avctx->internal->pkt_props,
- &avctx->internal->pkt_props_tail,
- pkt);
+ if (IS_EMPTY(pkt) && av_fifo_size(avctx->internal->pkt_props) >=
sizeof(*pkt))
+ av_fifo_generic_read(avctx->internal->pkt_props,
+ pkt, sizeof(*pkt), NULL);
if (pkt) {
frame->pts = pkt->pts;
diff --git a/libavcodec/internal.h b/libavcodec/internal.h
index 141f3fb88e..19c96d672c 100644
--- a/libavcodec/internal.h
+++ b/libavcodec/internal.h
@@ -28,6 +28,7 @@
#include "libavutil/buffer.h"
#include "libavutil/channel_layout.h"
+#include "libavutil/fifo.h"
#include "libavutil/mathematics.h"
#include "libavutil/pixfmt.h"
#include "avcodec.h"
@@ -145,8 +146,7 @@ typedef struct AVCodecInternal {
* for decoding.
*/
AVPacket *last_pkt_props;
- AVPacketList *pkt_props;
- AVPacketList *pkt_props_tail;
+ AVFifoBuffer *pkt_props;
/**
* temporary buffer used for encoders to store their bitstream
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 0226e36ee7..e156914af8 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -581,10 +581,12 @@ int attribute_align_arg avcodec_open2(AVCodecContext
*avctx, const AVCodec *code
avci->es.in_frame = av_frame_alloc();
avci->ds.in_pkt = av_packet_alloc();
avci->last_pkt_props = av_packet_alloc();
+ avci->pkt_props = av_fifo_alloc(sizeof(*avci->last_pkt_props));
if (!avci->compat_decode_frame || !avci->compat_encode_packet ||
!avci->buffer_frame || !avci->buffer_pkt ||
!avci->es.in_frame || !avci->ds.in_pkt ||
- !avci->to_free || !avci->last_pkt_props) {
+ !avci->to_free || !avci->last_pkt_props ||
+ !avci->pkt_props) {
ret = AVERROR(ENOMEM);
goto free_and_end;
}
@@ -1064,6 +1066,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
av_packet_free(&avci->compat_encode_packet);
av_packet_free(&avci->buffer_pkt);
av_packet_free(&avci->last_pkt_props);
+ av_fifo_freep(&avci->pkt_props);
av_packet_free(&avci->ds.in_pkt);
av_frame_free(&avci->es.in_frame);
@@ -1104,8 +1107,13 @@ void avcodec_flush_buffers(AVCodecContext *avctx)
av_packet_unref(avci->buffer_pkt);
av_packet_unref(avci->last_pkt_props);
- avpriv_packet_list_free(&avci->pkt_props,
- &avci->pkt_props_tail);
+ while (av_fifo_size(avci->pkt_props) >= sizeof(*avci->last_pkt_props)) {
+ av_fifo_generic_read(avci->pkt_props,
+ avci->last_pkt_props,
sizeof(*avci->last_pkt_props),
+ NULL);
+ av_packet_unref(avci->last_pkt_props);
+ }
+ av_fifo_reset(avci->pkt_props);
av_frame_unref(avci->es.in_frame);
av_packet_unref(avci->ds.in_pkt);
@@ -1167,9 +1175,17 @@ av_cold int avcodec_close(AVCodecContext *avctx)
av_frame_free(&avctx->internal->buffer_frame);
av_packet_free(&avctx->internal->compat_encode_packet);
av_packet_free(&avctx->internal->buffer_pkt);
+ av_packet_unref(avctx->internal->last_pkt_props);
+ while (av_fifo_size(avctx->internal->pkt_props) >=
+ sizeof(*avctx->internal->last_pkt_props)) {
+ av_fifo_generic_read(avctx->internal->pkt_props,
+ avctx->internal->last_pkt_props,
+ sizeof(*avctx->internal->last_pkt_props),
+ NULL);
+ av_packet_unref(avctx->internal->last_pkt_props);
+ }
av_packet_free(&avctx->internal->last_pkt_props);
- avpriv_packet_list_free(&avctx->internal->pkt_props,
- &avctx->internal->pkt_props_tail);
+ av_fifo_freep(&avctx->internal->pkt_props);
av_packet_free(&avctx->internal->ds.in_pkt);
av_frame_free(&avctx->internal->es.in_frame);
--
2.29.2
_______________________________________________
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".
