diff mbox series

[FFmpeg-devel,05/18] avcodec/decode: port to the new packet list API

Message ID 20201118165247.4130-6-jamrial@gmail.com
State New
Headers show
Series AVPacketList public API
Related show

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished

Commit Message

James Almer Nov. 18, 2020, 4:52 p.m. UTC
Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavcodec/decode.c   | 20 ++++++++++----------
 libavcodec/internal.h |  4 +---
 libavcodec/utils.c    | 11 ++++++-----
 3 files changed, 17 insertions(+), 18 deletions(-)
diff mbox series

Patch

diff --git a/libavcodec/decode.c b/libavcodec/decode.c
index 5a1849f944..8a81280e7c 100644
--- a/libavcodec/decode.c
+++ b/libavcodec/decode.c
@@ -147,19 +147,21 @@  fail2:
 
 static int extract_packet_props(AVCodecInternal *avci, AVPacket *pkt)
 {
+#if FF_API_PACKET_LIST
+    struct PacketList *pkt_props = (struct PacketList *)avci->pkt_props;
+#else
+    AVPacketList *pkt_props = avci->pkt_props;
+#endif
     int ret = 0;
 
-    ret = avpriv_packet_list_put(&avci->pkt_props, &avci->pkt_props_tail, pkt,
-                                 av_packet_copy_props, 0);
+    ret = av_packet_list_put(avci->pkt_props, pkt, av_packet_copy_props, 0);
     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().
+    pkt_props->tail->pkt.size = pkt->size; // HACK: Needed for ff_decode_frame_props().
+    pkt_props->tail->pkt.data = (void*)1;  // HACK: Needed for IS_EMPTY().
 
     if (IS_EMPTY(avci->last_pkt_props)) {
-        ret = avpriv_packet_list_get(&avci->pkt_props,
-                                     &avci->pkt_props_tail,
-                                     avci->last_pkt_props);
+        ret = av_packet_list_get(avci->pkt_props, avci->last_pkt_props, 0);
         av_assert0(ret != AVERROR(EAGAIN));
     }
     return ret;
@@ -1722,9 +1724,7 @@  int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame)
     };
 
     if (IS_EMPTY(pkt))
-        avpriv_packet_list_get(&avctx->internal->pkt_props,
-                               &avctx->internal->pkt_props_tail,
-                               pkt);
+        av_packet_list_get(avctx->internal->pkt_props, pkt, 0);
 
     if (pkt) {
         frame->pts = pkt->pts;
diff --git a/libavcodec/internal.h b/libavcodec/internal.h
index c72cce869e..e7d1d9ccb5 100644
--- a/libavcodec/internal.h
+++ b/libavcodec/internal.h
@@ -31,7 +31,6 @@ 
 #include "libavutil/mathematics.h"
 #include "libavutil/pixfmt.h"
 #include "avcodec.h"
-#include "packet_internal.h"
 #include "config.h"
 
 /**
@@ -146,8 +145,7 @@  typedef struct AVCodecInternal {
      * for decoding.
      */
     AVPacket *last_pkt_props;
-    PacketListEntry *pkt_props;
-    PacketListEntry *pkt_props_tail;
+    AVPacketList *pkt_props;
 
     /**
      * temporary buffer used for encoders to store their bitstream
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 9b074e2dda..42e6850169 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -593,10 +593,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_packet_list_alloc();
     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;
     }
@@ -1054,6 +1056,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_packet_list_free(&avci->pkt_props);
 
     av_packet_free(&avci->ds.in_pkt);
     av_frame_free(&avci->es.in_frame);
@@ -1094,8 +1097,7 @@  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);
+    av_packet_list_flush(avci->pkt_props);
 
     av_frame_unref(avci->es.in_frame);
     av_packet_unref(avci->ds.in_pkt);
@@ -1158,8 +1160,7 @@  av_cold int avcodec_close(AVCodecContext *avctx)
         av_packet_free(&avctx->internal->compat_encode_packet);
         av_packet_free(&avctx->internal->buffer_pkt);
         av_packet_free(&avctx->internal->last_pkt_props);
-        avpriv_packet_list_free(&avctx->internal->pkt_props,
-                                &avctx->internal->pkt_props_tail);
+        av_packet_list_free(&avctx->internal->pkt_props);
 
         av_packet_free(&avctx->internal->ds.in_pkt);
         av_frame_free(&avctx->internal->es.in_frame);